From c753a53173ebc93cbb61dd3c4ab560e2281ee663 Mon Sep 17 00:00:00 2001 From: Looly Date: Fri, 29 Apr 2022 01:46:01 +0800 Subject: [PATCH] fix code --- .../src/main/java/cn/hutool/Hutool.java | 2 +- .../core/annotation/AnnotationProxy.java | 4 +- .../core/annotation/AnnotationUtil.java | 2 +- .../java/cn/hutool/core/bean/BeanDesc.java | 6 +- .../cn/hutool/core/bean/BeanException.java | 2 +- .../java/cn/hutool/core/bean/BeanPath.java | 2 +- .../java/cn/hutool/core/bean/BeanUtil.java | 10 +- .../java/cn/hutool/core/bean/DynaBean.java | 2 +- .../java/cn/hutool/core/bean/PropDesc.java | 4 +- .../cn/hutool/core/bean/copier/AbsCopier.java | 4 +- .../core/bean/copier/MapToBeanCopier.java | 2 +- .../hutool/core/builder/CompareToBuilder.java | 975 ------------------ .../cn/hutool/core/builder/EqualsBuilder.java | 563 ---------- .../hutool/core/builder/HashCodeBuilder.java | 958 ----------------- .../java/cn/hutool/core/builder/IDKey.java | 61 -- .../hutool/core/cache/GlobalPruneTimer.java | 2 +- .../cn/hutool/core/cache/SimpleCache.java | 0 .../core/clone/CloneRuntimeException.java | 2 +- .../hutool/core/clone/DefaultCloneable.java | 2 +- .../cn/hutool/core/codec/Base16Codec.java | 2 +- .../java/cn/hutool/core/codec/Base32.java | 10 +- .../cn/hutool/core/codec/Base58Codec.java | 2 +- .../java/cn/hutool/core/codec/Base62.java | 6 +- .../java/cn/hutool/core/codec/Base64.java | 6 +- .../cn/hutool/core/codec/Base64Decoder.java | 4 +- .../cn/hutool/core/codec/Base64Encoder.java | 4 +- .../java/cn/hutool/core/codec/HexUtil.java | 9 +- .../main/java/cn/hutool/core/codec/Morse.java | 2 +- .../cn/hutool/core/codec/PercentCodec.java | 2 +- .../java/cn/hutool/core/codec/PunyCode.java | 2 +- .../cn/hutool/core/collection/CollUtil.java | 12 +- .../cn/hutool/core/collection/IterUtil.java | 10 +- .../cn/hutool/core/collection/ListUtil.java | 4 +- .../hutool/core/collection/UniqueKeySet.java | 4 +- .../core/comparator/ComparatorException.java | 2 +- .../core/comparator/FieldComparator.java | 4 +- .../core/comparator/FuncComparator.java | 4 +- .../core/comparator/VersionComparator.java | 6 +- .../core/compiler/CompilerException.java | 2 +- .../core/compiler/JavaClassFileManager.java | 4 +- .../core/compiler/JavaClassFileObject.java | 4 +- .../core/compiler/JavaFileObjectUtil.java | 2 +- .../core/compiler/JavaSourceCompiler.java | 8 +- .../core/compiler/JavaSourceFileObject.java | 4 +- .../hutool/core/compress/ZipCopyVisitor.java | 2 +- .../cn/hutool/core/compress/ZipReader.java | 3 +- .../core/{util => compress}/ZipUtil.java | 15 +- .../cn/hutool/core/compress/ZipWriter.java | 3 +- .../core/convert/AbstractConverter.java | 2 +- .../java/cn/hutool/core/convert/Convert.java | 4 +- .../hutool/core/convert/ConvertException.java | 2 +- .../core/convert/ConverterRegistry.java | 8 +- .../core/convert/NumberChineseFormatter.java | 2 +- .../core/convert/NumberWordFormatter.java | 2 +- .../core/convert/impl/ArrayConverter.java | 6 +- .../core/convert/impl/BeanConverter.java | 6 +- .../core/convert/impl/CalendarConverter.java | 2 +- .../core/convert/impl/CharacterConverter.java | 2 +- .../convert/impl/CollectionConverter.java | 4 +- .../core/convert/impl/DateConverter.java | 2 +- .../core/convert/impl/EnumConverter.java | 4 +- .../core/convert/impl/LocaleConverter.java | 2 +- .../core/convert/impl/MapConverter.java | 2 +- .../core/convert/impl/NumberConverter.java | 2 +- .../core/convert/impl/PrimitiveConverter.java | 16 +- .../core/convert/impl/ReferenceConverter.java | 2 +- .../impl/StackTraceElementConverter.java | 4 +- .../core/convert/impl/StringConverter.java | 2 +- .../impl/TemporalAccessorConverter.java | 6 +- .../cn/hutool/core/date/BetweenFormatter.java | 2 +- .../cn/hutool/core/date/CalendarUtil.java | 6 +- .../java/cn/hutool/core/date/ChineseDate.java | 2 +- .../cn/hutool/core/date/DateException.java | 2 +- .../java/cn/hutool/core/date/DateTime.java | 16 +- .../java/cn/hutool/core/date/DateUtil.java | 2 +- .../hutool/core/date/GroupTimeInterval.java | 4 +- .../hutool/core/date/LocalDateTimeUtil.java | 8 +- .../java/cn/hutool/core/date/StopWatch.java | 2 +- .../core/date/TemporalAccessorUtil.java | 2 +- .../cn/hutool/core/date/TimeInterval.java | 2 +- .../hutool/core/date/chinese/SolarTerms.java | 2 +- .../core/exceptions/DependencyException.java | 2 +- .../hutool/core/exceptions/ExceptionUtil.java | 4 +- .../core/exceptions/NotInitedException.java | 2 +- .../core/exceptions/StatefulException.java | 2 +- .../hutool/core/exceptions/UtilException.java | 2 +- .../core/exceptions/ValidateException.java | 2 +- .../cn/hutool/core/io/BOMInputStream.java | 2 +- .../java/cn/hutool/core/io/BufferUtil.java | 4 +- .../core/io/FastByteArrayOutputStream.java | 4 +- .../java/cn/hutool/core/io/FileTypeUtil.java | 2 +- .../main/java/cn/hutool/core/io/FileUtil.java | 56 +- .../cn/hutool/core/io/IORuntimeException.java | 2 +- .../main/java/cn/hutool/core/io/IoUtil.java | 16 +- .../main/java/cn/hutool/core/io/NioUtil.java | 4 +- .../core/io/checksum/crc16/CRC16Checksum.java | 2 +- .../cn/hutool/core/io/file/FileAppender.java | 6 +- .../cn/hutool/core/io/file/FileCopier.java | 2 +- .../cn/hutool/core/io/file/FileNameUtil.java | 2 +- .../cn/hutool/core/io/file/FileReader.java | 2 +- .../hutool/core/io/file/FileSystemUtil.java | 4 +- .../cn/hutool/core/io/file/FileWriter.java | 2 +- .../java/cn/hutool/core/io/file/PathUtil.java | 2 +- .../java/cn/hutool/core/io/file/Tailer.java | 2 +- .../core/io/resource/BytesResource.java | 2 +- .../io/resource/CharSequenceResource.java | 4 +- .../core/io/resource/ClassPathResource.java | 8 +- .../hutool/core/io/resource/FileResource.java | 6 +- .../core/io/resource/NoResourceException.java | 2 +- .../cn/hutool/core/io/resource/Resource.java | 2 +- .../hutool/core/io/resource/ResourceUtil.java | 6 +- .../core/io/resource/StringResource.java | 2 +- .../hutool/core/io/resource/UrlResource.java | 6 +- .../hutool/core/io/resource/VfsResource.java | 2 +- .../java/cn/hutool/core/io/unit/DataSize.java | 2 +- .../java/cn/hutool/core/io/unit/DataUnit.java | 2 +- .../hutool/core/io/watch/WatchException.java | 2 +- .../cn/hutool/core/io/watch/WatchMonitor.java | 4 +- .../cn/hutool/core/io/watch/WatchUtil.java | 2 +- .../main/java/cn/hutool/core/lang/Assert.java | 2 +- .../cn/hutool/core/lang/ClassScanner.java | 9 +- .../java/cn/hutool/core/lang/Console.java | 2 +- .../cn/hutool/core/lang/ConsoleTable.java | 2 +- .../cn/hutool/core/lang/JarClassLoader.java | 4 +- .../main/java/cn/hutool/core/lang/Opt.java | 2 +- .../hutool/core/lang/ResourceClassLoader.java | 6 +- .../java/cn/hutool/core/lang/Singleton.java | 4 +- .../java/cn/hutool/core/lang/Validator.java | 6 +- .../cn/hutool/core/lang/func/LambdaUtil.java | 4 +- .../core/lang/generator/ObjectGenerator.java | 2 +- .../cn/hutool/core/lang/hash/KetamaHash.java | 2 +- .../cn/hutool/core/lang/hash/MurmurHash.java | 4 +- .../java/cn/hutool/core/lang/id/ObjectId.java | 2 +- .../main/java/cn/hutool/core/lang/id/Pid.java | 2 +- .../cn/hutool/core/lang/id/Snowflake.java | 3 +- .../java/cn/hutool/core/lang/id/UUID.java | 2 +- .../java/cn/hutool/core/map/AbsEntry.java | 6 +- .../java/cn/hutool/core/map/CamelCaseMap.java | 2 +- .../java/cn/hutool/core/map/MapProxy.java | 2 +- .../main/java/cn/hutool/core/map/MapUtil.java | 6 +- .../java/cn/hutool/core/map/MapWrapper.java | 4 +- .../core/map/ReferenceConcurrentMap.java | 6 +- .../java/cn/hutool/core/map/TableMap.java | 6 +- .../cn/hutool/core/map/multi/AbsTable.java | 10 +- .../java/cn/hutool/core/math/Calculator.java | 2 +- .../java/cn/hutool/core/math/Combination.java | 2 +- .../main/java/cn/hutool/core/math/Money.java | 2 +- .../java/cn/hutool/core/net/Ipv4Util.java | 2 +- .../main/java/cn/hutool/core/net/NetUtil.java | 2 +- .../cn/hutool/core/net/SSLContextBuilder.java | 4 +- .../java/cn/hutool/core/net/URLDecoder.java | 40 +- .../cn/hutool/core/net/URLEncodeUtil.java | 187 ---- .../java/cn/hutool/core/net/URLEncoder.java | 100 ++ .../cn/hutool/core/{util => net}/URLUtil.java | 96 +- .../hutool/core/net/multipart/UploadFile.java | 2 +- .../core/net/multipart/UploadFileHeader.java | 2 +- .../cn/hutool/core/net/url/UrlBuilder.java | 10 +- .../java/cn/hutool/core/net/url/UrlPath.java | 2 +- .../java/cn/hutool/core/net/url/UrlQuery.java | 2 +- .../reflect/ActualTypeMapperPool.java | 2 +- .../{lang => }/reflect/LookupFactory.java | 2 +- .../{lang => }/reflect/MethodHandleUtil.java | 5 +- .../core/{util => reflect}/ModifierUtil.java | 4 +- .../reflect/ParameterizedTypeImpl.java | 4 +- .../core/{util => reflect}/ReflectUtil.java | 6 +- .../{lang => }/reflect/TypeReference.java | 2 +- .../core/{lang => }/reflect/package-info.java | 2 +- .../java/cn/hutool/core/regex/ReUtil.java | 10 +- .../cn/hutool/core/stream/CollectorUtil.java | 2 +- .../cn/hutool/core/stream/StreamUtil.java | 4 +- .../cn/hutool/core/text/AntPathMatcher.java | 2 - .../cn/hutool/core/text/CharSequenceUtil.java | 8 +- .../core/{util => text}/DesensitizedUtil.java | 4 +- .../java/cn/hutool/core/text/NamingCase.java | 1 - .../cn/hutool/core/text/PasswdStrength.java | 2 - .../java/cn/hutool/core/text/StrBuilder.java | 1 - .../cn/hutool/core/text/StrFormatter.java | 1 - .../java/cn/hutool/core/text/StrJoiner.java | 5 +- .../java/cn/hutool/core/text/StrMatcher.java | 1 - .../java/cn/hutool/core/text/StrSplitter.java | 1 - .../hutool/core/{util => text}/StrUtil.java | 11 +- .../cn/hutool/core/text/TextSimilarity.java | 1 - .../java/cn/hutool/core/text/UnicodeUtil.java | 1 - .../hutool/core/text/dfa/SensitiveUtil.java | 2 +- .../cn/hutool/core/text/dfa/WordTree.java | 2 +- .../hutool/core/text/escape/EscapeUtil.java | 2 +- .../cn/hutool/core/text/split/SplitIter.java | 2 +- .../hutool/core/thread/ExecutorBuilder.java | 4 +- .../core/thread/NamedThreadFactory.java | 2 +- .../hutool/core/thread/ThreadException.java | 2 +- .../core/thread/ThreadFactoryBuilder.java | 2 +- .../main/java/cn/hutool/core/tree/Tree.java | 8 +- .../java/cn/hutool/core/tree/TreeBuilder.java | 4 +- .../java/cn/hutool/core/tree/TreeUtil.java | 4 +- .../java/cn/hutool/core/util/ArrayUtil.java | 29 +- .../java/cn/hutool/core/util/BooleanUtil.java | 1 + .../java/cn/hutool/core/util/CharsetUtil.java | 31 +- .../cn/hutool/core/util/ClassLoaderUtil.java | 1 + .../java/cn/hutool/core/util/ClassUtil.java | 8 +- .../cn/hutool/core/util/CoordinateUtil.java | 4 +- .../cn/hutool/core/util/CreditCodeUtil.java | 3 +- .../java/cn/hutool/core/util/EnumUtil.java | 6 +- .../java/cn/hutool/core/util/IdcardUtil.java | 1 + .../java/cn/hutool/core/util/JAXBUtil.java | 7 +- .../java/cn/hutool/core/util/JNDIUtil.java | 2 +- .../java/cn/hutool/core/util/NumberUtil.java | 1 + .../util/{ObjectUtil.java => ObjUtil.java} | 14 +- .../java/cn/hutool/core/util/PhoneUtil.java | 1 + .../hutool/core/util/PrimitiveArrayUtil.java | 16 +- .../java/cn/hutool/core/util/RandomUtil.java | 1 + .../java/cn/hutool/core/util/RuntimeUtil.java | 1 + .../java/cn/hutool/core/util/ScriptUtil.java | 1 + .../hutool/core/util/ServiceLoaderUtil.java | 2 +- .../cn/hutool/core/util/SystemPropsUtil.java | 1 + .../java/cn/hutool/core/util/TypeUtil.java | 7 +- .../java/cn/hutool/core/util/XmlUtil.java | 11 +- .../cn/hutool/core/bean/BeanUtilTest.java | 6 +- .../core/builder/GenericBuilderTest.java | 2 +- .../java/cn/hutool/core/codec/Base32Test.java | 2 +- .../java/cn/hutool/core/codec/Base64Test.java | 6 +- .../hutool/core/collection/CollUtilTest.java | 2 +- .../core/compiler/JavaSourceCompilerTest.java | 4 +- .../hutool/core/compress/ZipReaderTest.java | 1 - .../hutool/core/compress/ZipWriterTest.java | 3 +- .../hutool/core/convert/ConvertOtherTest.java | 8 +- .../cn/hutool/core/convert/ConvertTest.java | 2 +- .../core/convert/ConvertToBeanTest.java | 2 +- .../core/convert/ConvertToCollectionTest.java | 2 +- .../cn/hutool/core/date/ChineseDateTest.java | 2 +- .../cn/hutool/core/io/BufferUtilTest.java | 10 +- .../hutool/core/io/CharsetDetectorTest.java | 4 +- .../hutool/core/io/ClassPathResourceTest.java | 2 +- .../java/cn/hutool/core/io/FileUtilTest.java | 4 +- .../cn/hutool/core/io/checksum/CrcTest.java | 2 +- .../core/io/file/FileSystemUtilTest.java | 2 +- .../cn/hutool/core/io/file/TailerTest.java | 2 +- .../core/io/resource/ResourceUtilTest.java | 2 +- .../java/cn/hutool/core/lang/RangeTest.java | 2 +- .../java/cn/hutool/core/lang/SimhashTest.java | 8 +- .../cn/hutool/core/lang/SnowflakeTest.java | 2 +- .../hutool/core/lang/hash/CityHashTest.java | 2 +- .../hutool/core/lang/hash/MetroHashTest.java | 6 +- .../hutool/core/lang/hash/MurMurHashTest.java | 2 +- .../reflect/ActualTypeMapperPoolTest.java | 1 + .../lang/reflect/MethodHandleUtilTest.java | 3 +- .../java/cn/hutool/core/map/MapUtilTest.java | 2 +- .../cn/hutool/core/map/TolerantMapTest.java | 8 +- .../core/map/WeakConcurrentMapTest.java | 4 +- .../hutool/core/net/FormUrlencodedTest.java | 4 +- .../java/cn/hutool/core/net/RFC3986Test.java | 8 +- .../cn/hutool/core/net/URLEncoderTest.java | 24 + .../core/{util => net}/URLUtilTest.java | 20 +- .../cn/hutool/core/net/UrlBuilderTest.java | 28 +- .../cn/hutool/core/net/UrlDecoderTest.java | 2 +- .../java/cn/hutool/core/net/UrlQueryTest.java | 11 +- .../core/text/CharSequenceUtilTest.java | 4 +- .../cn/hutool/core/util/ClassUtilTest.java | 12 +- .../core/util/DesensitizedUtilTest.java | 1 + .../cn/hutool/core/util/HashUtilTest.java | 1 + .../java/cn/hutool/core/util/HexUtilTest.java | 2 +- .../cn/hutool/core/util/ModifierUtilTest.java | 1 + .../cn/hutool/core/util/ObjectUtilTest.java | 22 +- .../java/cn/hutool/core/util/ReUtilTest.java | 1 + .../cn/hutool/core/util/ReflectUtilTest.java | 2 + .../java/cn/hutool/core/util/StrUtilTest.java | 1 + .../cn/hutool/core/util/TypeUtilTest.java | 13 +- .../java/cn/hutool/core/util/ZipUtilTest.java | 10 +- .../java/cn/hutool/cron/CronException.java | 2 +- .../main/java/cn/hutool/cron/Scheduler.java | 2 +- .../main/java/cn/hutool/cron/TaskTable.java | 2 +- .../cron/pattern/CronPatternBuilder.java | 2 +- .../pattern/matcher/AlwaysTrueMatcher.java | 2 +- .../pattern/matcher/BoolArrayMatcher.java | 2 +- .../cron/pattern/parser/PartParser.java | 2 +- .../cron/pattern/parser/PatternParser.java | 2 +- .../java/cn/hutool/cron/task/InvokeTask.java | 10 +- .../cn/hutool/crypto/CryptoException.java | 2 +- .../main/java/cn/hutool/crypto/KeyUtil.java | 2 +- .../main/java/cn/hutool/crypto/PemUtil.java | 2 +- .../java/cn/hutool/crypto/SecureUtil.java | 2 +- .../main/java/cn/hutool/crypto/SignUtil.java | 2 +- .../asymmetric/AsymmetricDecryptor.java | 8 +- .../asymmetric/AsymmetricEncryptor.java | 4 +- .../cn/hutool/crypto/asymmetric/Sign.java | 6 +- .../java/cn/hutool/crypto/digest/BCrypt.java | 6 +- .../cn/hutool/crypto/digest/DigestUtil.java | 14 +- .../cn/hutool/crypto/digest/Digester.java | 6 +- .../java/cn/hutool/crypto/digest/mac/Mac.java | 8 +- .../cn/hutool/crypto/digest/otp/TOTP.java | 2 +- .../java/cn/hutool/crypto/symmetric/AES.java | 2 +- .../java/cn/hutool/crypto/symmetric/DES.java | 26 +- .../cn/hutool/crypto/symmetric/DESede.java | 26 +- .../java/cn/hutool/crypto/symmetric/RC4.java | 6 +- .../java/cn/hutool/crypto/symmetric/SM4.java | 2 +- .../crypto/symmetric/SymmetricCrypto.java | 2 +- .../crypto/symmetric/SymmetricDecryptor.java | 8 +- .../crypto/symmetric/SymmetricEncryptor.java | 4 +- .../cn/hutool/crypto/test/PemUtilTest.java | 2 +- .../java/cn/hutool/crypto/test/SmTest.java | 10 +- .../crypto/test/asymmetric/ECIESTest.java | 2 +- .../crypto/test/asymmetric/RSATest.java | 44 +- .../crypto/test/asymmetric/SM2Test.java | 10 +- .../crypto/test/asymmetric/SignTest.java | 2 +- .../hutool/crypto/test/digest/DigestTest.java | 30 +- .../hutool/crypto/test/digest/HmacTest.java | 6 +- .../crypto/test/symmetric/ChaCha20Test.java | 2 +- .../hutool/crypto/test/symmetric/DesTest.java | 2 +- .../hutool/crypto/test/symmetric/RC4Test.java | 10 +- .../crypto/test/symmetric/SymmetricTest.java | 10 +- .../hutool/crypto/test/symmetric/ZucTest.java | 4 +- .../main/java/cn/hutool/db/DaoTemplate.java | 2 +- .../java/cn/hutool/db/DbRuntimeException.java | 2 +- .../main/java/cn/hutool/db/DialectRunner.java | 2 +- .../src/main/java/cn/hutool/db/Entity.java | 6 +- .../src/main/java/cn/hutool/db/Session.java | 2 +- .../main/java/cn/hutool/db/StatementUtil.java | 2 +- .../cn/hutool/db/dialect/DialectFactory.java | 2 +- .../cn/hutool/db/dialect/DialectName.java | 2 +- .../java/cn/hutool/db/dialect/DriverUtil.java | 12 +- .../db/dialect/impl/AnsiSqlDialect.java | 2 +- .../cn/hutool/db/dialect/impl/H2Dialect.java | 2 +- .../hutool/db/dialect/impl/MysqlDialect.java | 2 +- .../hutool/db/dialect/impl/OracleDialect.java | 2 +- .../db/dialect/impl/PostgresqlDialect.java | 2 +- .../db/dialect/impl/SqlServer2012Dialect.java | 4 +- .../cn/hutool/db/ds/AbstractDSFactory.java | 2 +- .../main/java/cn/hutool/db/ds/DSFactory.java | 2 +- .../cn/hutool/db/ds/bee/BeeDSFactory.java | 2 +- .../cn/hutool/db/ds/c3p0/C3p0DSFactory.java | 2 +- .../cn/hutool/db/ds/dbcp/DbcpDSFactory.java | 10 +- .../cn/hutool/db/ds/druid/DruidDSFactory.java | 2 +- .../hutool/db/ds/hikari/HikariDSFactory.java | 6 +- .../cn/hutool/db/ds/jndi/JndiDSFactory.java | 6 +- .../cn/hutool/db/ds/pooled/DbSetting.java | 2 +- .../hutool/db/ds/pooled/PooledDSFactory.java | 6 +- .../hutool/db/ds/pooled/PooledDataSource.java | 2 +- .../hutool/db/ds/simple/SimpleDataSource.java | 2 +- .../hutool/db/ds/tomcat/TomcatDSFactory.java | 12 +- .../cn/hutool/db/handler/HandleHelper.java | 4 +- .../java/cn/hutool/db/meta/IndexInfo.java | 6 +- .../main/java/cn/hutool/db/meta/MetaUtil.java | 2 +- .../cn/hutool/db/nosql/mongo/MongoDS.java | 2 +- .../cn/hutool/db/nosql/redis/RedisDS.java | 2 +- .../main/java/cn/hutool/db/sql/Condition.java | 2 +- .../cn/hutool/db/sql/ConditionBuilder.java | 2 +- .../java/cn/hutool/db/sql/ConditionGroup.java | 2 +- .../main/java/cn/hutool/db/sql/Direction.java | 2 +- .../cn/hutool/db/sql/LogicalOperator.java | 8 +- .../main/java/cn/hutool/db/sql/NamedSql.java | 2 +- .../src/main/java/cn/hutool/db/sql/Order.java | 14 +- .../java/cn/hutool/db/sql/SqlBuilder.java | 2 +- .../java/cn/hutool/db/sql/SqlFormatter.java | 2 +- .../main/java/cn/hutool/db/sql/SqlUtil.java | 4 +- .../main/java/cn/hutool/db/sql/Wrapper.java | 2 +- .../java/cn/hutool/db/PicTransferTest.java | 2 +- .../java/cn/hutool/db/meta/MetaUtilTest.java | 2 +- .../extra/aop/interceptor/JdkInterceptor.java | 2 +- .../hutool/extra/aop/proxy/ProxyFactory.java | 2 +- .../hutool/extra/cglib/BeanCopierCache.java | 2 +- .../java/cn/hutool/extra/cglib/CglibUtil.java | 2 +- .../extra/compress/CompressException.java | 2 +- .../hutool/extra/compress/CompressUtil.java | 2 +- .../extra/compress/archiver/Archiver.java | 2 +- .../compress/archiver/SevenZArchiver.java | 2 +- .../compress/archiver/StreamArchiver.java | 2 +- .../compress/extractor/SevenZExtractor.java | 2 +- .../compress/extractor/StreamExtractor.java | 2 +- .../extra/expression/ExpressionException.java | 2 +- .../expression/engine/ExpressionFactory.java | 2 +- .../java/cn/hutool/extra/ftp/AbstractFtp.java | 4 +- .../main/java/cn/hutool/extra/ftp/Ftp.java | 4 +- .../cn/hutool/extra/ftp/FtpException.java | 2 +- .../main/java/cn/hutool/extra/mail/Mail.java | 6 +- .../cn/hutool/extra/mail/MailAccount.java | 10 +- .../cn/hutool/extra/mail/MailException.java | 2 +- .../java/cn/hutool/extra/mail/MailUtil.java | 2 +- .../cn/hutool/extra/pinyin/PinyinEngine.java | 2 +- .../hutool/extra/pinyin/PinyinException.java | 2 +- .../cn/hutool/extra/pinyin/PinyinUtil.java | 2 +- .../extra/pinyin/engine/PinyinFactory.java | 2 +- .../engine/bopomofo4j/Bopomofo4jEngine.java | 2 +- .../engine/pinyin4j/Pinyin4jEngine.java | 2 +- .../hutool/extra/qrcode/QrCodeException.java | 2 +- .../cn/hutool/extra/qrcode/QrCodeUtil.java | 2 +- .../java/cn/hutool/extra/qrcode/QrConfig.java | 2 +- .../extra/servlet/JakartaServletUtil.java | 18 +- .../cn/hutool/extra/servlet/ServletUtil.java | 16 +- .../cn/hutool/extra/spring/SpringUtil.java | 2 +- .../java/cn/hutool/extra/ssh/GanymedUtil.java | 2 +- .../extra/ssh/JschRuntimeException.java | 2 +- .../cn/hutool/extra/ssh/JschSessionPool.java | 2 +- .../java/cn/hutool/extra/ssh/JschUtil.java | 4 +- .../main/java/cn/hutool/extra/ssh/Sftp.java | 2 +- .../java/cn/hutool/extra/ssh/SshjSftp.java | 8 +- .../hutool/extra/system/JavaRuntimeInfo.java | 2 +- .../cn/hutool/extra/system/SystemUtil.java | 2 +- .../java/cn/hutool/extra/system/UserInfo.java | 2 +- .../hutool/extra/template/TemplateConfig.java | 2 +- .../extra/template/TemplateException.java | 2 +- .../template/engine/TemplateFactory.java | 4 +- .../template/engine/enjoy/EnjoyEngine.java | 4 +- .../engine/jetbrick/JetbrickTemplate.java | 2 +- .../jetbrick/loader/StringResourceLoader.java | 2 +- .../template/engine/rythm/RythmTemplate.java | 2 +- .../engine/thymeleaf/ThymeleafEngine.java | 14 +- .../engine/thymeleaf/ThymeleafTemplate.java | 6 +- .../velocity/SimpleStringResourceLoader.java | 8 +- .../engine/velocity/VelocityEngine.java | 2 +- .../engine/velocity/VelocityTemplate.java | 6 +- .../template/engine/wit/WitTemplate.java | 2 +- .../extra/tokenizer/TokenizerException.java | 2 +- .../tokenizer/engine/TokenizerFactory.java | 2 +- .../engine/analysis/AnalysisEngine.java | 6 +- .../tokenizer/engine/ansj/AnsjEngine.java | 12 +- .../tokenizer/engine/hanlp/HanLPEngine.java | 14 +- .../engine/ikanalyzer/IKAnalyzerEngine.java | 8 +- .../tokenizer/engine/jcseg/JcsegEngine.java | 6 +- .../tokenizer/engine/jieba/JiebaEngine.java | 10 +- .../tokenizer/engine/mmseg/MmsegEngine.java | 10 +- .../tokenizer/engine/mynlp/MynlpEngine.java | 10 +- .../tokenizer/engine/word/WordEngine.java | 16 +- .../hutool/extra/compress/ArchiverTest.java | 8 +- .../hutool/extra/servlet/ServletUtilTest.java | 2 +- .../hutool/extra/spring/SpringUtilTest.java | 2 +- .../spring/SpringUtilWithAutoConfigTest.java | 2 +- .../java/cn/hutool/extra/ssh/SftpTest.java | 2 +- .../hutool/extra/template/JetbrickTest.java | 2 +- .../extra/template/TemplateUtilTest.java | 2 +- .../hutool/extra/template/VelocityTest.java | 2 +- .../main/java/cn/hutool/http/ContentType.java | 2 +- .../java/cn/hutool/http/GlobalHeaders.java | 2 +- .../main/java/cn/hutool/http/HtmlUtil.java | 2 +- .../main/java/cn/hutool/http/HttpBase.java | 4 +- .../java/cn/hutool/http/HttpConnection.java | 12 +- .../java/cn/hutool/http/HttpException.java | 2 +- .../java/cn/hutool/http/HttpGlobalConfig.java | 2 +- .../java/cn/hutool/http/HttpInputStream.java | 2 +- .../main/java/cn/hutool/http/HttpRequest.java | 6 +- .../java/cn/hutool/http/HttpResponse.java | 8 +- .../main/java/cn/hutool/http/HttpUtil.java | 22 +- .../cn/hutool/http/MultipartOutputStream.java | 2 +- .../hutool/http/body/FormUrlEncodedBody.java | 2 +- .../http/cookie/GlobalCookieManager.java | 16 +- .../cn/hutool/http/server/HttpServerBase.java | 2 +- .../hutool/http/server/HttpServerRequest.java | 4 +- .../http/server/HttpServerResponse.java | 16 +- .../cn/hutool/http/server/SimpleServer.java | 2 +- .../cn/hutool/http/ssl/DefaultSSLInfo.java | 2 +- .../http/useragent/UserAgentParser.java | 2 +- .../cn/hutool/http/webservice/SoapClient.java | 6 +- .../http/webservice/SoapRuntimeException.java | 4 +- .../cn/hutool/http/webservice/SoapUtil.java | 10 +- .../java/cn/hutool/http/ContentTypeTest.java | 2 +- .../java/cn/hutool/http/HttpRequestTest.java | 2 +- .../java/cn/hutool/http/HttpUtilTest.java | 54 +- .../hutool/http/body/MultipartBodyTest.java | 2 +- .../http/webservice/SoapClientTest.java | 2 +- .../java/cn/hutool/json/InternalJSONUtil.java | 6 +- .../src/main/java/cn/hutool/json/JSON.java | 2 +- .../main/java/cn/hutool/json/JSONArray.java | 6 +- .../java/cn/hutool/json/JSONConverter.java | 8 +- .../java/cn/hutool/json/JSONException.java | 2 +- .../main/java/cn/hutool/json/JSONGetter.java | 2 +- .../main/java/cn/hutool/json/JSONNull.java | 2 +- .../main/java/cn/hutool/json/JSONObject.java | 8 +- .../java/cn/hutool/json/JSONStrFormatter.java | 2 +- .../main/java/cn/hutool/json/JSONTokener.java | 2 +- .../main/java/cn/hutool/json/JSONUtil.java | 12 +- .../java/cn/hutool/json/ObjectMapper.java | 2 +- .../src/main/java/cn/hutool/json/jwt/JWT.java | 4 +- .../java/cn/hutool/json/jwt/JWTException.java | 2 +- .../java/cn/hutool/json/jwt/JWTValidator.java | 2 +- .../json/jwt/signers/AlgorithmUtil.java | 6 +- .../json/jwt/signers/AsymmetricJWTSigner.java | 4 +- .../json/jwt/signers/HMacJWTSigner.java | 4 +- .../json/jwt/signers/NoneJWTSigner.java | 2 +- .../cn/hutool/json/serialize/JSONWriter.java | 2 +- .../cn/hutool/json/xml/JSONXMLSerializer.java | 2 +- .../java/cn/hutool/json/Issue1101Test.java | 2 +- .../java/cn/hutool/json/Issue488Test.java | 2 +- .../java/cn/hutool/json/IssuesI4V14NTest.java | 2 +- .../java/cn/hutool/json/JSONArrayTest.java | 8 +- .../java/cn/hutool/json/JSONObjectTest.java | 6 +- .../json/issueIVMD5/IssueIVMD5Test.java | 2 +- .../test/java/cn/hutool/json/jwt/JWTTest.java | 2 +- .../json/test/bean/report/StepReport.java | 14 +- .../main/java/cn/hutool/log/AbstractLog.java | 32 +- .../main/java/cn/hutool/log/StaticLog.java | 2 +- .../log/dialect/commons/ApacheCommonsLog.java | 10 +- .../log/dialect/console/ConsoleColorLog.java | 2 +- .../log/dialect/console/ConsoleLog.java | 2 +- .../cn/hutool/log/dialect/jboss/JbossLog.java | 10 +- .../cn/hutool/log/dialect/jdk/JdkLog.java | 16 +- .../cn/hutool/log/dialect/log4j/Log4jLog.java | 8 +- .../hutool/log/dialect/log4j2/Log4j2Log.java | 10 +- .../log/dialect/logtube/LogTubeLog.java | 2 +- .../cn/hutool/log/dialect/slf4j/Slf4jLog.java | 8 +- .../hutool/log/dialect/tinylog/TinyLog.java | 16 +- .../hutool/log/dialect/tinylog/TinyLog2.java | 2 +- .../java/cn/hutool/poi/csv/CsvBaseReader.java | 6 +- .../java/cn/hutool/poi/csv/CsvParser.java | 8 +- .../java/cn/hutool/poi/csv/CsvWriter.java | 6 +- .../cn/hutool/poi/excel/ExcelDateUtil.java | 2 +- .../cn/hutool/poi/excel/ExcelPicUtil.java | 2 +- .../java/cn/hutool/poi/excel/ExcelUtil.java | 42 +- .../java/cn/hutool/poi/excel/ExcelWriter.java | 10 +- .../java/cn/hutool/poi/excel/RowUtil.java | 2 +- .../cn/hutool/poi/excel/WorkbookUtil.java | 2 +- .../cn/hutool/poi/excel/cell/CellUtil.java | 8 +- .../cell/setters/EscapeStrCellSetter.java | 2 +- .../excel/cell/setters/NullCellSetter.java | 2 +- .../poi/excel/cell/values/ErrorCellValue.java | 2 +- .../excel/cell/values/NumericCellValue.java | 2 +- .../hutool/poi/excel/editors/TrimEditor.java | 2 +- .../poi/excel/reader/AbstractSheetReader.java | 4 +- .../poi/excel/reader/MapSheetReader.java | 2 +- .../poi/excel/sax/Excel03SaxReader.java | 6 +- .../poi/excel/sax/Excel07SaxReader.java | 8 +- .../cn/hutool/poi/excel/sax/ExcelSaxUtil.java | 2 +- .../poi/excel/sax/SheetDataSaxHandler.java | 6 +- .../hutool/poi/excel/sax/SheetRidReader.java | 2 +- .../cn/hutool/poi/excel/style/StyleUtil.java | 2 +- .../hutool/poi/exceptions/POIException.java | 2 +- .../java/cn/hutool/poi/csv/CsvParserTest.java | 2 +- .../java/cn/hutool/poi/csv/CsvReaderTest.java | 8 +- .../java/cn/hutool/poi/csv/CsvUtilTest.java | 8 +- .../java/cn/hutool/poi/csv/CsvWriterTest.java | 4 +- .../hutool/poi/excel/BigExcelWriteTest.java | 32 +- .../cn/hutool/poi/excel/ExcelReadTest.java | 4 +- .../cn/hutool/poi/excel/ExcelSaxReadTest.java | 2 +- .../cn/hutool/poi/excel/ExcelWriteTest.java | 6 +- .../java/cn/hutool/setting/AbsSetting.java | 10 +- .../java/cn/hutool/setting/GroupedMap.java | 30 +- .../java/cn/hutool/setting/GroupedSet.java | 38 +- .../main/java/cn/hutool/setting/Setting.java | 4 +- .../java/cn/hutool/setting/SettingLoader.java | 4 +- .../setting/SettingRuntimeException.java | 2 +- .../java/cn/hutool/setting/SettingUtil.java | 2 +- .../java/cn/hutool/setting/dialect/Props.java | 10 +- .../cn/hutool/setting/dialect/PropsUtil.java | 2 +- .../cn/hutool/setting/profile/Profile.java | 2 +- .../cn/hutool/setting/yaml/YamlUtilTest.java | 2 +- .../hutool/socket/SocketRuntimeException.java | 2 +- .../cn/hutool/socket/aio/AioClientTest.java | 2 +- .../cn/hutool/socket/aio/AioServerTest.java | 2 +- .../cn/hutool/socket/nio/NioClientTest.java | 2 +- .../cn/hutool/socket/nio/NioServerTest.java | 2 +- .../java/cn/hutool/swing/DesktopUtil.java | 2 +- .../hutool/swing/captcha/AbstractCaptcha.java | 2 +- .../hutool/swing/captcha/CircleCaptcha.java | 4 +- .../cn/hutool/swing/captcha/GifCaptcha.java | 4 +- .../cn/hutool/swing/captcha/LineCaptcha.java | 4 +- .../cn/hutool/swing/captcha/ShearCaptcha.java | 6 +- .../captcha/generator/MathGenerator.java | 2 +- .../captcha/generator/RandomGenerator.java | 2 +- .../swing/clipboard/ClipboardMonitor.java | 6 +- .../hutool/swing/img/BackgroundRemoval.java | 3 +- .../cn/hutool/swing/img/GraphicsUtil.java | 4 +- .../main/java/cn/hutool/swing/img/Img.java | 8 +- .../java/cn/hutool/swing/img/ImgUtil.java | 8 +- .../java/cn/hutool/swing/img/ImgTest.java | 2 +- 561 files changed, 1532 insertions(+), 4201 deletions(-) delete mode 100644 hutool-core/src/main/java/cn/hutool/core/builder/CompareToBuilder.java delete mode 100644 hutool-core/src/main/java/cn/hutool/core/builder/EqualsBuilder.java delete mode 100644 hutool-core/src/main/java/cn/hutool/core/builder/HashCodeBuilder.java delete mode 100644 hutool-core/src/main/java/cn/hutool/core/builder/IDKey.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/cache/SimpleCache.java rename hutool-core/src/main/java/cn/hutool/core/{util => compress}/ZipUtil.java (98%) mode change 100755 => 100644 delete mode 100644 hutool-core/src/main/java/cn/hutool/core/net/URLEncodeUtil.java create mode 100644 hutool-core/src/main/java/cn/hutool/core/net/URLEncoder.java rename hutool-core/src/main/java/cn/hutool/core/{util => net}/URLUtil.java (88%) rename hutool-core/src/main/java/cn/hutool/core/{lang => }/reflect/ActualTypeMapperPool.java (99%) mode change 100755 => 100644 rename hutool-core/src/main/java/cn/hutool/core/{lang => }/reflect/LookupFactory.java (98%) mode change 100755 => 100644 rename hutool-core/src/main/java/cn/hutool/core/{lang => }/reflect/MethodHandleUtil.java (98%) mode change 100755 => 100644 rename hutool-core/src/main/java/cn/hutool/core/{util => reflect}/ModifierUtil.java (99%) rename hutool-core/src/main/java/cn/hutool/core/{lang => }/reflect/ParameterizedTypeImpl.java (96%) mode change 100755 => 100644 rename hutool-core/src/main/java/cn/hutool/core/{util => reflect}/ReflectUtil.java (99%) mode change 100755 => 100644 rename hutool-core/src/main/java/cn/hutool/core/{lang => }/reflect/TypeReference.java (96%) mode change 100755 => 100644 rename hutool-core/src/main/java/cn/hutool/core/{lang => }/reflect/package-info.java (69%) mode change 100755 => 100644 rename hutool-core/src/main/java/cn/hutool/core/{util => text}/DesensitizedUtil.java (99%) rename hutool-core/src/main/java/cn/hutool/core/{util => text}/StrUtil.java (97%) mode change 100755 => 100644 rename hutool-core/src/main/java/cn/hutool/core/util/{ObjectUtil.java => ObjUtil.java} (97%) create mode 100644 hutool-core/src/test/java/cn/hutool/core/net/URLEncoderTest.java rename hutool-core/src/test/java/cn/hutool/core/{util => net}/URLUtilTest.java (81%) diff --git a/hutool-all/src/main/java/cn/hutool/Hutool.java b/hutool-all/src/main/java/cn/hutool/Hutool.java index 1b1b9749a..9e92a67a3 100644 --- a/hutool-all/src/main/java/cn/hutool/Hutool.java +++ b/hutool-all/src/main/java/cn/hutool/Hutool.java @@ -18,7 +18,7 @@ package cn.hutool; import cn.hutool.core.lang.ConsoleTable; import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.util.Set; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationProxy.java b/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationProxy.java index bcf2ba4b5..16733ad4c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationProxy.java +++ b/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationProxy.java @@ -1,7 +1,7 @@ package cn.hutool.core.annotation; -import cn.hutool.core.util.ReflectUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.reflect.ReflectUtil; +import cn.hutool.core.text.StrUtil; import java.io.Serializable; import java.lang.annotation.Annotation; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java b/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java index a75affb8d..cd6deba6b 100755 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java @@ -2,7 +2,7 @@ package cn.hutool.core.annotation; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.reflect.ReflectUtil; import java.lang.annotation.Annotation; import java.lang.annotation.Documented; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanDesc.java b/hutool-core/src/main/java/cn/hutool/core/bean/BeanDesc.java index 976f40d29..f394abb44 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanDesc.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/BeanDesc.java @@ -3,9 +3,9 @@ package cn.hutool.core.bean; import cn.hutool.core.lang.Assert; import cn.hutool.core.map.CaseInsensitiveMap; import cn.hutool.core.util.BooleanUtil; -import cn.hutool.core.util.ModifierUtil; -import cn.hutool.core.util.ReflectUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.reflect.ModifierUtil; +import cn.hutool.core.reflect.ReflectUtil; +import cn.hutool.core.text.StrUtil; import java.io.Serializable; import java.lang.reflect.Field; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanException.java b/hutool-core/src/main/java/cn/hutool/core/bean/BeanException.java index 227e28040..03110a304 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanException.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/BeanException.java @@ -1,7 +1,7 @@ package cn.hutool.core.bean; import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * Bean异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanPath.java b/hutool-core/src/main/java/cn/hutool/core/bean/BeanPath.java index ce92e3951..2fe9e6a93 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanPath.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/BeanPath.java @@ -6,7 +6,7 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.text.StrBuilder; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java b/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java index c51aa2b13..987806b2d 100755 --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java @@ -10,10 +10,10 @@ import cn.hutool.core.map.CaseInsensitiveMap; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.ModifierUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.ReflectUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.reflect.ModifierUtil; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.reflect.ReflectUtil; +import cn.hutool.core.text.StrUtil; import java.beans.BeanInfo; import java.beans.IntrospectionException; @@ -718,7 +718,7 @@ public class BeanUtil { * @param copyOptions 拷贝选项，见 {@link CopyOptions} */ public static void copyProperties(Object source, Object target, CopyOptions copyOptions) { - BeanCopier.create(source, target, ObjectUtil.defaultIfNull(copyOptions, CopyOptions::create)).copy(); + BeanCopier.create(source, target, ObjUtil.defaultIfNull(copyOptions, CopyOptions::create)).copy(); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/DynaBean.java b/hutool-core/src/main/java/cn/hutool/core/bean/DynaBean.java index a26ef6d83..1e5006c3e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/DynaBean.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/DynaBean.java @@ -3,7 +3,7 @@ package cn.hutool.core.bean; import cn.hutool.core.clone.CloneSupport; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.reflect.ReflectUtil; import java.io.Serializable; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/PropDesc.java b/hutool-core/src/main/java/cn/hutool/core/bean/PropDesc.java index af0d9edef..2e3a453a1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/PropDesc.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/PropDesc.java @@ -4,8 +4,8 @@ import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.annotation.PropIgnore; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.ModifierUtil; -import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.reflect.ModifierUtil; +import cn.hutool.core.reflect.ReflectUtil; import cn.hutool.core.util.TypeUtil; import java.beans.Transient; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/AbsCopier.java b/hutool-core/src/main/java/cn/hutool/core/bean/copier/AbsCopier.java index 19549100f..a85b5d3c3 100755 --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/AbsCopier.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/copier/AbsCopier.java @@ -1,7 +1,7 @@ package cn.hutool.core.bean.copier; import cn.hutool.core.lang.copier.Copier; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ObjUtil; /** * 抽象的对象拷贝封装，提供来源对象、目标对象持有 @@ -23,6 +23,6 @@ public abstract class AbsCopier implements Copier { public AbsCopier(S source, T target, CopyOptions copyOptions) { this.source = source; this.target = target; - this.copyOptions = ObjectUtil.defaultIfNull(copyOptions, CopyOptions::create); + this.copyOptions = ObjUtil.defaultIfNull(copyOptions, CopyOptions::create); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToBeanCopier.java b/hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToBeanCopier.java index 349bf7d6c..194099628 100755 --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToBeanCopier.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToBeanCopier.java @@ -5,7 +5,7 @@ import cn.hutool.core.bean.PropDesc; import cn.hutool.core.lang.Assert; import cn.hutool.core.map.CaseInsensitiveMap; import cn.hutool.core.map.MapWrapper; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import cn.hutool.core.util.TypeUtil; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/cn/hutool/core/builder/CompareToBuilder.java b/hutool-core/src/main/java/cn/hutool/core/builder/CompareToBuilder.java deleted file mode 100644 index ca51cc37c..000000000 --- a/hutool-core/src/main/java/cn/hutool/core/builder/CompareToBuilder.java +++ /dev/null @@ -1,975 +0,0 @@ -package cn.hutool.core.builder; - -import cn.hutool.core.util.ArrayUtil; - -import java.lang.reflect.AccessibleObject; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.Collection; -import java.util.Comparator; - -/** - * 用于构建 {@link java.lang.Comparable#compareTo(Object)} 方法的辅助工具 - * - *

- * 在Bean对象中，所有相关字段都参与比对，继承的字段不参与。使用方法如下： - * - * 

- * public class MyClass {
- *   String field1;
- *   int field2;
- *   boolean field3;
- *
- *   ...
- *
- *   public int compareTo(Object o) {
- *     MyClass myClass = (MyClass) o;
- *     return new CompareToBuilder()
- *       .appendSuper(super.compareTo(o)
- *       .append(this.field1, myClass.field1)
- *       .append(this.field2, myClass.field2)
- *       .append(this.field3, myClass.field3)
- *       .toComparison();
- *   }
- * }
- *
- * - * 字段值按照顺序比较，如果某个字段返回非0结果，比较终止，使用{@code toComparison()}返回结果，后续比较忽略。 - * - *

- * 也可以使用{@link #reflectionCompare(Object, Object) reflectionCompare} 方法通过反射比较字段，使用方法如下： - * - * 

- * public int compareTo(Object o) {
- *   return CompareToBuilder.reflectionCompare(this, o);
- * }
- *
- * - *TODO 待整理 - * 来自于Apache-Commons-Lang3 - * @author looly，Apache-Commons - * @since 4.2.2 - */ -public class CompareToBuilder implements Builder { - private static final long serialVersionUID = 1L; - - /** 当前比较状态 */ - private int comparison; - - /** - * 构造，构造后调用append方法增加比较项，然后调用{@link #toComparison()}获取结果 - */ - public CompareToBuilder() { - comparison = 0; - } - - //----------------------------------------------------------------------- - /** - * 通过反射比较两个Bean对象，对象字段可以为private。比较规则如下： - * - *
    - *
  • static字段不比较
    • - *
  • Transient字段不参与比较
    • - *
  • 父类字段参与比较
    • - *
- * - *

- *如果被比较的两个对象都为null，被认为相同。 - * - * @param lhs 第一个对象 - * @param rhs 第二个对象 - * @return a negative integer, zero, or a positive integer as lhs - * is less than, equal to, or greater than rhs - * @throws NullPointerException if either (but not both) parameters are - * null - * @throws ClassCastException if rhs is not assignment-compatible - * with lhs - */ - public static int reflectionCompare(final Object lhs, final Object rhs) { - return reflectionCompare(lhs, rhs, false, null); - } - - /** - *

Compares two Objects via reflection.

- * - *

Fields can be private, thus AccessibleObject.setAccessible - * is used to bypass normal access control checks. This will fail under a - * security manager unless the appropriate permissions are set.

- * - *
    - *
  • Static fields will not be compared
    • - *
  • If compareTransients is true, - * compares transient members. Otherwise ignores them, as they - * are likely derived fields.
    • - *
  • Superclass fields will be compared
    • - *
- * - *

If both lhs and rhs are null, - * they are considered equal.

- * - * @param lhs left-hand object - * @param rhs right-hand object - * @param compareTransients whether to compare transient fields - * @return a negative integer, zero, or a positive integer as lhs - * is less than, equal to, or greater than rhs - * @throws NullPointerException if either lhs or rhs - * (but not both) is null - * @throws ClassCastException if rhs is not assignment-compatible - * with lhs - */ - public static int reflectionCompare(final Object lhs, final Object rhs, final boolean compareTransients) { - return reflectionCompare(lhs, rhs, compareTransients, null); - } - - /** - *

Compares two Objects via reflection.

- * - *

Fields can be private, thus AccessibleObject.setAccessible - * is used to bypass normal access control checks. This will fail under a - * security manager unless the appropriate permissions are set.

- * - *
    - *
  • Static fields will not be compared
    • - *
  • If compareTransients is true, - * compares transient members. Otherwise ignores them, as they - * are likely derived fields.
    • - *
  • Superclass fields will be compared
    • - *
- * - *

If both lhs and rhs are null, - * they are considered equal.

- * - * @param lhs left-hand object - * @param rhs right-hand object - * @param excludeFields Collection of String fields to exclude - * @return a negative integer, zero, or a positive integer as lhs - * is less than, equal to, or greater than rhs - * @throws NullPointerException if either lhs or rhs - * (but not both) is null - * @throws ClassCastException if rhs is not assignment-compatible - * with lhs - * @since 2.2 - */ - public static int reflectionCompare(final Object lhs, final Object rhs, final Collection excludeFields) { - return reflectionCompare(lhs, rhs, ArrayUtil.toArray(excludeFields, String.class)); - } - - /** - *

Compares two Objects via reflection.

- * - *

Fields can be private, thus AccessibleObject.setAccessible - * is used to bypass normal access control checks. This will fail under a - * security manager unless the appropriate permissions are set.

- * - *
    - *
  • Static fields will not be compared
    • - *
  • If compareTransients is true, - * compares transient members. Otherwise ignores them, as they - * are likely derived fields.
    • - *
  • Superclass fields will be compared
    • - *
- * - *

If both lhs and rhs are null, - * they are considered equal.

- * - * @param lhs left-hand object - * @param rhs right-hand object - * @param excludeFields array of fields to exclude - * @return a negative integer, zero, or a positive integer as lhs - * is less than, equal to, or greater than rhs - * @throws NullPointerException if either lhs or rhs - * (but not both) is null - * @throws ClassCastException if rhs is not assignment-compatible - * with lhs - * @since 2.2 - */ - public static int reflectionCompare(final Object lhs, final Object rhs, final String... excludeFields) { - return reflectionCompare(lhs, rhs, false, null, excludeFields); - } - - /** - *

Compares two Objects via reflection.

- * - *

Fields can be private, thus AccessibleObject.setAccessible - * is used to bypass normal access control checks. This will fail under a - * security manager unless the appropriate permissions are set.

- * - *
    - *
  • Static fields will not be compared
    • - *
  • If the compareTransients is true, - * compares transient members. Otherwise ignores them, as they - * are likely derived fields.
    • - *
  • Compares superclass fields up to and including reflectUpToClass. - * If reflectUpToClass is null, compares all superclass fields.
    • - *
- * - *

If both lhs and rhs are null, - * they are considered equal.

- * - * @param lhs left-hand object - * @param rhs right-hand object - * @param compareTransients whether to compare transient fields - * @param reflectUpToClass last superclass for which fields are compared - * @param excludeFields fields to exclude - * @return a negative integer, zero, or a positive integer as lhs - * is less than, equal to, or greater than rhs - * @throws NullPointerException if either lhs or rhs - * (but not both) is null - * @throws ClassCastException if rhs is not assignment-compatible - * with lhs - * @since 2.2 (2.0 as reflectionCompare(Object, Object, boolean, Class)) - */ - public static int reflectionCompare( - final Object lhs, - final Object rhs, - final boolean compareTransients, - final Class reflectUpToClass, - final String... excludeFields) { - - if (lhs == rhs) { - return 0; - } - if (lhs == null || rhs == null) { - throw new NullPointerException(); - } - Class lhsClazz = lhs.getClass(); - if (!lhsClazz.isInstance(rhs)) { - throw new ClassCastException(); - } - final CompareToBuilder compareToBuilder = new CompareToBuilder(); - reflectionAppend(lhs, rhs, lhsClazz, compareToBuilder, compareTransients, excludeFields); - while (lhsClazz.getSuperclass() != null && lhsClazz != reflectUpToClass) { - lhsClazz = lhsClazz.getSuperclass(); - reflectionAppend(lhs, rhs, lhsClazz, compareToBuilder, compareTransients, excludeFields); - } - return compareToBuilder.toComparison(); - } - - /** - *

Appends to builder the comparison of lhs - * to rhs using the fields defined in clazz.

- * - * @param lhs left-hand object - * @param rhs right-hand object - * @param clazz Class that defines fields to be compared - * @param builder CompareToBuilder to append to - * @param useTransients whether to compare transient fields - * @param excludeFields fields to exclude - */ - private static void reflectionAppend( - final Object lhs, - final Object rhs, - final Class clazz, - final CompareToBuilder builder, - final boolean useTransients, - final String[] excludeFields) { - - final Field[] fields = clazz.getDeclaredFields(); - AccessibleObject.setAccessible(fields, true); - for (int i = 0; i < fields.length && builder.comparison == 0; i++) { - final Field f = fields[i]; - if (false == ArrayUtil.contains(excludeFields, f.getName()) - && (f.getName().indexOf('$') == -1) - && (useTransients || !Modifier.isTransient(f.getModifiers())) - && (!Modifier.isStatic(f.getModifiers()))) { - try { - builder.append(f.get(lhs), f.get(rhs)); - } catch (final IllegalAccessException e) { - // This can't happen. Would get a Security exception instead. - // Throw a runtime exception in case the impossible happens. - throw new InternalError("Unexpected IllegalAccessException"); - } - } - } - } - - //----------------------------------------------------------------------- - /** - *

Appends to the builder the compareTo(Object) - * result of the superclass.

- * - * @param superCompareTo result of calling super.compareTo(Object) - * @return this - used to chain append calls - * @since 2.0 - */ - public CompareToBuilder appendSuper(final int superCompareTo) { - if (comparison != 0) { - return this; - } - comparison = superCompareTo; - return this; - } - - //----------------------------------------------------------------------- - /** - *

Appends to the builder the comparison of - * two Objects.

- * - *
    - *
  1. Check if lhs == rhs
    2. - *
  2. Check if either lhs or rhs is null, - * a null object is less than a non-null object
    3. - *
  3. Check the object contents
    4. - *
- * - *

lhs must either be an array or implement {@link Comparable}.

- * - * @param lhs left-hand object - * @param rhs right-hand object - * @return this - used to chain append calls - * @throws ClassCastException if rhs is not assignment-compatible - * with lhs - */ - public CompareToBuilder append(final Object lhs, final Object rhs) { - return append(lhs, rhs, null); - } - - /** - *

Appends to the builder the comparison of - * two Objects.

- * - *
    - *
  1. Check if lhs == rhs
    2. - *
  2. Check if either lhs or rhs is null, - * a null object is less than a non-null object
    3. - *
  3. Check the object contents
    4. - *
- * - *

If lhs is an array, array comparison methods will be used. - * Otherwise comparator will be used to compare the objects. - * If comparator is null, lhs must - * implement {@link Comparable} instead.

- * - * @param lhs left-hand object - * @param rhs right-hand object - * @param comparator Comparator used to compare the objects, - * null means treat lhs as Comparable - * @return this - used to chain append calls - * @throws ClassCastException if rhs is not assignment-compatible - * with lhs - * @since 2.0 - */ - public CompareToBuilder append(final Object lhs, final Object rhs, final Comparator comparator) { - if (comparison != 0) { - return this; - } - if (lhs == rhs) { - return this; - } - if (lhs == null) { - comparison = -1; - return this; - } - if (rhs == null) { - comparison = +1; - return this; - } - if (lhs.getClass().isArray()) { - // switch on type of array, to dispatch to the correct handler - // handles multi dimensional arrays - // throws a ClassCastException if rhs is not the correct array type - if (lhs instanceof long[]) { - append((long[]) lhs, (long[]) rhs); - } else if (lhs instanceof int[]) { - append((int[]) lhs, (int[]) rhs); - } else if (lhs instanceof short[]) { - append((short[]) lhs, (short[]) rhs); - } else if (lhs instanceof char[]) { - append((char[]) lhs, (char[]) rhs); - } else if (lhs instanceof byte[]) { - append((byte[]) lhs, (byte[]) rhs); - } else if (lhs instanceof double[]) { - append((double[]) lhs, (double[]) rhs); - } else if (lhs instanceof float[]) { - append((float[]) lhs, (float[]) rhs); - } else if (lhs instanceof boolean[]) { - append((boolean[]) lhs, (boolean[]) rhs); - } else { - // not an array of primitives - // throws a ClassCastException if rhs is not an array - append((Object[]) lhs, (Object[]) rhs, comparator); - } - } else { - // the simple case, not an array, just test the element - if (comparator == null) { - @SuppressWarnings("unchecked") // assume this can be done; if not throw CCE as per Javadoc - final Comparable comparable = (Comparable) lhs; - comparison = comparable.compareTo(rhs); - } else { - @SuppressWarnings("unchecked") // assume this can be done; if not throw CCE as per Javadoc - final Comparator comparator2 = (Comparator) comparator; - comparison = comparator2.compare(lhs, rhs); - } - } - return this; - } - - //------------------------------------------------------------------------- - /** - * Appends to the builder the comparison of - * two longs. - * - * @param lhs left-hand value - * @param rhs right-hand value - * @return this - used to chain append calls - */ - public CompareToBuilder append(final long lhs, final long rhs) { - if (comparison != 0) { - return this; - } - comparison = (Long.compare(lhs, rhs)); - return this; - } - - /** - * Appends to the builder the comparison of - * two ints. - * - * @param lhs left-hand value - * @param rhs right-hand value - * @return this - used to chain append calls - */ - public CompareToBuilder append(final int lhs, final int rhs) { - if (comparison != 0) { - return this; - } - comparison = (Integer.compare(lhs, rhs)); - return this; - } - - /** - * Appends to the builder the comparison of - * two shorts. - * - * @param lhs left-hand value - * @param rhs right-hand value - * @return this - used to chain append calls - */ - public CompareToBuilder append(final short lhs, final short rhs) { - if (comparison != 0) { - return this; - } - comparison = (Short.compare(lhs, rhs)); - return this; - } - - /** - * Appends to the builder the comparison of - * two chars. - * - * @param lhs left-hand value - * @param rhs right-hand value - * @return this - used to chain append calls - */ - public CompareToBuilder append(final char lhs, final char rhs) { - if (comparison != 0) { - return this; - } - comparison = (Character.compare(lhs, rhs)); - return this; - } - - /** - * Appends to the builder the comparison of - * two bytes. - * - * @param lhs left-hand value - * @param rhs right-hand value - * @return this - used to chain append calls - */ - public CompareToBuilder append(final byte lhs, final byte rhs) { - if (comparison != 0) { - return this; - } - comparison = (Byte.compare(lhs, rhs)); - return this; - } - - /** - *

Appends to the builder the comparison of - * two doubles.

- * - *

This handles NaNs, Infinities, and -0.0.

- * - *

It is compatible with the hash code generated by - * HashCodeBuilder.

- * - * @param lhs left-hand value - * @param rhs right-hand value - * @return this - used to chain append calls - */ - public CompareToBuilder append(final double lhs, final double rhs) { - if (comparison != 0) { - return this; - } - comparison = Double.compare(lhs, rhs); - return this; - } - - /** - *

Appends to the builder the comparison of - * two floats.

- * - *

This handles NaNs, Infinities, and -0.0.

- * - *

It is compatible with the hash code generated by - * HashCodeBuilder.

- * - * @param lhs left-hand value - * @param rhs right-hand value - * @return this - used to chain append calls - */ - public CompareToBuilder append(final float lhs, final float rhs) { - if (comparison != 0) { - return this; - } - comparison = Float.compare(lhs, rhs); - return this; - } - - /** - * Appends to the builder the comparison of - * two booleanss. - * - * @param lhs left-hand value - * @param rhs right-hand value - * @return this - used to chain append calls - */ - public CompareToBuilder append(final boolean lhs, final boolean rhs) { - if (comparison != 0) { - return this; - } - if (lhs == rhs) { - return this; - } - if (lhs == false) { - comparison = -1; - } else { - comparison = +1; - } - return this; - } - - //----------------------------------------------------------------------- - /** - *

Appends to the builder the deep comparison of - * two Object arrays.

- * - *
    - *
  1. Check if arrays are the same using ==
    2. - *
  2. Check if for null, null is less than non-null
    3. - *
  3. Check array length, a short length array is less than a long length array
    4. - *
  4. Check array contents element by element using {@link #append(Object, Object, Comparator)}
    5. - *
- * - *

This method will also will be called for the top level of multi-dimensional, - * ragged, and multi-typed arrays.

- * - * @param lhs left-hand array - * @param rhs right-hand array - * @return this - used to chain append calls - * @throws ClassCastException if rhs is not assignment-compatible - * with lhs - */ - public CompareToBuilder append(final Object[] lhs, final Object[] rhs) { - return append(lhs, rhs, null); - } - - /** - *

Appends to the builder the deep comparison of - * two Object arrays.

- * - *
    - *
  1. Check if arrays are the same using ==
    2. - *
  2. Check if for null, null is less than non-null
    3. - *
  3. Check array length, a short length array is less than a long length array
    4. - *
  4. Check array contents element by element using {@link #append(Object, Object, Comparator)}
    5. - *
- * - *

This method will also will be called for the top level of multi-dimensional, - * ragged, and multi-typed arrays.

- * - * @param lhs left-hand array - * @param rhs right-hand array - * @param comparator Comparator to use to compare the array elements, - * null means to treat lhs elements as Comparable. - * @return this - used to chain append calls - * @throws ClassCastException if rhs is not assignment-compatible - * with lhs - * @since 2.0 - */ - public CompareToBuilder append(final Object[] lhs, final Object[] rhs, final Comparator comparator) { - if (comparison != 0) { - return this; - } - if (lhs == rhs) { - return this; - } - if (lhs == null) { - comparison = -1; - return this; - } - if (rhs == null) { - comparison = +1; - return this; - } - if (lhs.length != rhs.length) { - comparison = (lhs.length < rhs.length) ? -1 : +1; - return this; - } - for (int i = 0; i < lhs.length && comparison == 0; i++) { - append(lhs[i], rhs[i], comparator); - } - return this; - } - - /** - *

Appends to the builder the deep comparison of - * two long arrays.

- * - *
    - *
  1. Check if arrays are the same using ==
    2. - *
  2. Check if for null, null is less than non-null
    3. - *
  3. Check array length, a shorter length array is less than a longer length array
    4. - *
  4. Check array contents element by element using {@link #append(long, long)}
    5. - *
- * - * @param lhs left-hand array - * @param rhs right-hand array - * @return this - used to chain append calls - */ - public CompareToBuilder append(final long[] lhs, final long[] rhs) { - if (comparison != 0) { - return this; - } - if (lhs == rhs) { - return this; - } - if (lhs == null) { - comparison = -1; - return this; - } - if (rhs == null) { - comparison = +1; - return this; - } - if (lhs.length != rhs.length) { - comparison = (lhs.length < rhs.length) ? -1 : +1; - return this; - } - for (int i = 0; i < lhs.length && comparison == 0; i++) { - append(lhs[i], rhs[i]); - } - return this; - } - - /** - *

Appends to the builder the deep comparison of - * two int arrays.

- * - *
    - *
  1. Check if arrays are the same using ==
    2. - *
  2. Check if for null, null is less than non-null
    3. - *
  3. Check array length, a shorter length array is less than a longer length array
    4. - *
  4. Check array contents element by element using {@link #append(int, int)}
    5. - *
- * - * @param lhs left-hand array - * @param rhs right-hand array - * @return this - used to chain append calls - */ - public CompareToBuilder append(final int[] lhs, final int[] rhs) { - if (comparison != 0) { - return this; - } - if (lhs == rhs) { - return this; - } - if (lhs == null) { - comparison = -1; - return this; - } - if (rhs == null) { - comparison = +1; - return this; - } - if (lhs.length != rhs.length) { - comparison = (lhs.length < rhs.length) ? -1 : +1; - return this; - } - for (int i = 0; i < lhs.length && comparison == 0; i++) { - append(lhs[i], rhs[i]); - } - return this; - } - - /** - *

Appends to the builder the deep comparison of - * two short arrays.

- * - *
    - *
  1. Check if arrays are the same using ==
    2. - *
  2. Check if for null, null is less than non-null
    3. - *
  3. Check array length, a shorter length array is less than a longer length array
    4. - *
  4. Check array contents element by element using {@link #append(short, short)}
    5. - *
- * - * @param lhs left-hand array - * @param rhs right-hand array - * @return this - used to chain append calls - */ - public CompareToBuilder append(final short[] lhs, final short[] rhs) { - if (comparison != 0) { - return this; - } - if (lhs == rhs) { - return this; - } - if (lhs == null) { - comparison = -1; - return this; - } - if (rhs == null) { - comparison = +1; - return this; - } - if (lhs.length != rhs.length) { - comparison = (lhs.length < rhs.length) ? -1 : +1; - return this; - } - for (int i = 0; i < lhs.length && comparison == 0; i++) { - append(lhs[i], rhs[i]); - } - return this; - } - - /** - *

Appends to the builder the deep comparison of - * two char arrays.

- * - *
    - *
  1. Check if arrays are the same using ==
    2. - *
  2. Check if for null, null is less than non-null
    3. - *
  3. Check array length, a shorter length array is less than a longer length array
    4. - *
  4. Check array contents element by element using {@link #append(char, char)}
    5. - *
- * - * @param lhs left-hand array - * @param rhs right-hand array - * @return this - used to chain append calls - */ - public CompareToBuilder append(final char[] lhs, final char[] rhs) { - if (comparison != 0) { - return this; - } - if (lhs == rhs) { - return this; - } - if (lhs == null) { - comparison = -1; - return this; - } - if (rhs == null) { - comparison = +1; - return this; - } - if (lhs.length != rhs.length) { - comparison = (lhs.length < rhs.length) ? -1 : +1; - return this; - } - for (int i = 0; i < lhs.length && comparison == 0; i++) { - append(lhs[i], rhs[i]); - } - return this; - } - - /** - *

Appends to the builder the deep comparison of - * two byte arrays.

- * - *
    - *
  1. Check if arrays are the same using ==
    2. - *
  2. Check if for null, null is less than non-null
    3. - *
  3. Check array length, a shorter length array is less than a longer length array
    4. - *
  4. Check array contents element by element using {@link #append(byte, byte)}
    5. - *
- * - * @param lhs left-hand array - * @param rhs right-hand array - * @return this - used to chain append calls - */ - public CompareToBuilder append(final byte[] lhs, final byte[] rhs) { - if (comparison != 0) { - return this; - } - if (lhs == rhs) { - return this; - } - if (lhs == null) { - comparison = -1; - return this; - } - if (rhs == null) { - comparison = +1; - return this; - } - if (lhs.length != rhs.length) { - comparison = (lhs.length < rhs.length) ? -1 : +1; - return this; - } - for (int i = 0; i < lhs.length && comparison == 0; i++) { - append(lhs[i], rhs[i]); - } - return this; - } - - /** - *

Appends to the builder the deep comparison of - * two double arrays.

- * - *
    - *
  1. Check if arrays are the same using ==
    2. - *
  2. Check if for null, null is less than non-null
    3. - *
  3. Check array length, a shorter length array is less than a longer length array
    4. - *
  4. Check array contents element by element using {@link #append(double, double)}
    5. - *
- * - * @param lhs left-hand array - * @param rhs right-hand array - * @return this - used to chain append calls - */ - public CompareToBuilder append(final double[] lhs, final double[] rhs) { - if (comparison != 0) { - return this; - } - if (lhs == rhs) { - return this; - } - if (lhs == null) { - comparison = -1; - return this; - } - if (rhs == null) { - comparison = +1; - return this; - } - if (lhs.length != rhs.length) { - comparison = (lhs.length < rhs.length) ? -1 : +1; - return this; - } - for (int i = 0; i < lhs.length && comparison == 0; i++) { - append(lhs[i], rhs[i]); - } - return this; - } - - /** - *

Appends to the builder the deep comparison of - * two float arrays.

- * - *
    - *
  1. Check if arrays are the same using ==
    2. - *
  2. Check if for null, null is less than non-null
    3. - *
  3. Check array length, a shorter length array is less than a longer length array
    4. - *
  4. Check array contents element by element using {@link #append(float, float)}
    5. - *
- * - * @param lhs left-hand array - * @param rhs right-hand array - * @return this - used to chain append calls - */ - public CompareToBuilder append(final float[] lhs, final float[] rhs) { - if (comparison != 0) { - return this; - } - if (lhs == rhs) { - return this; - } - if (lhs == null) { - comparison = -1; - return this; - } - if (rhs == null) { - comparison = +1; - return this; - } - if (lhs.length != rhs.length) { - comparison = (lhs.length < rhs.length) ? -1 : +1; - return this; - } - for (int i = 0; i < lhs.length && comparison == 0; i++) { - append(lhs[i], rhs[i]); - } - return this; - } - - /** - *

Appends to the builder the deep comparison of - * two boolean arrays.

- * - *
    - *
  1. Check if arrays are the same using ==
    2. - *
  2. Check if for null, null is less than non-null
    3. - *
  3. Check array length, a shorter length array is less than a longer length array
    4. - *
  4. Check array contents element by element using {@link #append(boolean, boolean)}
    5. - *
- * - * @param lhs left-hand array - * @param rhs right-hand array - * @return this - used to chain append calls - */ - public CompareToBuilder append(final boolean[] lhs, final boolean[] rhs) { - if (comparison != 0) { - return this; - } - if (lhs == rhs) { - return this; - } - if (lhs == null) { - comparison = -1; - return this; - } - if (rhs == null) { - comparison = +1; - return this; - } - if (lhs.length != rhs.length) { - comparison = (lhs.length < rhs.length) ? -1 : +1; - return this; - } - for (int i = 0; i < lhs.length && comparison == 0; i++) { - append(lhs[i], rhs[i]); - } - return this; - } - - //----------------------------------------------------------------------- - /** - * Returns a negative integer, a positive integer, or zero as - * the builder has judged the "left-hand" side - * as less than, greater than, or equal to the "right-hand" - * side. - * - * @return final comparison result - * @see #build() - */ - public int toComparison() { - return comparison; - } - - /** - * Returns a negative Integer, a positive Integer, or zero as - * the builder has judged the "left-hand" side - * as less than, greater than, or equal to the "right-hand" - * side. - * - * @return final comparison result as an Integer - * @see #toComparison() - * @since 3.0 - */ - @Override - public Integer build() { - return toComparison(); - } -} - diff --git a/hutool-core/src/main/java/cn/hutool/core/builder/EqualsBuilder.java b/hutool-core/src/main/java/cn/hutool/core/builder/EqualsBuilder.java deleted file mode 100644 index e68ccdf38..000000000 --- a/hutool-core/src/main/java/cn/hutool/core/builder/EqualsBuilder.java +++ /dev/null @@ -1,563 +0,0 @@ -package cn.hutool.core.builder; - -import cn.hutool.core.lang.Pair; -import cn.hutool.core.util.ArrayUtil; - -import java.lang.reflect.AccessibleObject; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; - -/** - *

{@link Object#equals(Object)} 方法的构建器

- * - *

两个对象equals必须保证hashCode值相等，hashCode值相等不能保证一定equals

- * - *

使用方法如下：

- * 
- * public boolean equals(Object obj) {
- *   if (obj == null) { return false; }
- *   if (obj == this) { return true; }
- *   if (obj.getClass() != getClass()) {
- *     return false;
- *   }
- *   MyClass rhs = (MyClass) obj;
- *   return new EqualsBuilder()
- *                 .appendSuper(super.equals(obj))
- *                 .append(field1, rhs.field1)
- *                 .append(field2, rhs.field2)
- *                 .append(field3, rhs.field3)
- *                 .isEquals();
- *  }
- *
- * - *

我们也可以通过反射判断所有字段是否equals：

- * 
- * public boolean equals(Object obj) {
- *   return EqualsBuilder.reflectionEquals(this, obj);
- * }
- *
- *

- * 来自Apache Commons Lang改造 - */ -public class EqualsBuilder implements Builder { - private static final long serialVersionUID = 1L; - - /** - *

- * A registry of objects used by reflection methods to detect cyclical object references and avoid infinite loops. - *

- */ - private static final ThreadLocal>> REGISTRY = new ThreadLocal<>(); - - /** - *

- * Returns the registry of object pairs being traversed by the reflection - * methods in the current thread. - *

- * - * @return Set the registry of objects being traversed - * @since 3.0 - */ - static Set> getRegistry() { - return REGISTRY.get(); - } - - /** - *

- * Converters value pair into a register pair. - *

- * - * @param lhs {@code this} object - * @param rhs the other object - * @return the pair - */ - static Pair getRegisterPair(final Object lhs, final Object rhs) { - final IDKey left = new IDKey(lhs); - final IDKey right = new IDKey(rhs); - return new Pair<>(left, right); - } - - /** - *

- * Returns {@code true} if the registry contains the given object pair. - * Used by the reflection methods to avoid infinite loops. - * Objects might be swapped therefore a check is needed if the object pair - * is registered in given or swapped order. - *

- * - * @param lhs {@code this} object to lookup in registry - * @param rhs the other object to lookup on registry - * @return boolean {@code true} if the registry contains the given object. - * @since 3.0 - */ - static boolean isRegistered(final Object lhs, final Object rhs) { - final Set> registry = getRegistry(); - final Pair pair = getRegisterPair(lhs, rhs); - final Pair swappedPair = new Pair<>(pair.getKey(), pair.getValue()); - - return registry != null - && (registry.contains(pair) || registry.contains(swappedPair)); - } - - /** - *

- * Registers the given object pair. - * Used by the reflection methods to avoid infinite loops. - *

- * - * @param lhs {@code this} object to register - * @param rhs the other object to register - */ - static void register(final Object lhs, final Object rhs) { - synchronized (EqualsBuilder.class) { - if (getRegistry() == null) { - REGISTRY.set(new HashSet<>()); - } - } - - final Set> registry = getRegistry(); - final Pair pair = getRegisterPair(lhs, rhs); - registry.add(pair); - } - - /** - *

- * Unregisters the given object pair. - *

- * - *

- * Used by the reflection methods to avoid infinite loops. - * - * @param lhs {@code this} object to unregister - * @param rhs the other object to unregister - * @since 3.0 - */ - static void unregister(final Object lhs, final Object rhs) { - Set> registry = getRegistry(); - if (registry != null) { - final Pair pair = getRegisterPair(lhs, rhs); - registry.remove(pair); - synchronized (EqualsBuilder.class) { - //read again - registry = getRegistry(); - if (registry != null && registry.isEmpty()) { - REGISTRY.remove(); - } - } - } - } - - /** - * 是否equals，此值随着构建会变更，默认true - */ - private boolean isEquals = true; - - /** - * 构造，初始状态值为true - */ - public EqualsBuilder() { - // do nothing for now. - } - - //------------------------------------------------------------------------- - - /** - *

反射检查两个对象是否equals，此方法检查对象及其父对象的属性（包括私有属性）是否equals

- * - * @param lhs 此对象 - * @param rhs 另一个对象 - * @param excludeFields 排除的字段集合，如果有不参与计算equals的字段加入此集合即可 - * @return 两个对象是否equals，是返回{@code true} - */ - public static boolean reflectionEquals(final Object lhs, final Object rhs, final Collection excludeFields) { - return reflectionEquals(lhs, rhs, ArrayUtil.toArray(excludeFields, String.class)); - } - - /** - *

反射检查两个对象是否equals，此方法检查对象及其父对象的属性（包括私有属性）是否equals

- * - * @param lhs 此对象 - * @param rhs 另一个对象 - * @param excludeFields 排除的字段集合，如果有不参与计算equals的字段加入此集合即可 - * @return 两个对象是否equals，是返回{@code true} - */ - public static boolean reflectionEquals(final Object lhs, final Object rhs, final String... excludeFields) { - return reflectionEquals(lhs, rhs, false, null, excludeFields); - } - - /** - *

This method uses reflection to determine if the two {@code Object}s - * are equal.

- * - *

It uses {@code AccessibleObject.setAccessible} to gain access to private - * fields. This means that it will throw a security exception if run under - * a security manager, if the permissions are not set up correctly. It is also - * not as efficient as testing explicitly. Non-primitive fields are compared using - * {@code equals()}.

- * - *

If the TestTransients parameter is set to {@code true}, transient - * members will be tested, otherwise they are ignored, as they are likely - * derived fields, and not part of the value of the {@code Object}.

- * - *

Static fields will not be tested. Superclass fields will be included.

- * - * @param lhs {@code this} object - * @param rhs the other object - * @param testTransients whether to include transient fields - * @return {@code true} if the two Objects have tested equals. - */ - public static boolean reflectionEquals(final Object lhs, final Object rhs, final boolean testTransients) { - return reflectionEquals(lhs, rhs, testTransients, null); - } - - /** - *

This method uses reflection to determine if the two {@code Object}s - * are equal.

- * - *

It uses {@code AccessibleObject.setAccessible} to gain access to private - * fields. This means that it will throw a security exception if run under - * a security manager, if the permissions are not set up correctly. It is also - * not as efficient as testing explicitly. Non-primitive fields are compared using - * {@code equals()}.

- * - *

If the testTransients parameter is set to {@code true}, transient - * members will be tested, otherwise they are ignored, as they are likely - * derived fields, and not part of the value of the {@code Object}.

- * - *

Static fields will not be included. Superclass fields will be appended - * up to and including the specified superclass. A null superclass is treated - * as java.lang.Object.

- * - * @param lhs {@code this} object - * @param rhs the other object - * @param testTransients whether to include transient fields - * @param reflectUpToClass the superclass to reflect up to (inclusive), - * may be {@code null} - * @param excludeFields array of field names to exclude from testing - * @return {@code true} if the two Objects have tested equals. - * @since 2.0 - */ - public static boolean reflectionEquals(final Object lhs, final Object rhs, final boolean testTransients, final Class reflectUpToClass, - final String... excludeFields) { - if (lhs == rhs) { - return true; - } - if (lhs == null || rhs == null) { - return false; - } - // Find the leaf class since there may be transients in the leaf - // class or in classes between the leaf and root. - // If we are not testing transients or a subclass has no ivars, - // then a subclass can test equals to a superclass. - final Class lhsClass = lhs.getClass(); - final Class rhsClass = rhs.getClass(); - Class testClass; - if (lhsClass.isInstance(rhs)) { - testClass = lhsClass; - if (!rhsClass.isInstance(lhs)) { - // rhsClass is a subclass of lhsClass - testClass = rhsClass; - } - } else if (rhsClass.isInstance(lhs)) { - testClass = rhsClass; - if (!lhsClass.isInstance(rhs)) { - // lhsClass is a subclass of rhsClass - testClass = lhsClass; - } - } else { - // The two classes are not related. - return false; - } - final EqualsBuilder equalsBuilder = new EqualsBuilder(); - try { - if (testClass.isArray()) { - equalsBuilder.append(lhs, rhs); - } else { - reflectionAppend(lhs, rhs, testClass, equalsBuilder, testTransients, excludeFields); - while (testClass.getSuperclass() != null && testClass != reflectUpToClass) { - testClass = testClass.getSuperclass(); - reflectionAppend(lhs, rhs, testClass, equalsBuilder, testTransients, excludeFields); - } - } - } catch (final IllegalArgumentException e) { - // In this case, we tried to test a subclass vs. a superclass and - // the subclass has ivars or the ivars are transient and - // we are testing transients. - // If a subclass has ivars that we are trying to test them, we get an - // exception and we know that the objects are not equal. - return false; - } - return equalsBuilder.isEquals(); - } - - /** - *

Appends the fields and values defined by the given object of the - * given Class.

- * - * @param lhs the left hand object - * @param rhs the right hand object - * @param clazz the class to append details of - * @param builder the builder to append to - * @param useTransients whether to test transient fields - * @param excludeFields array of field names to exclude from testing - */ - private static void reflectionAppend( - final Object lhs, - final Object rhs, - final Class clazz, - final EqualsBuilder builder, - final boolean useTransients, - final String[] excludeFields) { - - if (isRegistered(lhs, rhs)) { - return; - } - - try { - register(lhs, rhs); - final Field[] fields = clazz.getDeclaredFields(); - AccessibleObject.setAccessible(fields, true); - for (int i = 0; i < fields.length && builder.isEquals; i++) { - final Field f = fields[i]; - if (false == ArrayUtil.contains(excludeFields, f.getName()) - && (f.getName().indexOf('$') == -1) - && (useTransients || !Modifier.isTransient(f.getModifiers())) - && (!Modifier.isStatic(f.getModifiers()))) { - try { - builder.append(f.get(lhs), f.get(rhs)); - } catch (final IllegalAccessException e) { - //this can't happen. Would get a Security exception instead - //throw a runtime exception in case the impossible happens. - throw new InternalError("Unexpected IllegalAccessException"); - } - } - } - } finally { - unregister(lhs, rhs); - } - } - - //------------------------------------------------------------------------- - - /** - *

Adds the result of {@code super.equals()} to this builder.

- * - * @param superEquals the result of calling {@code super.equals()} - * @return EqualsBuilder - used to chain calls. - * @since 2.0 - */ - public EqualsBuilder appendSuper(final boolean superEquals) { - if (isEquals == false) { - return this; - } - isEquals = superEquals; - return this; - } - - //------------------------------------------------------------------------- - - /** - *

Test if two {@code Object}s are equal using their - * {@code equals} method.

- * - * @param lhs the left hand object - * @param rhs the right hand object - * @return EqualsBuilder - used to chain calls. - */ - public EqualsBuilder append(final Object lhs, final Object rhs) { - if (isEquals == false) { - return this; - } - if (lhs == rhs) { - return this; - } - if (lhs == null || rhs == null) { - return setEquals(false); - } - if (ArrayUtil.isArray(lhs)) { - // 判断数组的equals - return setEquals(ArrayUtil.equals(lhs, rhs)); - } - - // The simple case, not an array, just test the element - return setEquals(lhs.equals(rhs)); - } - - /** - *

- * Test if two {@code long} s are equal. - *

- * - * @param lhs the left hand {@code long} - * @param rhs the right hand {@code long} - * @return EqualsBuilder - used to chain calls. - */ - public EqualsBuilder append(final long lhs, final long rhs) { - if (isEquals == false) { - return this; - } - isEquals = (lhs == rhs); - return this; - } - - /** - *

Test if two {@code int}s are equal.

- * - * @param lhs the left hand {@code int} - * @param rhs the right hand {@code int} - * @return EqualsBuilder - used to chain calls. - */ - public EqualsBuilder append(final int lhs, final int rhs) { - if (isEquals == false) { - return this; - } - isEquals = (lhs == rhs); - return this; - } - - /** - *

Test if two {@code short}s are equal.

- * - * @param lhs the left hand {@code short} - * @param rhs the right hand {@code short} - * @return EqualsBuilder - used to chain calls. - */ - public EqualsBuilder append(final short lhs, final short rhs) { - if (isEquals == false) { - return this; - } - isEquals = (lhs == rhs); - return this; - } - - /** - *

Test if two {@code char}s are equal.

- * - * @param lhs the left hand {@code char} - * @param rhs the right hand {@code char} - * @return EqualsBuilder - used to chain calls. - */ - public EqualsBuilder append(final char lhs, final char rhs) { - if (isEquals == false) { - return this; - } - isEquals = (lhs == rhs); - return this; - } - - /** - *

Test if two {@code byte}s are equal.

- * - * @param lhs the left hand {@code byte} - * @param rhs the right hand {@code byte} - * @return EqualsBuilder - used to chain calls. - */ - public EqualsBuilder append(final byte lhs, final byte rhs) { - if (isEquals == false) { - return this; - } - isEquals = (lhs == rhs); - return this; - } - - /** - *

Test if two {@code double}s are equal by testing that the - * pattern of bits returned by {@code doubleToLong} are equal.

- * - *

This handles NaNs, Infinities, and {@code -0.0}.

- * - *

It is compatible with the hash code generated by - * {@code HashCodeBuilder}.

- * - * @param lhs the left hand {@code double} - * @param rhs the right hand {@code double} - * @return EqualsBuilder - used to chain calls. - */ - public EqualsBuilder append(final double lhs, final double rhs) { - if (isEquals == false) { - return this; - } - return append(Double.doubleToLongBits(lhs), Double.doubleToLongBits(rhs)); - } - - /** - *

Test if two {@code float}s are equal byt testing that the - * pattern of bits returned by doubleToLong are equal.

- * - *

This handles NaNs, Infinities, and {@code -0.0}.

- * - *

It is compatible with the hash code generated by - * {@code HashCodeBuilder}.

- * - * @param lhs the left hand {@code float} - * @param rhs the right hand {@code float} - * @return EqualsBuilder - used to chain calls. - */ - public EqualsBuilder append(final float lhs, final float rhs) { - if (isEquals == false) { - return this; - } - return append(Float.floatToIntBits(lhs), Float.floatToIntBits(rhs)); - } - - /** - *

Test if two {@code booleans}s are equal.

- * - * @param lhs the left hand {@code boolean} - * @param rhs the right hand {@code boolean} - * @return EqualsBuilder - used to chain calls. - */ - public EqualsBuilder append(final boolean lhs, final boolean rhs) { - if (isEquals == false) { - return this; - } - isEquals = (lhs == rhs); - return this; - } - - /** - *

Returns {@code true} if the fields that have been checked - * are all equal.

- * - * @return boolean - */ - public boolean isEquals() { - return this.isEquals; - } - - /** - *

Returns {@code true} if the fields that have been checked - * are all equal.

- * - * @return {@code true} if all of the fields that have been checked - * are equal, {@code false} otherwise. - * @since 3.0 - */ - @Override - public Boolean build() { - return isEquals(); - } - - /** - * Sets the {@code isEquals} value. - * - * @param isEquals The value to set. - * @return this - */ - protected EqualsBuilder setEquals(boolean isEquals) { - this.isEquals = isEquals; - return this; - } - - /** - * Reset the EqualsBuilder so you can use the same object again - * - * @since 2.5 - */ - public void reset() { - this.isEquals = true; - } -} diff --git a/hutool-core/src/main/java/cn/hutool/core/builder/HashCodeBuilder.java b/hutool-core/src/main/java/cn/hutool/core/builder/HashCodeBuilder.java deleted file mode 100644 index 3913803b9..000000000 --- a/hutool-core/src/main/java/cn/hutool/core/builder/HashCodeBuilder.java +++ /dev/null @@ -1,958 +0,0 @@ -package cn.hutool.core.builder; - -import java.lang.reflect.AccessibleObject; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; - -import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.ArrayUtil; - -/** - *

- * Assists in implementing {@link Object#hashCode()} methods. - *

- * - *

- * This class enables a good hashCode method to be built for any class. It follows the rules laid out in - * the book Effective Java by Joshua Bloch. Writing a - * good hashCode method is actually quite difficult. This class aims to simplify the process. - *

- * - *

- * The following is the approach taken. When appending a data field, the current total is multiplied by the - * multiplier then a relevant value - * for that data type is added. For example, if the current hashCode is 17, and the multiplier is 37, then - * appending the integer 45 will create a hashcode of 674, namely 17 * 37 + 45. - *

- * - *

- * All relevant fields from the object should be included in the hashCode method. Derived fields may be - * excluded. In general, any field used in the equals method must be used in the hashCode - * method. - *

- * - *

- * To use this class write code as follows: - *

- * - * 
- * public class Person {
- *   String name;
- *   int age;
- *   boolean smoker;
- *   ...
- *
- *   public int hashCode() {
- *     // you pick a hard-coded, randomly chosen, non-zero, odd number
- *     // ideally different for each class
- *     return new HashCodeBuilder(17, 37).
- *       append(name).
- *       append(age).
- *       append(smoker).
- *       toHashCode();
- *   }
- * }
- *
- * - *

- * If required, the superclass hashCode() can be added using {@link #appendSuper}. - *

- * - *

- * Alternatively, there is a method that uses reflection to determine the fields to test. Because these fields are - * usually private, the method, reflectionHashCode, uses AccessibleObject.setAccessible - * to change the visibility of the fields. This will fail under a security manager, unless the appropriate permissions - * are set up correctly. It is also slower than testing explicitly. - *

- * - *

- * A typical invocation for this method would look like: - *

- * - * 
- * public int hashCode() {
- *   return HashCodeBuilder.reflectionHashCode(this);
- * }
- *
- * - * TODO 待整理 - * 来自于Apache-Commons-Lang3 - * @author looly，Apache-Commons - * @since 4.2.2 - */ -public class HashCodeBuilder implements Builder { - private static final long serialVersionUID = 1L; - - /** - * The default initial value to use in reflection hash code building. - */ - private static final int DEFAULT_INITIAL_VALUE = 17; - - /** - * The default multipler value to use in reflection hash code building. - */ - private static final int DEFAULT_MULTIPLIER_VALUE = 37; - - /** - *

- * A registry of objects used by reflection methods to detect cyclical object references and avoid infinite loops. - *

- * - * @since 2.3 - */ - private static final ThreadLocal> REGISTRY = new ThreadLocal<>(); - - /* - * NOTE: we cannot store the actual objects in a HashSet, as that would use the very hashCode() - * we are in the process of calculating. - * - * So we generate a one-to-one mapping from the original object to a new object. - * - * Now HashSet uses equals() to determine if two elements with the same hashcode really - * are equal, so we also need to ensure that the replacement objects are only equal - * if the original objects are identical. - * - * The original implementation (2.4 and before) used the System.indentityHashCode() - * method - however this is not guaranteed to generate unique ids (e.g. LANG-459) - * - * We now use the IDKey helper class (adapted from org.apache.axis.utils.IDKey) - * to disambiguate the duplicate ids. - */ - - /** - *

- * Returns the registry of objects being traversed by the reflection methods in the current thread. - *

- * - * @return Set the registry of objects being traversed - * @since 2.3 - */ - private static Set getRegistry() { - return REGISTRY.get(); - } - - /** - *

- * Returns true if the registry contains the given object. Used by the reflection methods to avoid - * infinite loops. - *

- * - * @param value - * The object to lookup in the registry. - * @return boolean true if the registry contains the given object. - * @since 2.3 - */ - private static boolean isRegistered(final Object value) { - final Set registry = getRegistry(); - return registry != null && registry.contains(new IDKey(value)); - } - - /** - *

- * Appends the fields and values defined by the given object of the given Class. - *

- * - * @param object - * the object to append details of - * @param clazz - * the class to append details of - * @param builder - * the builder to append to - * @param useTransients - * whether to use transient fields - * @param excludeFields - * Collection of String field names to exclude from use in calculation of hash code - */ - private static void reflectionAppend(final Object object, final Class clazz, final HashCodeBuilder builder, final boolean useTransients, - final String[] excludeFields) { - if (isRegistered(object)) { - return; - } - try { - register(object); - final Field[] fields = clazz.getDeclaredFields(); - AccessibleObject.setAccessible(fields, true); - for (final Field field : fields) { - if (false == ArrayUtil.contains(excludeFields, field.getName()) - && (field.getName().indexOf('$') == -1) - && (useTransients || !Modifier.isTransient(field.getModifiers())) - && (!Modifier.isStatic(field.getModifiers()))) { - try { - final Object fieldValue = field.get(object); - builder.append(fieldValue); - } catch (final IllegalAccessException e) { - // this can't happen. Would get a Security exception instead - // throw a runtime exception in case the impossible happens. - throw new InternalError("Unexpected IllegalAccessException"); - } - } - } - } finally { - unregister(object); - } - } - - /** - *

- * Uses reflection to build a valid hash code from the fields of {@code object}. - *

- * - *

- * It uses AccessibleObject.setAccessible to gain access to private fields. This means that it will - * throw a security exception if run under a security manager, if the permissions are not set up correctly. It is - * also not as efficient as testing explicitly. - *

- * - *

- * Transient members will be not be used, as they are likely derived fields, and not part of the value of the - * Object. - *

- * - *

- * Static fields will not be tested. Superclass fields will be included. - *

- * - *

- * Two randomly chosen, non-zero, odd numbers must be passed in. Ideally these should be different for each class, - * however this is not vital. Prime numbers are preferred, especially for the multiplier. - *

- * - * @param initialNonZeroOddNumber - * a non-zero, odd number used as the initial value. This will be the returned - * value if no fields are found to include in the hash code - * @param multiplierNonZeroOddNumber - * a non-zero, odd number used as the multiplier - * @param object - * the Object to create a hashCode for - * @return int hash code - * @throws IllegalArgumentException - * if the Object is null - * @throws IllegalArgumentException - * if the number is zero or even - */ - public static int reflectionHashCode(final int initialNonZeroOddNumber, final int multiplierNonZeroOddNumber, final Object object) { - return reflectionHashCode(initialNonZeroOddNumber, multiplierNonZeroOddNumber, object, false, null); - } - - /** - *

- * Uses reflection to build a valid hash code from the fields of {@code object}. - *

- * - *

- * It uses AccessibleObject.setAccessible to gain access to private fields. This means that it will - * throw a security exception if run under a security manager, if the permissions are not set up correctly. It is - * also not as efficient as testing explicitly. - *

- * - *

- * If the TestTransients parameter is set to true, transient members will be tested, otherwise they - * are ignored, as they are likely derived fields, and not part of the value of the Object. - *

- * - *

- * Static fields will not be tested. Superclass fields will be included. - *

- * - *

- * Two randomly chosen, non-zero, odd numbers must be passed in. Ideally these should be different for each class, - * however this is not vital. Prime numbers are preferred, especially for the multiplier. - *

- * - * @param initialNonZeroOddNumber - * a non-zero, odd number used as the initial value. This will be the returned - * value if no fields are found to include in the hash code - * @param multiplierNonZeroOddNumber - * a non-zero, odd number used as the multiplier - * @param object - * the Object to create a hashCode for - * @param testTransients - * whether to include transient fields - * @return int hash code - * @throws IllegalArgumentException - * if the Object is null - * @throws IllegalArgumentException - * if the number is zero or even - */ - public static int reflectionHashCode(final int initialNonZeroOddNumber, final int multiplierNonZeroOddNumber, final Object object, - final boolean testTransients) { - return reflectionHashCode(initialNonZeroOddNumber, multiplierNonZeroOddNumber, object, testTransients, null); - } - - /** - *

- * Uses reflection to build a valid hash code from the fields of {@code object}. - *

- * - *

- * It uses AccessibleObject.setAccessible to gain access to private fields. This means that it will - * throw a security exception if run under a security manager, if the permissions are not set up correctly. It is - * also not as efficient as testing explicitly. - *

- * - *

- * If the TestTransients parameter is set to true, transient members will be tested, otherwise they - * are ignored, as they are likely derived fields, and not part of the value of the Object. - *

- * - *

- * Static fields will not be included. Superclass fields will be included up to and including the specified - * superclass. A null superclass is treated as java.lang.Object. - *

- * - *

- * Two randomly chosen, non-zero, odd numbers must be passed in. Ideally these should be different for each class, - * however this is not vital. Prime numbers are preferred, especially for the multiplier. - *

- * - * @param - * the type of the object involved - * @param initialNonZeroOddNumber - * a non-zero, odd number used as the initial value. This will be the returned - * value if no fields are found to include in the hash code - * @param multiplierNonZeroOddNumber - * a non-zero, odd number used as the multiplier - * @param object - * the Object to create a hashCode for - * @param testTransients - * whether to include transient fields - * @param reflectUpToClass - * the superclass to reflect up to (inclusive), may be null - * @param excludeFields - * array of field names to exclude from use in calculation of hash code - * @return int hash code - * @throws IllegalArgumentException - * if the Object is null - * @throws IllegalArgumentException - * if the number is zero or even - * @since 2.0 - */ - public static int reflectionHashCode(final int initialNonZeroOddNumber, final int multiplierNonZeroOddNumber, final T object, - final boolean testTransients, final Class reflectUpToClass, final String... excludeFields) { - - if (object == null) { - throw new IllegalArgumentException("The object to build a hash code for must not be null"); - } - final HashCodeBuilder builder = new HashCodeBuilder(initialNonZeroOddNumber, multiplierNonZeroOddNumber); - Class clazz = object.getClass(); - reflectionAppend(object, clazz, builder, testTransients, excludeFields); - while (clazz.getSuperclass() != null && clazz != reflectUpToClass) { - clazz = clazz.getSuperclass(); - reflectionAppend(object, clazz, builder, testTransients, excludeFields); - } - return builder.toHashCode(); - } - - /** - *

- * Uses reflection to build a valid hash code from the fields of {@code object}. - *

- * - *

- * This constructor uses two hard coded choices for the constants needed to build a hash code. - *

- * - *

- * It uses AccessibleObject.setAccessible to gain access to private fields. This means that it will - * throw a security exception if run under a security manager, if the permissions are not set up correctly. It is - * also not as efficient as testing explicitly. - *

- * - *

- * If the TestTransients parameter is set to true, transient members will be tested, otherwise they - * are ignored, as they are likely derived fields, and not part of the value of the Object. - *

- * - *

- * Static fields will not be tested. Superclass fields will be included. If no fields are found to include - * in the hash code, the result of this method will be constant. - *

- * - * @param object - * the Object to create a hashCode for - * @param testTransients - * whether to include transient fields - * @return int hash code - * @throws IllegalArgumentException - * if the object is null - */ - public static int reflectionHashCode(final Object object, final boolean testTransients) { - return reflectionHashCode(DEFAULT_INITIAL_VALUE, DEFAULT_MULTIPLIER_VALUE, object, - testTransients, null); - } - - /** - *

- * Uses reflection to build a valid hash code from the fields of {@code object}. - *

- * - *

- * This constructor uses two hard coded choices for the constants needed to build a hash code. - *

- * - *

- * It uses AccessibleObject.setAccessible to gain access to private fields. This means that it will - * throw a security exception if run under a security manager, if the permissions are not set up correctly. It is - * also not as efficient as testing explicitly. - *

- * - *

- * Transient members will be not be used, as they are likely derived fields, and not part of the value of the - * Object. - *

- * - *

- * Static fields will not be tested. Superclass fields will be included. If no fields are found to include - * in the hash code, the result of this method will be constant. - *

- * - * @param object - * the Object to create a hashCode for - * @param excludeFields - * Collection of String field names to exclude from use in calculation of hash code - * @return int hash code - * @throws IllegalArgumentException - * if the object is null - */ - public static int reflectionHashCode(final Object object, final Collection excludeFields) { - return reflectionHashCode(object, ArrayUtil.toArray(excludeFields, String.class)); - } - - // ------------------------------------------------------------------------- - - /** - *

- * Uses reflection to build a valid hash code from the fields of {@code object}. - *

- * - *

- * This constructor uses two hard coded choices for the constants needed to build a hash code. - *

- * - *

- * It uses AccessibleObject.setAccessible to gain access to private fields. This means that it will - * throw a security exception if run under a security manager, if the permissions are not set up correctly. It is - * also not as efficient as testing explicitly. - *

- * - *

- * Transient members will be not be used, as they are likely derived fields, and not part of the value of the - * Object. - *

- * - *

- * Static fields will not be tested. Superclass fields will be included. If no fields are found to include - * in the hash code, the result of this method will be constant. - *

- * - * @param object - * the Object to create a hashCode for - * @param excludeFields - * array of field names to exclude from use in calculation of hash code - * @return int hash code - * @throws IllegalArgumentException - * if the object is null - */ - public static int reflectionHashCode(final Object object, final String... excludeFields) { - return reflectionHashCode(DEFAULT_INITIAL_VALUE, DEFAULT_MULTIPLIER_VALUE, object, false, - null, excludeFields); - } - - /** - *

- * Registers the given object. Used by the reflection methods to avoid infinite loops. - *

- * - * @param value - * The object to register. - */ - static void register(final Object value) { - synchronized (HashCodeBuilder.class) { - if (getRegistry() == null) { - REGISTRY.set(new HashSet()); - } - } - getRegistry().add(new IDKey(value)); - } - - /** - *

- * Unregisters the given object. - *

- * - *

- * Used by the reflection methods to avoid infinite loops. - * - * @param value - * The object to unregister. - * @since 2.3 - */ - static void unregister(final Object value) { - Set registry = getRegistry(); - if (registry != null) { - registry.remove(new IDKey(value)); - synchronized (HashCodeBuilder.class) { - //read again - registry = getRegistry(); - if (registry != null && registry.isEmpty()) { - REGISTRY.remove(); - } - } - } - } - - /** - * Constant to use in building the hashCode. - */ - private final int iConstant; - - /** - * Running total of the hashCode. - */ - private int iTotal; - - /** - *

- * Uses two hard coded choices for the constants needed to build a hashCode. - *

- */ - public HashCodeBuilder() { - iConstant = 37; - iTotal = 17; - } - - /** - *

- * Two randomly chosen, odd numbers must be passed in. Ideally these should be different for each class, - * however this is not vital. - *

- * - *

- * Prime numbers are preferred, especially for the multiplier. - *

- * - * @param initialOddNumber - * an odd number used as the initial value - * @param multiplierOddNumber - * an odd number used as the multiplier - * @throws IllegalArgumentException - * if the number is even - */ - public HashCodeBuilder(final int initialOddNumber, final int multiplierOddNumber) { - Assert.isTrue(initialOddNumber % 2 != 0, "HashCodeBuilder requires an odd initial value"); - Assert.isTrue(multiplierOddNumber % 2 != 0, "HashCodeBuilder requires an odd multiplier"); - iConstant = multiplierOddNumber; - iTotal = initialOddNumber; - } - - /** - *

- * Append a hashCode for a boolean. - *

- *

- * This adds 1 when true, and 0 when false to the hashCode. - *

- *

- * This is in contrast to the standard java.lang.Boolean.hashCode handling, which computes - * a hashCode value of 1231 for java.lang.Boolean instances - * that represent true or 1237 for java.lang.Boolean instances - * that represent false. - *

- *

- * This is in accordance with the Effective Java design. - *

- * - * @param value - * the boolean to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final boolean value) { - iTotal = iTotal * iConstant + (value ? 0 : 1); - return this; - } - - /** - *

- * Append a hashCode for a boolean array. - *

- * - * @param array - * the array to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final boolean[] array) { - if (array == null) { - iTotal = iTotal * iConstant; - } else { - for (final boolean element : array) { - append(element); - } - } - return this; - } - - // ------------------------------------------------------------------------- - - /** - *

- * Append a hashCode for a byte. - *

- * - * @param value - * the byte to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final byte value) { - iTotal = iTotal * iConstant + value; - return this; - } - - // ------------------------------------------------------------------------- - - /** - *

- * Append a hashCode for a byte array. - *

- * - * @param array - * the array to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final byte[] array) { - if (array == null) { - iTotal = iTotal * iConstant; - } else { - for (final byte element : array) { - append(element); - } - } - return this; - } - - /** - *

- * Append a hashCode for a char. - *

- * - * @param value - * the char to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final char value) { - iTotal = iTotal * iConstant + value; - return this; - } - - /** - *

- * Append a hashCode for a char array. - *

- * - * @param array - * the array to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final char[] array) { - if (array == null) { - iTotal = iTotal * iConstant; - } else { - for (final char element : array) { - append(element); - } - } - return this; - } - - /** - *

- * Append a hashCode for a double. - *

- * - * @param value - * the double to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final double value) { - return append(Double.doubleToLongBits(value)); - } - - /** - *

- * Append a hashCode for a double array. - *

- * - * @param array - * the array to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final double[] array) { - if (array == null) { - iTotal = iTotal * iConstant; - } else { - for (final double element : array) { - append(element); - } - } - return this; - } - - /** - *

- * Append a hashCode for a float. - *

- * - * @param value - * the float to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final float value) { - iTotal = iTotal * iConstant + Float.floatToIntBits(value); - return this; - } - - /** - *

- * Append a hashCode for a float array. - *

- * - * @param array - * the array to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final float[] array) { - if (array == null) { - iTotal = iTotal * iConstant; - } else { - for (final float element : array) { - append(element); - } - } - return this; - } - - /** - *

- * Append a hashCode for an int. - *

- * - * @param value - * the int to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final int value) { - iTotal = iTotal * iConstant + value; - return this; - } - - /** - *

- * Append a hashCode for an int array. - *

- * - * @param array - * the array to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final int[] array) { - if (array == null) { - iTotal = iTotal * iConstant; - } else { - for (final int element : array) { - append(element); - } - } - return this; - } - - /** - *

- * Append a hashCode for a long. - *

- * - * @param value - * the long to add to the hashCode - * @return this - */ - // NOTE: This method uses >> and not >>> as Effective Java and - // Long.hashCode do. Ideally we should switch to >>> at - // some stage. There are backwards compat issues, so - // that will have to wait for the time being. cf LANG-342. - public HashCodeBuilder append(final long value) { - iTotal = iTotal * iConstant + ((int) (value ^ (value >> 32))); - return this; - } - - /** - *

- * Append a hashCode for a long array. - *

- * - * @param array - * the array to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final long[] array) { - if (array == null) { - iTotal = iTotal * iConstant; - } else { - for (final long element : array) { - append(element); - } - } - return this; - } - - /** - *

- * Append a hashCode for an Object. - *

- * - * @param object - * the Object to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final Object object) { - if (object == null) { - iTotal = iTotal * iConstant; - - } else { - if(object.getClass().isArray()) { - // 'Switch' on type of array, to dispatch to the correct handler - // This handles multi dimensional arrays - if (object instanceof long[]) { - append((long[]) object); - } else if (object instanceof int[]) { - append((int[]) object); - } else if (object instanceof short[]) { - append((short[]) object); - } else if (object instanceof char[]) { - append((char[]) object); - } else if (object instanceof byte[]) { - append((byte[]) object); - } else if (object instanceof double[]) { - append((double[]) object); - } else if (object instanceof float[]) { - append((float[]) object); - } else if (object instanceof boolean[]) { - append((boolean[]) object); - } else { - // Not an array of primitives - append((Object[]) object); - } - } else { - iTotal = iTotal * iConstant + object.hashCode(); - } - } - return this; - } - - /** - *

- * Append a hashCode for an Object array. - *

- * - * @param array - * the array to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final Object[] array) { - if (array == null) { - iTotal = iTotal * iConstant; - } else { - for (final Object element : array) { - append(element); - } - } - return this; - } - - /** - *

- * Append a hashCode for a short. - *

- * - * @param value - * the short to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final short value) { - iTotal = iTotal * iConstant + value; - return this; - } - - /** - *

- * Append a hashCode for a short array. - *

- * - * @param array - * the array to add to the hashCode - * @return this - */ - public HashCodeBuilder append(final short[] array) { - if (array == null) { - iTotal = iTotal * iConstant; - } else { - for (final short element : array) { - append(element); - } - } - return this; - } - - /** - *

- * Adds the result of super.hashCode() to this builder. - *

- * - * @param superHashCode - * the result of calling super.hashCode() - * @return this HashCodeBuilder, used to chain calls. - * @since 2.0 - */ - public HashCodeBuilder appendSuper(final int superHashCode) { - iTotal = iTotal * iConstant + superHashCode; - return this; - } - - /** - *

- * Return the computed hashCode. - *

- * - * @return hashCode based on the fields appended - */ - public int toHashCode() { - return iTotal; - } - - /** - * Returns the computed hashCode. - * - * @return hashCode based on the fields appended - * - * @since 3.0 - */ - @Override - public Integer build() { - return toHashCode(); - } - - /** - *

- * The computed hashCode from toHashCode() is returned due to the likelihood - * of bugs in mis-calling toHashCode() and the unlikeliness of it mattering what the hashCode for - * HashCodeBuilder itself is.

- * - * @return hashCode based on the fields appended - * @since 2.5 - */ - @Override - public int hashCode() { - return toHashCode(); - } - -} diff --git a/hutool-core/src/main/java/cn/hutool/core/builder/IDKey.java b/hutool-core/src/main/java/cn/hutool/core/builder/IDKey.java deleted file mode 100644 index e49ecd174..000000000 --- a/hutool-core/src/main/java/cn/hutool/core/builder/IDKey.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.hutool.core.builder; - -import java.io.Serializable; - -/** - * 包装唯一键（System.identityHashCode()）使对象只有和自己 equals - * - * 此对象用于消除小概率下System.identityHashCode()产生的ID重复问题。 - * - * 来自于Apache-Commons-Lang3 - * @author looly，Apache-Commons - * @since 4.2.2 - */ -final class IDKey implements Serializable{ - private static final long serialVersionUID = 1L; - - private final Object value; - private final int id; - - /** - * 构造 - * - * @param obj 计算唯一ID的对象 - */ - public IDKey(final Object obj) { - id = System.identityHashCode(obj); - // There have been some cases (LANG-459) that return the - // same identity hash code for different objects. So - // the value is also added to disambiguate these cases. - value = obj; - } - - /** - * returns hashcode - i.e. the system identity hashcode. - * - * @return the hashcode - */ - @Override - public int hashCode() { - return id; - } - - /** - * checks if instances are equal - * - * @param other The other object to compare to - * @return if the instances are for the same object - */ - @Override - public boolean equals(final Object other) { - if (!(other instanceof IDKey)) { - return false; - } - final IDKey idKey = (IDKey) other; - if (id != idKey.id) { - return false; - } - // Note that identity equals is used. - return value == idKey.value; - } -} diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/GlobalPruneTimer.java b/hutool-core/src/main/java/cn/hutool/core/cache/GlobalPruneTimer.java index 0c399021c..f4e098b69 100755 --- a/hutool-core/src/main/java/cn/hutool/core/cache/GlobalPruneTimer.java +++ b/hutool-core/src/main/java/cn/hutool/core/cache/GlobalPruneTimer.java @@ -1,7 +1,7 @@ package cn.hutool.core.cache; import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.util.List; import java.util.concurrent.ScheduledExecutorService; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/SimpleCache.java b/hutool-core/src/main/java/cn/hutool/core/cache/SimpleCache.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/clone/CloneRuntimeException.java b/hutool-core/src/main/java/cn/hutool/core/clone/CloneRuntimeException.java index 7f70e2813..1eb3264c3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/clone/CloneRuntimeException.java +++ b/hutool-core/src/main/java/cn/hutool/core/clone/CloneRuntimeException.java @@ -1,7 +1,7 @@ package cn.hutool.core.clone; import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 克隆异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/clone/DefaultCloneable.java b/hutool-core/src/main/java/cn/hutool/core/clone/DefaultCloneable.java index 8c74f57a0..168a2f362 100644 --- a/hutool-core/src/main/java/cn/hutool/core/clone/DefaultCloneable.java +++ b/hutool-core/src/main/java/cn/hutool/core/clone/DefaultCloneable.java @@ -1,7 +1,7 @@ package cn.hutool.core.clone; -import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.reflect.ReflectUtil; /** * 克隆默认实现接口，用于实现返回指定泛型类型的克隆方法 diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Base16Codec.java b/hutool-core/src/main/java/cn/hutool/core/codec/Base16Codec.java index 14499d153..8e8a0a5a5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/Base16Codec.java +++ b/hutool-core/src/main/java/cn/hutool/core/codec/Base16Codec.java @@ -1,7 +1,7 @@ package cn.hutool.core.codec; import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * Base16（Hex）编码解码器
diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Base32.java b/hutool-core/src/main/java/cn/hutool/core/codec/Base32.java index 80c87b7e3..b257bf97a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/Base32.java +++ b/hutool-core/src/main/java/cn/hutool/core/codec/Base32.java @@ -1,7 +1,7 @@ package cn.hutool.core.codec; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.nio.charset.Charset; @@ -37,7 +37,7 @@ public class Base32 { * @return 被加密后的字符串 */ public static String encode(String source) { - return encode(source, CharsetUtil.CHARSET_UTF_8); + return encode(source, CharsetUtil.UTF_8); } /** @@ -68,7 +68,7 @@ public class Base32 { * @return 被加密后的字符串 */ public static String encodeHex(String source) { - return encodeHex(source, CharsetUtil.CHARSET_UTF_8); + return encodeHex(source, CharsetUtil.UTF_8); } /** @@ -101,7 +101,7 @@ public class Base32 { * @return 被加密后的字符串 */ public static String decodeStr(String source) { - return decodeStr(source, CharsetUtil.CHARSET_UTF_8); + return decodeStr(source, CharsetUtil.UTF_8); } /** @@ -132,7 +132,7 @@ public class Base32 { * @return 被加密后的字符串 */ public static String decodeStrHex(String source) { - return decodeStrHex(source, CharsetUtil.CHARSET_UTF_8); + return decodeStrHex(source, CharsetUtil.UTF_8); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Base58Codec.java b/hutool-core/src/main/java/cn/hutool/core/codec/Base58Codec.java index da278731e..00ce928cb 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/Base58Codec.java +++ b/hutool-core/src/main/java/cn/hutool/core/codec/Base58Codec.java @@ -1,6 +1,6 @@ package cn.hutool.core.codec; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.util.Arrays; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Base62.java b/hutool-core/src/main/java/cn/hutool/core/codec/Base62.java index 9f8a458b4..3391787c9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/Base62.java +++ b/hutool-core/src/main/java/cn/hutool/core/codec/Base62.java @@ -3,7 +3,7 @@ package cn.hutool.core.codec; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.File; import java.io.InputStream; @@ -18,7 +18,7 @@ import java.nio.charset.Charset; */ public class Base62 { - private static final Charset DEFAULT_CHARSET = CharsetUtil.CHARSET_UTF_8; + private static final Charset DEFAULT_CHARSET = CharsetUtil.UTF_8; // -------------------------------------------------------------------- encode /** @@ -131,7 +131,7 @@ public class Base62 { * @return 被加密后的字符串 */ public static String decodeStrGbk(CharSequence source) { - return decodeStr(source, CharsetUtil.CHARSET_GBK); + return decodeStr(source, CharsetUtil.GBK); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Base64.java b/hutool-core/src/main/java/cn/hutool/core/codec/Base64.java index 13bc8a8cc..820824003 100755 --- a/hutool-core/src/main/java/cn/hutool/core/codec/Base64.java +++ b/hutool-core/src/main/java/cn/hutool/core/codec/Base64.java @@ -3,7 +3,7 @@ package cn.hutool.core.codec; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.File; import java.io.InputStream; @@ -19,7 +19,7 @@ import java.nio.charset.Charset; */ public class Base64 { - private static final Charset DEFAULT_CHARSET = CharsetUtil.CHARSET_UTF_8; + private static final Charset DEFAULT_CHARSET = CharsetUtil.UTF_8; // -------------------------------------------------------------------- encode /** @@ -215,7 +215,7 @@ public class Base64 { * @since 4.3.2 */ public static String decodeStrGbk(CharSequence source) { - return Base64Decoder.decodeStr(source, CharsetUtil.CHARSET_GBK); + return Base64Decoder.decodeStr(source, CharsetUtil.GBK); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Base64Decoder.java b/hutool-core/src/main/java/cn/hutool/core/codec/Base64Decoder.java index 92b95cb33..9a05f8ff3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/Base64Decoder.java +++ b/hutool-core/src/main/java/cn/hutool/core/codec/Base64Decoder.java @@ -3,7 +3,7 @@ package cn.hutool.core.codec; import cn.hutool.core.lang.mutable.MutableInt; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.nio.charset.Charset; @@ -15,7 +15,7 @@ import java.nio.charset.Charset; */ public class Base64Decoder { - private static final Charset DEFAULT_CHARSET = CharsetUtil.CHARSET_UTF_8; + private static final Charset DEFAULT_CHARSET = CharsetUtil.UTF_8; private static final byte PADDING = -2; /** Base64解码表，共128位，-1表示非base64字符，-2表示padding */ diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Base64Encoder.java b/hutool-core/src/main/java/cn/hutool/core/codec/Base64Encoder.java index a895322de..b871c33fb 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/Base64Encoder.java +++ b/hutool-core/src/main/java/cn/hutool/core/codec/Base64Encoder.java @@ -1,7 +1,7 @@ package cn.hutool.core.codec; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.nio.charset.Charset; @@ -14,7 +14,7 @@ import java.nio.charset.Charset; */ public class Base64Encoder { - private static final Charset DEFAULT_CHARSET = CharsetUtil.CHARSET_UTF_8; + private static final Charset DEFAULT_CHARSET = CharsetUtil.UTF_8; /** * 标准编码表 */ diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/HexUtil.java b/hutool-core/src/main/java/cn/hutool/core/codec/HexUtil.java index dac841b6b..ccf97cd9c 100755 --- a/hutool-core/src/main/java/cn/hutool/core/codec/HexUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/codec/HexUtil.java @@ -1,10 +1,9 @@ package cn.hutool.core.codec; -import cn.hutool.core.codec.Base16Codec; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.awt.Color; import java.math.BigInteger; @@ -15,7 +14,7 @@ import java.nio.charset.Charset; * 例如十进制数57，在二进制写作111001，在16进制写作39。
* 像java,c这样的语言为了区分十六进制和十进制数值,会在十六进制数的前面加上 0x,比如0x20是十进制的32,而不是十进制的20
*

- * 参考：https://my.oschina.net/xinxingegeya/blog/287476 + * 参考：https://my.oschina.net/xinxingegeya/blog/287476 * * @author Looly */ @@ -106,7 +105,7 @@ public class HexUtil { * @return 十六进制String */ public static String encodeHexStr(String data) { - return encodeHexStr(data, CharsetUtil.CHARSET_UTF_8); + return encodeHexStr(data, CharsetUtil.UTF_8); } /** @@ -129,7 +128,7 @@ public class HexUtil { * @return 字符串 */ public static String decodeHexStr(String hexStr) { - return decodeHexStr(hexStr, CharsetUtil.CHARSET_UTF_8); + return decodeHexStr(hexStr, CharsetUtil.UTF_8); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Morse.java b/hutool-core/src/main/java/cn/hutool/core/codec/Morse.java index 403ba21c3..ce260eb99 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/Morse.java +++ b/hutool-core/src/main/java/cn/hutool/core/codec/Morse.java @@ -6,7 +6,7 @@ import java.util.Map; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 莫尔斯电码的编码和解码实现
diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/PercentCodec.java b/hutool-core/src/main/java/cn/hutool/core/codec/PercentCodec.java index bd6ab48d2..fd9b53019 100755 --- a/hutool-core/src/main/java/cn/hutool/core/codec/PercentCodec.java +++ b/hutool-core/src/main/java/cn/hutool/core/codec/PercentCodec.java @@ -2,7 +2,7 @@ package cn.hutool.core.codec; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/PunyCode.java b/hutool-core/src/main/java/cn/hutool/core/codec/PunyCode.java index fd3fc3864..13ebf3854 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/PunyCode.java +++ b/hutool-core/src/main/java/cn/hutool/core/codec/PunyCode.java @@ -2,7 +2,7 @@ package cn.hutool.core.codec; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * Punycode是一个根据RFC 3492标准而制定的编码系统，主要用于把域名从地方语言所采用的Unicode编码转换成为可用于DNS系统的编码 diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java index cdf976005..21a69adfb 100755 --- a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java @@ -16,9 +16,9 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.ReflectUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.reflect.ReflectUtil; +import cn.hutool.core.text.StrUtil; import cn.hutool.core.util.TypeUtil; import java.io.Serializable; @@ -368,7 +368,7 @@ public class CollUtil { * @return 单差集 */ public static Collection subtract(Collection coll1, Collection coll2) { - Collection result = ObjectUtil.clone(coll1); + Collection result = ObjUtil.clone(coll1); if (null == result) { result = CollUtil.create(coll1.getClass()); result.addAll(coll1); @@ -1492,12 +1492,12 @@ public class CollUtil { if (t instanceof Map) { final Map map = (Map) t; final Object value = map.get(fieldName); - return ObjectUtil.equal(value, fieldValue); + return ObjUtil.equal(value, fieldValue); } // 普通Bean final Object value = ReflectUtil.getFieldValue(t, fieldName); - return ObjectUtil.equal(value, fieldValue); + return ObjUtil.equal(value, fieldValue); }); } diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java index 920ab610d..ba5006dbc 100755 --- a/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java @@ -9,8 +9,8 @@ import cn.hutool.core.lang.func.Func1; import cn.hutool.core.map.MapUtil; import cn.hutool.core.text.StrJoiner; import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.reflect.ReflectUtil; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -422,7 +422,7 @@ public class IterUtil { if (null == resultMap) { resultMap = MapUtil.newHashMap(); } - if (ObjectUtil.isNull(iterable)) { + if (ObjUtil.isNull(iterable)) { return resultMap; } @@ -480,7 +480,7 @@ public class IterUtil { if (null == resultMap) { resultMap = MapUtil.newHashMap(); } - if (ObjectUtil.isNull(iterable)) { + if (ObjUtil.isNull(iterable)) { return resultMap; } @@ -964,7 +964,7 @@ public class IterUtil { * @since 5.8.0 */ public static String toStr(final Iterator iterator) { - return toStr(iterator, ObjectUtil::toString); + return toStr(iterator, ObjUtil::toString); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java index ab73d7147..17800157f 100755 --- a/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java @@ -4,7 +4,7 @@ import cn.hutool.core.comparator.PinyinComparator; import cn.hutool.core.comparator.PropertyComparator; import cn.hutool.core.lang.func.Matcher; import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.PageUtil; import java.util.ArrayList; @@ -365,7 +365,7 @@ public class ListUtil { * @since 4.0.6 */ public static List reverseNew(List list) { - List list2 = ObjectUtil.clone(list); + List list2 = ObjUtil.clone(list); if (null == list2) { // 不支持clone list2 = new ArrayList<>(list); diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/UniqueKeySet.java b/hutool-core/src/main/java/cn/hutool/core/collection/UniqueKeySet.java index 8f2aa4f66..0c5e3f46f 100755 --- a/hutool-core/src/main/java/cn/hutool/core/collection/UniqueKeySet.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/UniqueKeySet.java @@ -1,7 +1,7 @@ package cn.hutool.core.collection; import cn.hutool.core.map.MapBuilder; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ObjUtil; import java.io.Serializable; import java.util.AbstractSet; @@ -167,7 +167,7 @@ public class UniqueKeySet extends AbstractSet implements Serializable { public UniqueKeySet clone() { try { UniqueKeySet newSet = (UniqueKeySet) super.clone(); - newSet.map = ObjectUtil.clone(this.map); + newSet.map = ObjUtil.clone(this.map); return newSet; } catch (CloneNotSupportedException e) { throw new InternalError(e); diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/ComparatorException.java b/hutool-core/src/main/java/cn/hutool/core/comparator/ComparatorException.java index a21670f59..3dc23d459 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/ComparatorException.java +++ b/hutool-core/src/main/java/cn/hutool/core/comparator/ComparatorException.java @@ -1,7 +1,7 @@ package cn.hutool.core.comparator; import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 比较异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/FieldComparator.java b/hutool-core/src/main/java/cn/hutool/core/comparator/FieldComparator.java index b4a1dd19a..ff60593ab 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/FieldComparator.java +++ b/hutool-core/src/main/java/cn/hutool/core/comparator/FieldComparator.java @@ -2,8 +2,8 @@ package cn.hutool.core.comparator; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.ReflectUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.reflect.ReflectUtil; +import cn.hutool.core.text.StrUtil; import java.lang.reflect.Field; diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/FuncComparator.java b/hutool-core/src/main/java/cn/hutool/core/comparator/FuncComparator.java index 78ea09840..a9b3b477b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/FuncComparator.java +++ b/hutool-core/src/main/java/cn/hutool/core/comparator/FuncComparator.java @@ -1,6 +1,6 @@ package cn.hutool.core.comparator; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ObjUtil; import java.util.function.Function; @@ -53,7 +53,7 @@ public class FuncComparator extends NullComparator { */ @SuppressWarnings({"rawtypes", "unchecked"}) private int compare(T o1, T o2, Comparable v1, Comparable v2) { - int result = ObjectUtil.compare(v1, v2); + int result = ObjUtil.compare(v1, v2); if (0 == result) { //避免TreeSet / TreeMap 过滤掉排序字段相同但是对象不相同的情况 result = CompareUtil.compare(o1, o2, this.nullGreater); diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/VersionComparator.java b/hutool-core/src/main/java/cn/hutool/core/comparator/VersionComparator.java index 834123c44..b65b31599 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/VersionComparator.java +++ b/hutool-core/src/main/java/cn/hutool/core/comparator/VersionComparator.java @@ -1,8 +1,8 @@ package cn.hutool.core.comparator; import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.text.StrUtil; import java.io.Serializable; import java.util.Comparator; @@ -50,7 +50,7 @@ public class VersionComparator implements Comparator, Serializable { */ @Override public int compare(String version1, String version2) { - if(ObjectUtil.equal(version1, version2)) { + if(ObjUtil.equal(version1, version2)) { return 0; } if (version1 == null && version2 == null) { diff --git a/hutool-core/src/main/java/cn/hutool/core/compiler/CompilerException.java b/hutool-core/src/main/java/cn/hutool/core/compiler/CompilerException.java index 26bd1e6cf..95c9768de 100644 --- a/hutool-core/src/main/java/cn/hutool/core/compiler/CompilerException.java +++ b/hutool-core/src/main/java/cn/hutool/core/compiler/CompilerException.java @@ -1,7 +1,7 @@ package cn.hutool.core.compiler; import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 编译异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/compiler/JavaClassFileManager.java b/hutool-core/src/main/java/cn/hutool/core/compiler/JavaClassFileManager.java index 861883710..df6a43d2a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/compiler/JavaClassFileManager.java +++ b/hutool-core/src/main/java/cn/hutool/core/compiler/JavaClassFileManager.java @@ -3,7 +3,7 @@ package cn.hutool.core.compiler; import cn.hutool.core.io.resource.FileObjectResource; import cn.hutool.core.lang.ResourceClassLoader; import cn.hutool.core.util.ClassLoaderUtil; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ObjUtil; import javax.tools.FileObject; import javax.tools.ForwardingJavaFileManager; @@ -44,7 +44,7 @@ class JavaClassFileManager extends ForwardingJavaFileManager { */ protected JavaClassFileManager(ClassLoader parent, JavaFileManager fileManager) { super(fileManager); - this.parent = ObjectUtil.defaultIfNull(parent, ClassLoaderUtil::getClassLoader); + this.parent = ObjUtil.defaultIfNull(parent, ClassLoaderUtil::getClassLoader); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/compiler/JavaClassFileObject.java b/hutool-core/src/main/java/cn/hutool/core/compiler/JavaClassFileObject.java index b1d6e8792..6c683bb11 100644 --- a/hutool-core/src/main/java/cn/hutool/core/compiler/JavaClassFileObject.java +++ b/hutool-core/src/main/java/cn/hutool/core/compiler/JavaClassFileObject.java @@ -2,7 +2,7 @@ package cn.hutool.core.compiler; import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.URLUtil; +import cn.hutool.core.net.URLUtil; import javax.tools.SimpleJavaFileObject; import java.io.ByteArrayInputStream; @@ -57,4 +57,4 @@ class JavaClassFileObject extends SimpleJavaFileObject { return this.byteArrayOutputStream; } -} \ No newline at end of file +} diff --git a/hutool-core/src/main/java/cn/hutool/core/compiler/JavaFileObjectUtil.java b/hutool-core/src/main/java/cn/hutool/core/compiler/JavaFileObjectUtil.java index 588efc726..0028ec342 100644 --- a/hutool-core/src/main/java/cn/hutool/core/compiler/JavaFileObjectUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/compiler/JavaFileObjectUtil.java @@ -1,7 +1,7 @@ package cn.hutool.core.compiler; import cn.hutool.core.io.file.FileNameUtil; -import cn.hutool.core.util.ZipUtil; +import cn.hutool.core.compress.ZipUtil; import javax.tools.JavaFileObject; import java.io.File; diff --git a/hutool-core/src/main/java/cn/hutool/core/compiler/JavaSourceCompiler.java b/hutool-core/src/main/java/cn/hutool/core/compiler/JavaSourceCompiler.java index 39e08d28f..f8b7abcb5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/compiler/JavaSourceCompiler.java +++ b/hutool-core/src/main/java/cn/hutool/core/compiler/JavaSourceCompiler.java @@ -10,8 +10,8 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.ClassLoaderUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.URLUtil; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.net.URLUtil; import javax.tools.DiagnosticCollector; import javax.tools.JavaCompiler.CompilationTask; @@ -89,7 +89,7 @@ public class JavaSourceCompiler { * @param parent 父类加载器，null则使用默认类加载器 */ private JavaSourceCompiler(ClassLoader parent) { - this.parentClassLoader = ObjectUtil.defaultIfNull(parent, ClassLoaderUtil::getClassLoader); + this.parentClassLoader = ObjUtil.defaultIfNull(parent, ClassLoaderUtil::getClassLoader); } /** @@ -250,7 +250,7 @@ public class JavaSourceCompiler { private Collection getJavaFileObjectByMap(final Map sourceCodeMap) { if (MapUtil.isNotEmpty(sourceCodeMap)) { return sourceCodeMap.entrySet().stream() - .map(entry -> new JavaSourceFileObject(entry.getKey(), entry.getValue(), CharsetUtil.CHARSET_UTF_8)) + .map(entry -> new JavaSourceFileObject(entry.getKey(), entry.getValue(), CharsetUtil.UTF_8)) .collect(Collectors.toList()); } return Collections.emptySet(); diff --git a/hutool-core/src/main/java/cn/hutool/core/compiler/JavaSourceFileObject.java b/hutool-core/src/main/java/cn/hutool/core/compiler/JavaSourceFileObject.java index db0c0dd8c..130ee619a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/compiler/JavaSourceFileObject.java +++ b/hutool-core/src/main/java/cn/hutool/core/compiler/JavaSourceFileObject.java @@ -2,7 +2,7 @@ package cn.hutool.core.compiler; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.URLUtil; +import cn.hutool.core.net.URLUtil; import javax.tools.SimpleJavaFileObject; import java.io.BufferedInputStream; @@ -87,4 +87,4 @@ class JavaSourceFileObject extends SimpleJavaFileObject { } } -} \ No newline at end of file +} diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/ZipCopyVisitor.java b/hutool-core/src/main/java/cn/hutool/core/compress/ZipCopyVisitor.java index 3423097be..94ca0e15f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/compress/ZipCopyVisitor.java +++ b/hutool-core/src/main/java/cn/hutool/core/compress/ZipCopyVisitor.java @@ -1,6 +1,6 @@ package cn.hutool.core.compress; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.IOException; import java.nio.file.CopyOption; diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/ZipReader.java b/hutool-core/src/main/java/cn/hutool/core/compress/ZipReader.java index b34600281..eefe6669e 100755 --- a/hutool-core/src/main/java/cn/hutool/core/compress/ZipReader.java +++ b/hutool-core/src/main/java/cn/hutool/core/compress/ZipReader.java @@ -4,8 +4,7 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.func.Filter; -import cn.hutool.core.util.StrUtil; -import cn.hutool.core.util.ZipUtil; +import cn.hutool.core.text.StrUtil; import java.io.Closeable; import java.io.File; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java b/hutool-core/src/main/java/cn/hutool/core/compress/ZipUtil.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java rename to hutool-core/src/main/java/cn/hutool/core/compress/ZipUtil.java index 0ec3aed8c..038bd7c7a --- a/hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/compress/ZipUtil.java @@ -1,11 +1,6 @@ -package cn.hutool.core.util; +package cn.hutool.core.compress; import cn.hutool.core.collection.EnumerationIter; -import cn.hutool.core.compress.Deflate; -import cn.hutool.core.compress.Gzip; -import cn.hutool.core.compress.ZipCopyVisitor; -import cn.hutool.core.compress.ZipReader; -import cn.hutool.core.compress.ZipWriter; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.io.FastByteArrayOutputStream; import cn.hutool.core.io.FileUtil; @@ -14,6 +9,10 @@ import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.file.FileSystemUtil; import cn.hutool.core.io.file.PathUtil; import cn.hutool.core.io.resource.Resource; +import cn.hutool.core.text.StrUtil; +import cn.hutool.core.util.CharUtil; +import cn.hutool.core.util.CharsetUtil; +import cn.hutool.core.util.ObjUtil; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -56,12 +55,12 @@ public class ZipUtil { * 将Zip文件转换为{@link ZipFile} * * @param file zip文件 - * @param charset 解析zip文件的编码，null表示{@link CharsetUtil#CHARSET_UTF_8} + * @param charset 解析zip文件的编码，null表示{@link CharsetUtil#UTF_8} * @return {@link ZipFile} */ public static ZipFile toZipFile(File file, Charset charset) { try { - return new ZipFile(file, ObjectUtil.defaultIfNull(charset, CharsetUtil.CHARSET_UTF_8)); + return new ZipFile(file, ObjUtil.defaultIfNull(charset, CharsetUtil.UTF_8)); } catch (IOException e) { throw new IORuntimeException(e); } diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/ZipWriter.java b/hutool-core/src/main/java/cn/hutool/core/compress/ZipWriter.java index fef99f062..3b2893e55 100755 --- a/hutool-core/src/main/java/cn/hutool/core/compress/ZipWriter.java +++ b/hutool-core/src/main/java/cn/hutool/core/compress/ZipWriter.java @@ -5,8 +5,7 @@ import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.resource.Resource; import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.core.util.ZipUtil; +import cn.hutool.core.text.StrUtil; import java.io.Closeable; import java.io.File; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/AbstractConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/AbstractConverter.java index c72521150..b79c7d6e8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/AbstractConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/AbstractConverter.java @@ -3,7 +3,7 @@ package cn.hutool.core.convert; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.Serializable; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java b/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java index 91827f4a0..0a931847b 100755 --- a/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java @@ -4,14 +4,14 @@ import cn.hutool.core.convert.impl.CollectionConverter; import cn.hutool.core.convert.impl.EnumConverter; import cn.hutool.core.convert.impl.MapConverter; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.reflect.TypeReference; +import cn.hutool.core.reflect.TypeReference; import cn.hutool.core.text.UnicodeUtil; import cn.hutool.core.util.ByteUtil; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.codec.HexUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.lang.reflect.Type; import java.math.BigDecimal; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/ConvertException.java b/hutool-core/src/main/java/cn/hutool/core/convert/ConvertException.java index e01201446..8bbf966c9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/ConvertException.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/ConvertException.java @@ -1,7 +1,7 @@ package cn.hutool.core.convert; import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 转换异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/ConverterRegistry.java b/hutool-core/src/main/java/cn/hutool/core/convert/ConverterRegistry.java index 677283fa3..cf5cb75a3 100755 --- a/hutool-core/src/main/java/cn/hutool/core/convert/ConverterRegistry.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/ConverterRegistry.java @@ -35,10 +35,10 @@ import cn.hutool.core.convert.impl.URLConverter; import cn.hutool.core.convert.impl.UUIDConverter; import cn.hutool.core.date.DateTime; import cn.hutool.core.lang.Opt; -import cn.hutool.core.lang.reflect.TypeReference; +import cn.hutool.core.reflect.TypeReference; import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.reflect.ReflectUtil; import cn.hutool.core.util.ServiceLoaderUtil; import cn.hutool.core.util.TypeUtil; @@ -241,7 +241,7 @@ public class ConverterRegistry implements Serializable { // 对于用户不指定目标类型的情况，返回原值 return (T) value; } - if (ObjectUtil.isNull(value)) { + if (ObjUtil.isNull(value)) { return defaultValue; } if (TypeUtil.isUnknown(type)) { diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/NumberChineseFormatter.java b/hutool-core/src/main/java/cn/hutool/core/convert/NumberChineseFormatter.java index 6ec3f0e16..5aaf23f8e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/NumberChineseFormatter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/NumberChineseFormatter.java @@ -3,7 +3,7 @@ package cn.hutool.core.convert; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 数字转中文类
diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/NumberWordFormatter.java b/hutool-core/src/main/java/cn/hutool/core/convert/NumberWordFormatter.java index 22c0d057b..9f065bef6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/NumberWordFormatter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/NumberWordFormatter.java @@ -1,7 +1,7 @@ package cn.hutool.core.convert; import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 将浮点数类型的number转换成英语的表达方式
diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/ArrayConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/ArrayConverter.java index ae4d72fe2..38cfbd9b3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/ArrayConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/ArrayConverter.java @@ -6,8 +6,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ByteUtil; import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.text.StrUtil; import java.io.Serializable; import java.lang.reflect.Array; @@ -166,7 +166,7 @@ public class ArrayConverter extends AbstractConverter { result = ByteUtil.numberToBytes((Number)value); } else if (value instanceof Serializable && byte.class == targetComponentType) { // 用户可能想序列化指定对象 - result = ObjectUtil.serialize(value); + result = ObjUtil.serialize(value); } else { // everything else: result = convertToSingleElementArray(value); diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/BeanConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/BeanConverter.java index 9a7c23848..7495d1e2e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/BeanConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/BeanConverter.java @@ -7,8 +7,8 @@ import cn.hutool.core.bean.copier.ValueProvider; import cn.hutool.core.convert.AbstractConverter; import cn.hutool.core.convert.ConvertException; import cn.hutool.core.map.MapProxy; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.reflect.ReflectUtil; import cn.hutool.core.util.TypeUtil; import java.lang.reflect.Type; @@ -78,7 +78,7 @@ public class BeanConverter extends AbstractConverter { return BeanCopier.create(value, ReflectUtil.newInstanceIfPossible(this.beanClass), this.beanType, this.copyOptions).copy(); } else if(value instanceof byte[]){ // 尝试反序列化 - return ObjectUtil.deserialize((byte[])value); + return ObjUtil.deserialize((byte[])value); } throw new ConvertException("Unsupported source type: {}", value.getClass()); diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CalendarConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/CalendarConverter.java index e6c55e234..9be06150f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CalendarConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/CalendarConverter.java @@ -5,7 +5,7 @@ import java.util.Date; import cn.hutool.core.convert.AbstractConverter; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 日期转换器 diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CharacterConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/CharacterConverter.java index 85b8e0283..dd32d9d5c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CharacterConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/CharacterConverter.java @@ -2,7 +2,7 @@ package cn.hutool.core.convert.impl; import cn.hutool.core.convert.AbstractConverter; import cn.hutool.core.util.BooleanUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 字符转换器 diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CollectionConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/CollectionConverter.java index 3b78db2c3..3f4d7d268 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CollectionConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/CollectionConverter.java @@ -2,7 +2,7 @@ package cn.hutool.core.convert.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Converter; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.TypeUtil; import java.lang.reflect.Type; @@ -62,7 +62,7 @@ public class CollectionConverter implements Converter> { @Override public Collection convert(Object value, Collection defaultValue) throws IllegalArgumentException { final Collection result = convertInternal(value); - return ObjectUtil.defaultIfNull(result, defaultValue); + return ObjUtil.defaultIfNull(result, defaultValue); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/DateConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/DateConverter.java index e69061d8d..0050821b3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/DateConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/DateConverter.java @@ -4,7 +4,7 @@ import cn.hutool.core.convert.AbstractConverter; import cn.hutool.core.convert.ConvertException; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.time.temporal.TemporalAccessor; import java.util.Calendar; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/EnumConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/EnumConverter.java index d73a458ae..80bb2fae7 100755 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/EnumConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/EnumConverter.java @@ -7,8 +7,8 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.WeakConcurrentMap; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.EnumUtil; -import cn.hutool.core.util.ModifierUtil; -import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.reflect.ModifierUtil; +import cn.hutool.core.reflect.ReflectUtil; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/LocaleConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/LocaleConverter.java index 8f46f8d9e..fb86bfd26 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/LocaleConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/LocaleConverter.java @@ -3,7 +3,7 @@ package cn.hutool.core.convert.impl; import java.util.Locale; import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/MapConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/MapConverter.java index b99a5d6b9..b4f57f679 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/MapConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/MapConverter.java @@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.AbstractConverter; import cn.hutool.core.convert.ConverterRegistry; import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import cn.hutool.core.util.TypeUtil; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/NumberConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/NumberConverter.java index 421628c91..cad98c4f6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/NumberConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/NumberConverter.java @@ -5,7 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.ByteUtil; import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/PrimitiveConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/PrimitiveConverter.java index 36b092b09..41e3d1ddc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/PrimitiveConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/PrimitiveConverter.java @@ -3,8 +3,8 @@ package cn.hutool.core.convert.impl; import cn.hutool.core.convert.AbstractConverter; import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.ConvertException; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.text.StrUtil; import java.util.function.Function; @@ -70,17 +70,17 @@ public class PrimitiveConverter extends AbstractConverter { */ protected static Object convert(Object value, Class primitiveClass, Function toStringFunc) { if (byte.class == primitiveClass) { - return ObjectUtil.defaultIfNull(NumberConverter.convert(value, Byte.class, toStringFunc), 0); + return ObjUtil.defaultIfNull(NumberConverter.convert(value, Byte.class, toStringFunc), 0); } else if (short.class == primitiveClass) { - return ObjectUtil.defaultIfNull(NumberConverter.convert(value, Short.class, toStringFunc), 0); + return ObjUtil.defaultIfNull(NumberConverter.convert(value, Short.class, toStringFunc), 0); } else if (int.class == primitiveClass) { - return ObjectUtil.defaultIfNull(NumberConverter.convert(value, Integer.class, toStringFunc), 0); + return ObjUtil.defaultIfNull(NumberConverter.convert(value, Integer.class, toStringFunc), 0); } else if (long.class == primitiveClass) { - return ObjectUtil.defaultIfNull(NumberConverter.convert(value, Long.class, toStringFunc), 0); + return ObjUtil.defaultIfNull(NumberConverter.convert(value, Long.class, toStringFunc), 0); } else if (float.class == primitiveClass) { - return ObjectUtil.defaultIfNull(NumberConverter.convert(value, Float.class, toStringFunc), 0); + return ObjUtil.defaultIfNull(NumberConverter.convert(value, Float.class, toStringFunc), 0); } else if (double.class == primitiveClass) { - return ObjectUtil.defaultIfNull(NumberConverter.convert(value, Double.class, toStringFunc), 0); + return ObjUtil.defaultIfNull(NumberConverter.convert(value, Double.class, toStringFunc), 0); } else if (char.class == primitiveClass) { return Convert.convert(Character.class, value); } else if (boolean.class == primitiveClass) { diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/ReferenceConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/ReferenceConverter.java index f7e65727d..85aa9201b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/ReferenceConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/ReferenceConverter.java @@ -2,7 +2,7 @@ package cn.hutool.core.convert.impl; import cn.hutool.core.convert.AbstractConverter; import cn.hutool.core.convert.ConverterRegistry; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import cn.hutool.core.util.TypeUtil; import java.lang.ref.Reference; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/StackTraceElementConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/StackTraceElementConverter.java index 79d32f48d..61b1ddcff 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/StackTraceElementConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/StackTraceElementConverter.java @@ -4,7 +4,7 @@ import java.util.Map; import cn.hutool.core.convert.AbstractConverter; import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ObjUtil; /** * {@link StackTraceElement} 转换器
@@ -26,7 +26,7 @@ public class StackTraceElementConverter extends AbstractConverter { InputStream in = null; try { in = blob.getBinaryStream(); - return IoUtil.read(in, CharsetUtil.CHARSET_UTF_8); + return IoUtil.read(in, CharsetUtil.UTF_8); } catch (SQLException e) { throw new ConvertException(e); } finally { diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/TemporalAccessorConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/TemporalAccessorConverter.java index 46c5384e8..c20965535 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/TemporalAccessorConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/TemporalAccessorConverter.java @@ -3,8 +3,8 @@ package cn.hutool.core.convert.impl; import cn.hutool.core.convert.AbstractConverter; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.text.StrUtil; import java.time.Instant; import java.time.LocalDate; @@ -227,7 +227,7 @@ public class TemporalAccessorConverter extends AbstractConverter diff --git a/hutool-core/src/main/java/cn/hutool/core/date/chinese/SolarTerms.java b/hutool-core/src/main/java/cn/hutool/core/date/chinese/SolarTerms.java index 6c327e7f5..54e9343bd 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/chinese/SolarTerms.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/chinese/SolarTerms.java @@ -4,7 +4,7 @@ import cn.hutool.core.date.ChineseDate; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.time.LocalDate; import java.util.Date; diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/DependencyException.java b/hutool-core/src/main/java/cn/hutool/core/exceptions/DependencyException.java index b2040a237..d7cb5567d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/exceptions/DependencyException.java +++ b/hutool-core/src/main/java/cn/hutool/core/exceptions/DependencyException.java @@ -1,6 +1,6 @@ package cn.hutool.core.exceptions; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 依赖异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/ExceptionUtil.java b/hutool-core/src/main/java/cn/hutool/core/exceptions/ExceptionUtil.java index 5e845cf49..17702828a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/exceptions/ExceptionUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/exceptions/ExceptionUtil.java @@ -3,8 +3,8 @@ package cn.hutool.core.exceptions; import cn.hutool.core.io.FastByteArrayOutputStream; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ReflectUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.reflect.ReflectUtil; +import cn.hutool.core.text.StrUtil; import java.io.PrintStream; import java.lang.reflect.InvocationTargetException; diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/NotInitedException.java b/hutool-core/src/main/java/cn/hutool/core/exceptions/NotInitedException.java index bbe578bf3..9483e2e91 100644 --- a/hutool-core/src/main/java/cn/hutool/core/exceptions/NotInitedException.java +++ b/hutool-core/src/main/java/cn/hutool/core/exceptions/NotInitedException.java @@ -1,6 +1,6 @@ package cn.hutool.core.exceptions; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 未初始化异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/StatefulException.java b/hutool-core/src/main/java/cn/hutool/core/exceptions/StatefulException.java index f560dfbfc..1fd50ca2f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/exceptions/StatefulException.java +++ b/hutool-core/src/main/java/cn/hutool/core/exceptions/StatefulException.java @@ -1,6 +1,6 @@ package cn.hutool.core.exceptions; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 带有状态码的异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/UtilException.java b/hutool-core/src/main/java/cn/hutool/core/exceptions/UtilException.java index 3024aedb2..01d83c491 100644 --- a/hutool-core/src/main/java/cn/hutool/core/exceptions/UtilException.java +++ b/hutool-core/src/main/java/cn/hutool/core/exceptions/UtilException.java @@ -1,6 +1,6 @@ package cn.hutool.core.exceptions; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 工具类异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/ValidateException.java b/hutool-core/src/main/java/cn/hutool/core/exceptions/ValidateException.java index 98423d60f..4c510bc76 100644 --- a/hutool-core/src/main/java/cn/hutool/core/exceptions/ValidateException.java +++ b/hutool-core/src/main/java/cn/hutool/core/exceptions/ValidateException.java @@ -1,6 +1,6 @@ package cn.hutool.core.exceptions; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 验证异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/BOMInputStream.java b/hutool-core/src/main/java/cn/hutool/core/io/BOMInputStream.java index 85627fec7..2029024b5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/BOMInputStream.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/BOMInputStream.java @@ -44,7 +44,7 @@ public class BOMInputStream extends InputStream { * @param in 流 */ public BOMInputStream(InputStream in) { - this(in, CharsetUtil.UTF_8); + this(in, CharsetUtil.NAME_UTF_8); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/io/BufferUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/BufferUtil.java index f4e8157a5..9db942fd8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/BufferUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/BufferUtil.java @@ -1,7 +1,7 @@ package cn.hutool.core.io; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.nio.ByteBuffer; import java.nio.CharBuffer; @@ -75,7 +75,7 @@ public class BufferUtil { * @since 4.5.0 */ public static String readUtf8Str(ByteBuffer buffer) { - return readStr(buffer, CharsetUtil.CHARSET_UTF_8); + return readStr(buffer, CharsetUtil.UTF_8); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/io/FastByteArrayOutputStream.java b/hutool-core/src/main/java/cn/hutool/core/io/FastByteArrayOutputStream.java index b32192d8b..879597cd8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/FastByteArrayOutputStream.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/FastByteArrayOutputStream.java @@ -1,7 +1,7 @@ package cn.hutool.core.io; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ObjUtil; import java.io.IOException; import java.io.OutputStream; @@ -117,7 +117,7 @@ public class FastByteArrayOutputStream extends OutputStream { */ public String toString(Charset charset) { return new String(toByteArray(), - ObjectUtil.defaultIfNull(charset, CharsetUtil::defaultCharset)); + ObjUtil.defaultIfNull(charset, CharsetUtil::defaultCharset)); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java index 95292a54f..b96083ce8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java @@ -1,6 +1,6 @@ package cn.hutool.core.io; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.File; import java.io.FileInputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java index 8da312ecc..792bd83f6 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java @@ -19,9 +19,9 @@ import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.regex.ReUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.core.util.URLUtil; -import cn.hutool.core.util.ZipUtil; +import cn.hutool.core.text.StrUtil; +import cn.hutool.core.net.URLUtil; +import cn.hutool.core.compress.ZipUtil; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -1927,7 +1927,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static BufferedReader getUtf8Reader(File file) throws IORuntimeException { - return getReader(file, CharsetUtil.CHARSET_UTF_8); + return getReader(file, CharsetUtil.UTF_8); } /** @@ -1938,7 +1938,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static BufferedReader getUtf8Reader(String path) throws IORuntimeException { - return getReader(path, CharsetUtil.CHARSET_UTF_8); + return getReader(path, CharsetUtil.UTF_8); } /** @@ -2000,7 +2000,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static String readUtf8String(File file) throws IORuntimeException { - return readString(file, CharsetUtil.CHARSET_UTF_8); + return readString(file, CharsetUtil.UTF_8); } /** @@ -2011,7 +2011,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static String readUtf8String(String path) throws IORuntimeException { - return readString(path, CharsetUtil.CHARSET_UTF_8); + return readString(path, CharsetUtil.UTF_8); } /** @@ -2074,7 +2074,7 @@ public class FileUtil extends PathUtil { * @since 3.1.1 */ public static > T readUtf8Lines(String path, T collection) throws IORuntimeException { - return readLines(path, CharsetUtil.CHARSET_UTF_8, collection); + return readLines(path, CharsetUtil.UTF_8, collection); } /** @@ -2116,7 +2116,7 @@ public class FileUtil extends PathUtil { * @since 3.1.1 */ public static > T readUtf8Lines(File file, T collection) throws IORuntimeException { - return readLines(file, CharsetUtil.CHARSET_UTF_8, collection); + return readLines(file, CharsetUtil.UTF_8, collection); } /** @@ -2157,7 +2157,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static > T readUtf8Lines(URL url, T collection) throws IORuntimeException { - return readLines(url, CharsetUtil.CHARSET_UTF_8, collection); + return readLines(url, CharsetUtil.UTF_8, collection); } /** @@ -2191,7 +2191,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static List readUtf8Lines(URL url) throws IORuntimeException { - return readLines(url, CharsetUtil.CHARSET_UTF_8); + return readLines(url, CharsetUtil.UTF_8); } /** @@ -2215,7 +2215,7 @@ public class FileUtil extends PathUtil { * @since 3.1.1 */ public static List readUtf8Lines(String path) throws IORuntimeException { - return readLines(path, CharsetUtil.CHARSET_UTF_8); + return readLines(path, CharsetUtil.UTF_8); } /** @@ -2252,7 +2252,7 @@ public class FileUtil extends PathUtil { * @since 3.1.1 */ public static List readUtf8Lines(File file) throws IORuntimeException { - return readLines(file, CharsetUtil.CHARSET_UTF_8); + return readLines(file, CharsetUtil.UTF_8); } /** @@ -2287,7 +2287,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static void readUtf8Lines(File file, LineHandler lineHandler) throws IORuntimeException { - readLines(file, CharsetUtil.CHARSET_UTF_8, lineHandler); + readLines(file, CharsetUtil.UTF_8, lineHandler); } /** @@ -2315,7 +2315,7 @@ public class FileUtil extends PathUtil { String line; try { while ((line = file.readLine()) != null) { - lineHandler.handle(CharsetUtil.convert(line, CharsetUtil.CHARSET_ISO_8859_1, charset)); + lineHandler.handle(CharsetUtil.convert(line, CharsetUtil.ISO_8859_1, charset)); } } catch (IOException e) { throw new IORuntimeException(e); @@ -2355,7 +2355,7 @@ public class FileUtil extends PathUtil { throw new IORuntimeException(e); } if (null != line) { - return CharsetUtil.convert(line, CharsetUtil.CHARSET_ISO_8859_1, charset); + return CharsetUtil.convert(line, CharsetUtil.ISO_8859_1, charset); } return null; @@ -2372,7 +2372,7 @@ public class FileUtil extends PathUtil { * @since 3.1.1 */ public static T loadUtf8(String path, ReaderHandler readerHandler) throws IORuntimeException { - return load(path, CharsetUtil.CHARSET_UTF_8, readerHandler); + return load(path, CharsetUtil.UTF_8, readerHandler); } /** @@ -2416,7 +2416,7 @@ public class FileUtil extends PathUtil { * @since 3.1.1 */ public static T loadUtf8(File file, ReaderHandler readerHandler) throws IORuntimeException { - return load(file, CharsetUtil.CHARSET_UTF_8, readerHandler); + return load(file, CharsetUtil.UTF_8, readerHandler); } /** @@ -2546,7 +2546,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static File writeUtf8String(String content, String path) throws IORuntimeException { - return writeString(content, path, CharsetUtil.CHARSET_UTF_8); + return writeString(content, path, CharsetUtil.UTF_8); } /** @@ -2558,7 +2558,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static File writeUtf8String(String content, File file) throws IORuntimeException { - return writeString(content, file, CharsetUtil.CHARSET_UTF_8); + return writeString(content, file, CharsetUtil.UTF_8); } /** @@ -2623,7 +2623,7 @@ public class FileUtil extends PathUtil { * @since 3.1.2 */ public static File appendUtf8String(String content, String path) throws IORuntimeException { - return appendString(content, path, CharsetUtil.CHARSET_UTF_8); + return appendString(content, path, CharsetUtil.UTF_8); } /** @@ -2662,7 +2662,7 @@ public class FileUtil extends PathUtil { * @since 3.1.2 */ public static File appendUtf8String(String content, File file) throws IORuntimeException { - return appendString(content, file, CharsetUtil.CHARSET_UTF_8); + return appendString(content, file, CharsetUtil.UTF_8); } /** @@ -2702,7 +2702,7 @@ public class FileUtil extends PathUtil { * @since 3.2.0 */ public static File writeUtf8Lines(Collection list, String path) throws IORuntimeException { - return writeLines(list, path, CharsetUtil.CHARSET_UTF_8); + return writeLines(list, path, CharsetUtil.UTF_8); } /** @@ -2716,7 +2716,7 @@ public class FileUtil extends PathUtil { * @since 3.2.0 */ public static File writeUtf8Lines(Collection list, File file) throws IORuntimeException { - return writeLines(list, file, CharsetUtil.CHARSET_UTF_8); + return writeLines(list, file, CharsetUtil.UTF_8); } /** @@ -2788,7 +2788,7 @@ public class FileUtil extends PathUtil { * @since 3.1.2 */ public static File appendUtf8Lines(Collection list, File file) throws IORuntimeException { - return appendLines(list, file, CharsetUtil.CHARSET_UTF_8); + return appendLines(list, file, CharsetUtil.UTF_8); } /** @@ -2802,7 +2802,7 @@ public class FileUtil extends PathUtil { * @since 3.1.2 */ public static File appendUtf8Lines(Collection list, String path) throws IORuntimeException { - return appendLines(list, path, CharsetUtil.CHARSET_UTF_8); + return appendLines(list, path, CharsetUtil.UTF_8); } /** @@ -2940,7 +2940,7 @@ public class FileUtil extends PathUtil { * @since 4.0.5 */ public static File writeUtf8Map(Map map, File file, String kvSeparator, boolean isAppend) throws IORuntimeException { - return FileWriter.create(file, CharsetUtil.CHARSET_UTF_8).writeMap(map, kvSeparator, isAppend); + return FileWriter.create(file, CharsetUtil.UTF_8).writeMap(map, kvSeparator, isAppend); } /** @@ -3364,7 +3364,7 @@ public class FileUtil extends PathUtil { * @param handler 行处理器 */ public static void tail(File file, LineHandler handler) { - tail(file, CharsetUtil.CHARSET_UTF_8, handler); + tail(file, CharsetUtil.UTF_8, handler); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/io/IORuntimeException.java b/hutool-core/src/main/java/cn/hutool/core/io/IORuntimeException.java index e6f964541..24a556337 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/IORuntimeException.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/IORuntimeException.java @@ -1,7 +1,7 @@ package cn.hutool.core.io; import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * IO运行时异常，常用于对IOException的包装 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java index fe47d0aab..cb8e3a5f5 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java @@ -8,7 +8,7 @@ import cn.hutool.core.io.copy.StreamCopier; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.codec.HexUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -198,7 +198,7 @@ public class IoUtil extends NioUtil { * @since 5.1.6 */ public static BufferedReader getUtf8Reader(InputStream in) { - return getReader(in, CharsetUtil.CHARSET_UTF_8); + return getReader(in, CharsetUtil.UTF_8); } /** @@ -282,7 +282,7 @@ public class IoUtil extends NioUtil { * @since 5.1.6 */ public static OutputStreamWriter getUtf8Writer(OutputStream out) { - return getWriter(out, CharsetUtil.CHARSET_UTF_8); + return getWriter(out, CharsetUtil.UTF_8); } /** @@ -316,7 +316,7 @@ public class IoUtil extends NioUtil { * @since 5.4.4 */ public static String readUtf8(InputStream in) throws IORuntimeException { - return read(in, CharsetUtil.CHARSET_UTF_8); + return read(in, CharsetUtil.UTF_8); } /** @@ -594,7 +594,7 @@ public class IoUtil extends NioUtil { * @throws IORuntimeException IO异常 */ public static > T readUtf8Lines(InputStream in, T collection) throws IORuntimeException { - return readLines(in, CharsetUtil.CHARSET_UTF_8, collection); + return readLines(in, CharsetUtil.UTF_8, collection); } /** @@ -634,7 +634,7 @@ public class IoUtil extends NioUtil { * @since 3.1.1 */ public static void readUtf8Lines(InputStream in, LineHandler lineHandler) throws IORuntimeException { - readLines(in, CharsetUtil.CHARSET_UTF_8, lineHandler); + readLines(in, CharsetUtil.UTF_8, lineHandler); } /** @@ -692,7 +692,7 @@ public class IoUtil extends NioUtil { * @since 4.5.1 */ public static ByteArrayInputStream toUtf8Stream(String content) { - return toStream(content, CharsetUtil.CHARSET_UTF_8); + return toStream(content, CharsetUtil.UTF_8); } /** @@ -935,7 +935,7 @@ public class IoUtil extends NioUtil { * @since 3.1.1 */ public static void writeUtf8(OutputStream out, boolean isCloseOut, Object... contents) throws IORuntimeException { - write(out, CharsetUtil.CHARSET_UTF_8, isCloseOut, contents); + write(out, CharsetUtil.UTF_8, isCloseOut, contents); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/io/NioUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/NioUtil.java index 806105051..aae366c0a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/NioUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/NioUtil.java @@ -3,7 +3,7 @@ package cn.hutool.core.io; import cn.hutool.core.io.copy.ChannelCopier; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.IOException; import java.io.InputStream; @@ -222,7 +222,7 @@ public class NioUtil { * @throws IORuntimeException IO异常 */ public static String readUtf8(FileChannel fileChannel) throws IORuntimeException { - return read(fileChannel, CharsetUtil.CHARSET_UTF_8); + return read(fileChannel, CharsetUtil.UTF_8); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Checksum.java b/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Checksum.java index 50936ccb2..cba51f97e 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Checksum.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Checksum.java @@ -1,7 +1,7 @@ package cn.hutool.core.io.checksum.crc16; import cn.hutool.core.codec.HexUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.Serializable; import java.util.zip.Checksum; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileAppender.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileAppender.java index 20a97eeba..7d68c7514 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileAppender.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileAppender.java @@ -2,7 +2,7 @@ package cn.hutool.core.io.file; import cn.hutool.core.thread.lock.LockUtil; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ObjUtil; import java.io.File; import java.io.PrintWriter; @@ -50,7 +50,7 @@ public class FileAppender implements Serializable { * @param isNewLineMode 追加内容是否为新行 */ public FileAppender(File destFile, int capacity, boolean isNewLineMode) { - this(destFile, CharsetUtil.CHARSET_UTF_8, capacity, isNewLineMode); + this(destFile, CharsetUtil.UTF_8, capacity, isNewLineMode); } /** @@ -79,7 +79,7 @@ public class FileAppender implements Serializable { this.list = new ArrayList<>(capacity); this.isNewLineMode = isNewLineMode; this.writer = FileWriter.create(destFile, charset); - this.lock = ObjectUtil.defaultIfNull(lock, LockUtil::getNoLock); + this.lock = ObjUtil.defaultIfNull(lock, LockUtil::getNoLock); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileCopier.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileCopier.java index 2d2878e75..ae2900aec 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileCopier.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileCopier.java @@ -5,7 +5,7 @@ import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.copier.SrcToDestCopier; import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java index a4f628163..9884aba57 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java @@ -2,7 +2,7 @@ package cn.hutool.core.io.file; import cn.hutool.core.util.CharUtil; import cn.hutool.core.regex.ReUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.File; import java.util.regex.Pattern; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java index 355b45a7c..2f5b34c81 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java @@ -5,7 +5,7 @@ import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.LineHandler; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.BufferedInputStream; import java.io.BufferedReader; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileSystemUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileSystemUtil.java index 502bf09be..6d5b4d194 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileSystemUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileSystemUtil.java @@ -3,7 +3,7 @@ package cn.hutool.core.io.file; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.IOException; import java.net.URI; @@ -58,7 +58,7 @@ public class FileSystemUtil { */ public static FileSystem createZip(String path, Charset charset) { if(null == charset){ - charset = CharsetUtil.CHARSET_UTF_8; + charset = CharsetUtil.UTF_8; } final HashMap env = new HashMap<>(); env.put("create", "true"); diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java index 45c95107e..a598f4684 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java @@ -5,7 +5,7 @@ import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.BufferedOutputStream; import java.io.BufferedWriter; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/PathUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/file/PathUtil.java index 7c1cd4955..a59471848 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/PathUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/PathUtil.java @@ -403,7 +403,7 @@ public class PathUtil { * @since 4.0.0 */ public static BufferedReader getUtf8Reader(Path path) throws IORuntimeException { - return getReader(path, CharsetUtil.CHARSET_UTF_8); + return getReader(path, CharsetUtil.UTF_8); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/Tailer.java b/hutool-core/src/main/java/cn/hutool/core/io/file/Tailer.java index bc4305c40..7d1b382a4 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/Tailer.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/Tailer.java @@ -62,7 +62,7 @@ public class Tailer implements Serializable { * @param initReadLine 启动时预读取的行数 */ public Tailer(File file, LineHandler lineHandler, int initReadLine) { - this(file, CharsetUtil.CHARSET_UTF_8, lineHandler, initReadLine, DateUnit.SECOND.getMillis()); + this(file, CharsetUtil.UTF_8, lineHandler, initReadLine, DateUnit.SECOND.getMillis()); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/BytesResource.java b/hutool-core/src/main/java/cn/hutool/core/io/resource/BytesResource.java index 91c1041a3..c2a129a0d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/BytesResource.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/resource/BytesResource.java @@ -1,7 +1,7 @@ package cn.hutool.core.io.resource; import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/CharSequenceResource.java b/hutool-core/src/main/java/cn/hutool/core/io/resource/CharSequenceResource.java index a6950d94e..c8e45af28 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/CharSequenceResource.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/resource/CharSequenceResource.java @@ -3,7 +3,7 @@ package cn.hutool.core.io.resource; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -42,7 +42,7 @@ public class CharSequenceResource implements Resource, Serializable { * @param name 资源名称 */ public CharSequenceResource(CharSequence data, String name) { - this(data, name, CharsetUtil.CHARSET_UTF_8); + this(data, name, CharsetUtil.UTF_8); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/ClassPathResource.java b/hutool-core/src/main/java/cn/hutool/core/io/resource/ClassPathResource.java index 96af500a2..ba2284953 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/ClassPathResource.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/resource/ClassPathResource.java @@ -3,9 +3,9 @@ package cn.hutool.core.io.resource; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.core.util.URLUtil; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.text.StrUtil; +import cn.hutool.core.net.URLUtil; import java.net.URL; @@ -69,7 +69,7 @@ public class ClassPathResource extends UrlResource { this.path = path; this.name = StrUtil.isBlank(path) ? null : FileUtil.getName(path); - this.classLoader = ObjectUtil.defaultIfNull(classLoader, ClassUtil::getClassLoader); + this.classLoader = ObjUtil.defaultIfNull(classLoader, ClassUtil::getClassLoader); this.clazz = clazz; initUrl(); } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/FileResource.java b/hutool-core/src/main/java/cn/hutool/core/io/resource/FileResource.java index 3fcdea20a..0183b312d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/FileResource.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/resource/FileResource.java @@ -2,8 +2,8 @@ package cn.hutool.core.io.resource; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.URLUtil; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.net.URLUtil; import java.io.File; import java.io.InputStream; @@ -62,7 +62,7 @@ public class FileResource implements Resource, Serializable { Assert.notNull(file, "File must be not null !"); this.file = file; this.lastModified = file.lastModified(); - this.name = ObjectUtil.defaultIfNull(fileName, file::getName); + this.name = ObjUtil.defaultIfNull(fileName, file::getName); } // ----------------------------------------------------------------------- Constructor end diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/NoResourceException.java b/hutool-core/src/main/java/cn/hutool/core/io/resource/NoResourceException.java index 19593760e..56495b5c4 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/NoResourceException.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/resource/NoResourceException.java @@ -2,7 +2,7 @@ package cn.hutool.core.io.resource; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 资源文件或资源不存在异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/Resource.java b/hutool-core/src/main/java/cn/hutool/core/io/resource/Resource.java index b97945801..4b7523efa 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/Resource.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/resource/Resource.java @@ -109,7 +109,7 @@ public interface Resource { * @throws IORuntimeException 包装IOException */ default String readUtf8Str() throws IORuntimeException { - return readStr(CharsetUtil.CHARSET_UTF_8); + return readStr(CharsetUtil.UTF_8); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java index 0281af268..ef2ffde18 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java @@ -6,8 +6,8 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.ClassLoaderUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.core.util.URLUtil; +import cn.hutool.core.text.StrUtil; +import cn.hutool.core.net.URLUtil; import java.io.BufferedReader; import java.io.IOException; @@ -95,7 +95,7 @@ public class ResourceUtil { * @since 5.3.6 */ public static BufferedReader getUtf8Reader(String resource) { - return getReader(resource, CharsetUtil.CHARSET_UTF_8); + return getReader(resource, CharsetUtil.UTF_8); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/StringResource.java b/hutool-core/src/main/java/cn/hutool/core/io/resource/StringResource.java index 540056fa4..28780ffe1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/StringResource.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/resource/StringResource.java @@ -31,7 +31,7 @@ public class StringResource extends CharSequenceResource { * @param name 资源名称 */ public StringResource(String data, String name) { - super(data, name, CharsetUtil.CHARSET_UTF_8); + super(data, name, CharsetUtil.UTF_8); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/UrlResource.java b/hutool-core/src/main/java/cn/hutool/core/io/resource/UrlResource.java index 3e8935923..cbc0c7f82 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/UrlResource.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/resource/UrlResource.java @@ -1,8 +1,8 @@ package cn.hutool.core.io.resource; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.URLUtil; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.net.URLUtil; import java.io.File; import java.io.InputStream; @@ -50,7 +50,7 @@ public class UrlResource implements Resource, Serializable{ if(null != url && URLUtil.URL_PROTOCOL_FILE.equals(url.getProtocol())){ this.lastModified = FileUtil.file(url).lastModified(); } - this.name = ObjectUtil.defaultIfNull(name, () -> (null != url ? FileUtil.getName(url.getPath()) : null)); + this.name = ObjUtil.defaultIfNull(name, () -> (null != url ? FileUtil.getName(url.getPath()) : null)); } //-------------------------------------------------------------------------------------- Constructor end diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/VfsResource.java b/hutool-core/src/main/java/cn/hutool/core/io/resource/VfsResource.java index 2295d97c2..d42bdef03 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/VfsResource.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/resource/VfsResource.java @@ -2,7 +2,7 @@ package cn.hutool.core.io.resource; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ClassLoaderUtil; -import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.reflect.ReflectUtil; import java.io.InputStream; import java.lang.reflect.Method; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/unit/DataSize.java b/hutool-core/src/main/java/cn/hutool/core/io/unit/DataSize.java index 00a8e6bc5..e2a44b612 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/unit/DataSize.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/unit/DataSize.java @@ -1,7 +1,7 @@ package cn.hutool.core.io.unit; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.math.BigDecimal; import java.util.regex.Matcher; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/unit/DataUnit.java b/hutool-core/src/main/java/cn/hutool/core/io/unit/DataUnit.java index 2163fc94e..72aeaebc7 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/unit/DataUnit.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/unit/DataUnit.java @@ -1,6 +1,6 @@ package cn.hutool.core.io.unit; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 数据单位封装

diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchException.java b/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchException.java index b2df4e26a..628c50647 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchException.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchException.java @@ -1,7 +1,7 @@ package cn.hutool.core.io.watch; import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 监听异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchMonitor.java b/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchMonitor.java index 08e9e7dfe..26f4d3c20 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchMonitor.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchMonitor.java @@ -3,8 +3,8 @@ package cn.hutool.core.io.watch; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.watch.watchers.WatcherChain; -import cn.hutool.core.util.StrUtil; -import cn.hutool.core.util.URLUtil; +import cn.hutool.core.text.StrUtil; +import cn.hutool.core.net.URLUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchUtil.java index bddcf8b0a..edf2b3cc7 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchUtil.java @@ -7,7 +7,7 @@ import java.net.URL; import java.nio.file.*; import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.util.URLUtil; +import cn.hutool.core.net.URLUtil; /** * 监听工具类
diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java b/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java index a33b2a4ed..e64886f09 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java @@ -3,7 +3,7 @@ package cn.hutool.core.lang; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.util.Map; import java.util.function.Supplier; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java b/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java index 91a2f02e5..4a3b142bc 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java @@ -5,6 +5,9 @@ import cn.hutool.core.collection.EnumerationIter; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.resource.ResourceUtil; +import cn.hutool.core.net.URLDecoder; +import cn.hutool.core.net.URLUtil; +import cn.hutool.core.text.StrUtil; import cn.hutool.core.util.*; import java.io.File; @@ -192,7 +195,7 @@ public class ClassScanner implements Serializable { * @param classPredicate 过滤器，无需传入null */ public ClassScanner(String packageName, Predicate> classPredicate) { - this(packageName, classPredicate, CharsetUtil.CHARSET_UTF_8); + this(packageName, classPredicate, CharsetUtil.UTF_8); } /** @@ -233,7 +236,7 @@ public class ClassScanner implements Serializable { for (URL url : ResourceUtil.getResourceIter(this.packagePath)) { switch (url.getProtocol()) { case "file": - scanFile(new File(URLUtil.decode(url.getFile(), this.charset.name())), null); + scanFile(new File(URLDecoder.decode(url.getFile(), this.charset)), null); break; case "jar": scanJar(URLUtil.getJarFile(url)); @@ -277,7 +280,7 @@ public class ClassScanner implements Serializable { final String[] javaClassPaths = ClassUtil.getJavaClassPaths(); for (String classPath : javaClassPaths) { // bug修复，由于路径中空格和中文导致的Jar找不到 - classPath = URLUtil.decode(classPath, CharsetUtil.systemCharsetName()); + classPath = URLDecoder.decode(classPath, CharsetUtil.defaultCharset()); scanFile(new File(classPath), null); } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Console.java b/hutool-core/src/main/java/cn/hutool/core/lang/Console.java index 07cca75c7..8120f86e9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Console.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Console.java @@ -2,7 +2,7 @@ package cn.hutool.core.lang; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.util.Scanner; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ConsoleTable.java b/hutool-core/src/main/java/cn/hutool/core/lang/ConsoleTable.java index 380a839ba..9256c9e05 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ConsoleTable.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ConsoleTable.java @@ -2,7 +2,7 @@ package cn.hutool.core.lang; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.util.ArrayList; import java.util.Collections; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/JarClassLoader.java b/hutool-core/src/main/java/cn/hutool/core/lang/JarClassLoader.java index 262ef222e..2b25daff4 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/JarClassLoader.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/JarClassLoader.java @@ -3,8 +3,8 @@ package cn.hutool.core.lang; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.ReflectUtil; -import cn.hutool.core.util.URLUtil; +import cn.hutool.core.reflect.ReflectUtil; +import cn.hutool.core.net.URLUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java b/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java index 139741a3e..5a67ced80 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java @@ -27,7 +27,7 @@ package cn.hutool.core.lang; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.func.Func0; import cn.hutool.core.lang.func.VoidFunc0; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.util.Collection; import java.util.NoSuchElementException; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ResourceClassLoader.java b/hutool-core/src/main/java/cn/hutool/core/lang/ResourceClassLoader.java index 509efa967..b011e4579 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ResourceClassLoader.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ResourceClassLoader.java @@ -2,7 +2,7 @@ package cn.hutool.core.lang; import cn.hutool.core.io.resource.Resource; import cn.hutool.core.util.ClassLoaderUtil; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ObjUtil; import java.security.SecureClassLoader; import java.util.HashMap; @@ -30,8 +30,8 @@ public class ResourceClassLoader extends SecureClassLoader { * @param resourceMap 资源map */ public ResourceClassLoader(ClassLoader parentClassLoader, Map resourceMap) { - super(ObjectUtil.defaultIfNull(parentClassLoader, ClassLoaderUtil::getClassLoader)); - this.resourceMap = ObjectUtil.defaultIfNull(resourceMap, HashMap::new); + super(ObjUtil.defaultIfNull(parentClassLoader, ClassLoaderUtil::getClassLoader)); + this.resourceMap = ObjUtil.defaultIfNull(resourceMap, HashMap::new); this.cacheClassMap = new HashMap<>(); } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java b/hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java index 4a60648ad..dd83b1c8d 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java @@ -3,8 +3,8 @@ package cn.hutool.core.lang; import cn.hutool.core.lang.func.Func0; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.ReflectUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.reflect.ReflectUtil; +import cn.hutool.core.text.StrUtil; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Validator.java b/hutool-core/src/main/java/cn/hutool/core/lang/Validator.java index 7f1d14c61..14f10c4e4 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Validator.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Validator.java @@ -5,9 +5,9 @@ import cn.hutool.core.exceptions.ValidateException; import cn.hutool.core.regex.PatternPool; import cn.hutool.core.util.CreditCodeUtil; import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ObjUtil; import cn.hutool.core.regex.ReUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import cn.hutool.core.util.IdcardUtil; import java.net.MalformedURLException; @@ -283,7 +283,7 @@ public class Validator { * @return 当两值都为null或相等返回true */ public static boolean equal(Object t1, Object t2) { - return ObjectUtil.equal(t1, t2); + return ObjUtil.equal(t1, t2); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java index da4bb61f9..699c212de 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java @@ -3,8 +3,8 @@ package cn.hutool.core.lang.func; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.map.WeakConcurrentMap; import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.ReflectUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.reflect.ReflectUtil; +import cn.hutool.core.text.StrUtil; import java.io.Serializable; import java.lang.invoke.MethodHandleInfo; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectGenerator.java b/hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectGenerator.java index bda200da3..67a40c4d4 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectGenerator.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectGenerator.java @@ -1,6 +1,6 @@ package cn.hutool.core.lang.generator; -import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.reflect.ReflectUtil; /** * 对象生成器，通过指定对象的Class类型，调用next方法时生成新的对象。 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/hash/KetamaHash.java b/hutool-core/src/main/java/cn/hutool/core/lang/hash/KetamaHash.java index bc2f3cbf2..a9456dcaf 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/hash/KetamaHash.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/hash/KetamaHash.java @@ -1,7 +1,7 @@ package cn.hutool.core.lang.hash; import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/hash/MurmurHash.java b/hutool-core/src/main/java/cn/hutool/core/lang/hash/MurmurHash.java index 94826602b..5b5c65a9d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/hash/MurmurHash.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/hash/MurmurHash.java @@ -2,7 +2,7 @@ package cn.hutool.core.lang.hash; import cn.hutool.core.util.ByteUtil; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.Serializable; import java.nio.ByteOrder; @@ -42,7 +42,7 @@ public class MurmurHash implements Serializable{ private static final int N2 = 0x38495ab5; private static final int DEFAULT_SEED = 0; - private static final Charset DEFAULT_CHARSET = CharsetUtil.CHARSET_UTF_8; + private static final Charset DEFAULT_CHARSET = CharsetUtil.UTF_8; private static final ByteOrder DEFAULT_ORDER = ByteOrder.LITTLE_ENDIAN; /** diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/ObjectId.java b/hutool-core/src/main/java/cn/hutool/core/lang/id/ObjectId.java index 8c63a41ef..b51ae4bd1 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/id/ObjectId.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/id/ObjectId.java @@ -4,7 +4,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ClassLoaderUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RuntimeUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.net.NetworkInterface; import java.nio.ByteBuffer; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/Pid.java b/hutool-core/src/main/java/cn/hutool/core/lang/id/Pid.java index 95ed6f94d..2d7d5135c 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/id/Pid.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/id/Pid.java @@ -1,7 +1,7 @@ package cn.hutool.core.lang.id; import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.lang.management.ManagementFactory; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/Snowflake.java b/hutool-core/src/main/java/cn/hutool/core/lang/id/Snowflake.java index 808ee1a7a..5457f30e6 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/id/Snowflake.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/id/Snowflake.java @@ -2,9 +2,8 @@ package cn.hutool.core.lang.id; import cn.hutool.core.date.SystemClock; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.id.IdUtil; import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.Serializable; import java.util.Date; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/UUID.java b/hutool-core/src/main/java/cn/hutool/core/lang/id/UUID.java index b7774bfce..808deceec 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/id/UUID.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/id/UUID.java @@ -1,7 +1,7 @@ package cn.hutool.core.lang.id; import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/AbsEntry.java b/hutool-core/src/main/java/cn/hutool/core/map/AbsEntry.java index a2ab5885f..fe745461e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/AbsEntry.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/AbsEntry.java @@ -1,6 +1,6 @@ package cn.hutool.core.map; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ObjUtil; import java.util.Map; @@ -25,8 +25,8 @@ public abstract class AbsEntry implements Map.Entry { public boolean equals(Object object) { if (object instanceof Map.Entry) { final Map.Entry that = (Map.Entry) object; - return ObjectUtil.equals(this.getKey(), that.getKey()) - && ObjectUtil.equals(this.getValue(), that.getValue()); + return ObjUtil.equals(this.getKey(), that.getKey()) + && ObjUtil.equals(this.getValue(), that.getValue()); } return false; } diff --git a/hutool-core/src/main/java/cn/hutool/core/map/CamelCaseMap.java b/hutool-core/src/main/java/cn/hutool/core/map/CamelCaseMap.java index 4759b7202..ae75ed97a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/CamelCaseMap.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/CamelCaseMap.java @@ -1,6 +1,6 @@ package cn.hutool.core.map; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.util.HashMap; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapProxy.java b/hutool-core/src/main/java/cn/hutool/core/map/MapProxy.java index 7d3dd3e0f..432275410 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/MapProxy.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/MapProxy.java @@ -5,7 +5,7 @@ import cn.hutool.core.getter.OptNullBasicTypeFromObjectGetter; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.ClassLoaderUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.Serializable; import java.lang.reflect.InvocationHandler; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java index c06c30083..797ef9840 100755 --- a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java @@ -4,10 +4,10 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.func.Editor; import cn.hutool.core.lang.func.Filter; -import cn.hutool.core.lang.reflect.TypeReference; +import cn.hutool.core.reflect.TypeReference; import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ReflectUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.reflect.ReflectUtil; +import cn.hutool.core.text.StrUtil; import java.util.AbstractMap; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapWrapper.java b/hutool-core/src/main/java/cn/hutool/core/map/MapWrapper.java index c54a581f2..67e5b0bec 100755 --- a/hutool-core/src/main/java/cn/hutool/core/map/MapWrapper.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/MapWrapper.java @@ -1,6 +1,6 @@ package cn.hutool.core.map; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ObjUtil; import java.io.IOException; import java.io.ObjectInputStream; @@ -215,7 +215,7 @@ public class MapWrapper implements Map, Iterable>, S @Override public MapWrapper clone() throws CloneNotSupportedException { @SuppressWarnings("unchecked") final MapWrapper clone = (MapWrapper) super.clone(); - clone.raw = ObjectUtil.clone(raw); + clone.raw = ObjUtil.clone(raw); return clone; } diff --git a/hutool-core/src/main/java/cn/hutool/core/map/ReferenceConcurrentMap.java b/hutool-core/src/main/java/cn/hutool/core/map/ReferenceConcurrentMap.java index c5947a9b6..ae4289c3c 100755 --- a/hutool-core/src/main/java/cn/hutool/core/map/ReferenceConcurrentMap.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/ReferenceConcurrentMap.java @@ -2,7 +2,7 @@ package cn.hutool.core.map; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.func.Func0; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.ReferenceUtil; import java.io.Serializable; @@ -279,7 +279,7 @@ public class ReferenceConcurrentMap implements ConcurrentMap, Iterab if (other == this) { return true; } else if (other instanceof WeakKey) { - return ObjectUtil.equals(((WeakKey) other).get(), get()); + return ObjUtil.equals(((WeakKey) other).get(), get()); } return false; } @@ -314,7 +314,7 @@ public class ReferenceConcurrentMap implements ConcurrentMap, Iterab if (other == this) { return true; } else if (other instanceof SoftKey) { - return ObjectUtil.equals(((SoftKey) other).get(), get()); + return ObjUtil.equals(((SoftKey) other).get(), get()); } return false; } diff --git a/hutool-core/src/main/java/cn/hutool/core/map/TableMap.java b/hutool-core/src/main/java/cn/hutool/core/map/TableMap.java index 326637a0a..19d275833 100755 --- a/hutool-core/src/main/java/cn/hutool/core/map/TableMap.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/TableMap.java @@ -2,7 +2,7 @@ package cn.hutool.core.map; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ObjUtil; import java.io.Serializable; import java.util.ArrayList; @@ -117,7 +117,7 @@ public class TableMap implements Map, Iterable>, Ser public List getValues(K key) { return CollUtil.getAny( this.values, - ListUtil.indexOfAll(this.keys, (ele) -> ObjectUtil.equal(ele, key)) + ListUtil.indexOfAll(this.keys, (ele) -> ObjUtil.equal(ele, key)) ); } @@ -131,7 +131,7 @@ public class TableMap implements Map, Iterable>, Ser public List getKeys(V value) { return CollUtil.getAny( this.keys, - ListUtil.indexOfAll(this.values, (ele) -> ObjectUtil.equal(ele, value)) + ListUtil.indexOfAll(this.values, (ele) -> ObjUtil.equal(ele, value)) ); } diff --git a/hutool-core/src/main/java/cn/hutool/core/map/multi/AbsTable.java b/hutool-core/src/main/java/cn/hutool/core/map/multi/AbsTable.java index a98e40286..bb62ddd59 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/multi/AbsTable.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/multi/AbsTable.java @@ -2,7 +2,7 @@ package cn.hutool.core.map.multi; import cn.hutool.core.collection.IterUtil; import cn.hutool.core.collection.TransIter; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ObjUtil; import java.io.Serializable; import java.util.AbstractCollection; @@ -103,7 +103,7 @@ public abstract class AbsTable implements Table { @SuppressWarnings("unchecked") final Cell cell = (Cell) o; Map row = getRow(cell.getRowKey()); if (null != row) { - return ObjectUtil.equals(row.get(cell.getColumnKey()), cell.getValue()); + return ObjUtil.equals(row.get(cell.getColumnKey()), cell.getValue()); } } return false; @@ -216,9 +216,9 @@ public abstract class AbsTable implements Table { } if (obj instanceof Cell) { Cell other = (Cell) obj; - return ObjectUtil.equal(rowKey, other.getRowKey()) - && ObjectUtil.equal(columnKey, other.getColumnKey()) - && ObjectUtil.equal(value, other.getValue()); + return ObjUtil.equal(rowKey, other.getRowKey()) + && ObjUtil.equal(columnKey, other.getColumnKey()) + && ObjUtil.equal(value, other.getValue()); } return false; } diff --git a/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java b/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java index 7e8ab30b0..5e787834b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java +++ b/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java @@ -1,7 +1,7 @@ package cn.hutool.core.math; import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.math.BigDecimal; import java.util.Collections; diff --git a/hutool-core/src/main/java/cn/hutool/core/math/Combination.java b/hutool-core/src/main/java/cn/hutool/core/math/Combination.java index 7da8d3b42..d31a0c966 100644 --- a/hutool-core/src/main/java/cn/hutool/core/math/Combination.java +++ b/hutool-core/src/main/java/cn/hutool/core/math/Combination.java @@ -6,7 +6,7 @@ import java.util.Arrays; import java.util.List; import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; /** * 组合，即C(n, m)
diff --git a/hutool-core/src/main/java/cn/hutool/core/math/Money.java b/hutool-core/src/main/java/cn/hutool/core/math/Money.java index 15839044b..71d971800 100644 --- a/hutool-core/src/main/java/cn/hutool/core/math/Money.java +++ b/hutool-core/src/main/java/cn/hutool/core/math/Money.java @@ -1,6 +1,6 @@ package cn.hutool.core.math; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.io.File; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java b/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java index a2478c4eb..6940c9922 100755 --- a/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java @@ -5,7 +5,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Assert; import cn.hutool.core.regex.PatternPool; import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import java.util.ArrayList; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java b/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java index f5464d798..43a93bba0 100755 --- a/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java @@ -8,7 +8,7 @@ import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.func.Filter; import cn.hutool.core.util.JNDIUtil; import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import javax.naming.NamingException; import javax.naming.directory.Attribute; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/SSLContextBuilder.java b/hutool-core/src/main/java/cn/hutool/core/net/SSLContextBuilder.java index f7c783dc1..f589e94cb 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/SSLContextBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/SSLContextBuilder.java @@ -3,7 +3,7 @@ package cn.hutool.core.net; import cn.hutool.core.builder.Builder; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.StrUtil; import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; @@ -29,7 +29,7 @@ import java.security.SecureRandom; */ public class SSLContextBuilder implements SSLProtocols, Builder { private static final long serialVersionUID = 1L; - + private String protocol = TLS; private KeyManager[] keyManagers; private TrustManager[] trustManagers = {DefaultTrustManager.INSTANCE}; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/URLDecoder.java b/hutool-core/src/main/java/cn/hutool/core/net/URLDecoder.java index 106d973e4..a61b03836 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/URLDecoder.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/URLDecoder.java @@ -1,7 +1,8 @@ package cn.hutool.core.net; import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.CharsetUtil; +import cn.hutool.core.text.StrUtil; import java.io.ByteArrayOutputStream; import java.io.Serializable; @@ -21,6 +22,7 @@ import java.nio.charset.Charset; public class URLDecoder implements Serializable { private static final long serialVersionUID = 1L; + private static final Charset DEFAULT_CHARSET = CharsetUtil.UTF_8; private static final byte ESCAPE_CHAR = '%'; /** @@ -42,7 +44,23 @@ public class URLDecoder implements Serializable { /** * 解码
- * 规则见：https://url.spec.whatwg.org/#urlencoded-parsing + * 规则见：https://url.spec.whatwg.org/#urlencoded-parsing + * 

+	 *   1. 将+和%20转换为空格(" ");
+	 *   2. 将"%xy"转换为文本形式,xy是两位16进制的数值;
+	 *   3. 跳过不符合规范的%形式，直接输出
+	 *
+ * + * @param str 包含URL编码后的字符串 + * @return 解码后的字符串 + */ + public static String decode(String str) { + return decode(str, DEFAULT_CHARSET); + } + + /** + * 解码
+ * 规则见：https://url.spec.whatwg.org/#urlencoded-parsing * 
 	 *   1. 将+和%20转换为空格(" ");
 	 *   2. 将"%xy"转换为文本形式,xy是两位16进制的数值;
@@ -57,6 +75,22 @@ public class URLDecoder implements Serializable {
 		return decode(str, charset, true);
 	}
 
+	/**
+	 * 解码
+	 * 
+	 *   1. 将%20转换为空格 ;
+	 *   2. 将"%xy"转换为文本形式,xy是两位16进制的数值;
+	 *   3. 跳过不符合规范的%形式，直接输出
+	 * 

+	 *
+	 * @param str           包含URL编码后的字符串
+	 * @param isPlusToSpace 是否+转换为空格
+	 * @return 解码后的字符串
+	 */
+	public static String decode(String str, boolean isPlusToSpace) {
+		return decode(str, DEFAULT_CHARSET, isPlusToSpace);
+	}
+
 	/**
 	 * 解码
 	 * 
@@ -71,7 +105,7 @@ public class URLDecoder implements Serializable {
 	 * @return 解码后的字符串
 	 */
 	public static String decode(String str, Charset charset, boolean isPlusToSpace) {
-		if(null == charset){
+		if (null == charset) {
 			return str;
 		}
 		return StrUtil.str(decode(StrUtil.bytes(str, charset), isPlusToSpace), charset);
diff --git a/hutool-core/src/main/java/cn/hutool/core/net/URLEncodeUtil.java b/hutool-core/src/main/java/cn/hutool/core/net/URLEncodeUtil.java
deleted file mode 100644
index c6fd983b5..000000000
--- a/hutool-core/src/main/java/cn/hutool/core/net/URLEncodeUtil.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package cn.hutool.core.net;
-
-import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
-
-import java.nio.charset.Charset;
-
-/**
- * URL编码工具

- * TODO 在6.x中移除此工具（无法很好区分URL编码和www-form编码）
- *
- * @since 5.7.13
- * @author looly
- */
-public class URLEncodeUtil {
-	/**
-	 * 编码URL，默认使用UTF-8编码

-	 * 将需要转换的内容（ASCII码形式之外的内容），用十六进制表示法转换出来，并在之前加上%开头。
-	 *
-	 * @param url URL
-	 * @return 编码后的URL
-	 * @throws UtilException UnsupportedEncodingException
-	 */
-	public static String encodeAll(String url) {
-		return encodeAll(url, CharsetUtil.CHARSET_UTF_8);
-	}
-
-	/**
-	 * 编码URL

-	 * 将需要转换的内容（ASCII码形式之外的内容），用十六进制表示法转换出来，并在之前加上%开头。
-	 *
-	 * @param url     URL
-	 * @param charset 编码，为null表示不编码
-	 * @return 编码后的URL
-	 * @throws UtilException UnsupportedEncodingException
-	 */
-	public static String encodeAll(String url, Charset charset) throws UtilException {
-		return RFC3986.UNRESERVED.encode(url, charset);
-	}
-
-	/**
-	 * 编码URL，默认使用UTF-8编码

-	 * 将需要转换的内容（ASCII码形式之外的内容），用十六进制表示法转换出来，并在之前加上%开头。

-	 * 此方法用于URL自动编码，类似于浏览器中键入地址自动编码，对于像类似于“/”的字符不再编码
-	 *
-	 * @param url URL
-	 * @return 编码后的URL
-	 * @throws UtilException UnsupportedEncodingException
-	 * @since 3.1.2
-	 */
-	public static String encode(String url) throws UtilException {
-		return encode(url, CharsetUtil.CHARSET_UTF_8);
-	}
-
-	/**
-	 * 编码字符为 application/x-www-form-urlencoded

-	 * 将需要转换的内容（ASCII码形式之外的内容），用十六进制表示法转换出来，并在之前加上%开头。

-	 * 此方法用于URL自动编码，类似于浏览器中键入地址自动编码，对于像类似于“/”的字符不再编码
-	 *
-	 * @param url     被编码内容
-	 * @param charset 编码
-	 * @return 编码后的字符
-	 * @since 4.4.1
-	 */
-	public static String encode(String url, Charset charset) {
-		return RFC3986.PATH.encode(url, charset);
-	}
-
-	/**
-	 * 编码URL，默认使用UTF-8编码

-	 * 将需要转换的内容（ASCII码形式之外的内容），用十六进制表示法转换出来，并在之前加上%开头。

-	 * 此方法用于POST请求中的请求体自动编码，转义大部分特殊字符
-	 *
-	 * @param url URL
-	 * @return 编码后的URL
-	 * @throws UtilException UnsupportedEncodingException
-	 * @since 3.1.2
-	 */
-	public static String encodeQuery(String url) throws UtilException {
-		return encodeQuery(url, CharsetUtil.CHARSET_UTF_8);
-	}
-
-	/**
-	 * 编码字符为URL中查询语句

-	 * 将需要转换的内容（ASCII码形式之外的内容），用十六进制表示法转换出来，并在之前加上%开头。

-	 * 此方法用于POST请求中的请求体自动编码，转义大部分特殊字符
-	 *
-	 * @param url     被编码内容
-	 * @param charset 编码
-	 * @return 编码后的字符
-	 * @since 4.4.1
-	 */
-	public static String encodeQuery(String url, Charset charset) {
-		return RFC3986.QUERY.encode(url, charset);
-	}
-
-	/**
-	 * 编码URL，默认使用UTF-8编码

-	 * 将需要转换的内容（ASCII码形式之外的内容），用十六进制表示法转换出来，并在之前加上%开头。

-	 * 此方法用于URL的Segment中自动编码，转义大部分特殊字符
-	 *
-	 * 
-	 * pchar = unreserved（不处理） / pct-encoded / sub-delims（子分隔符） / "@"
-	 * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
-	 * sub-delims = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
-	 * 

-	 *
-	 * @param url URL
-	 * @return 编码后的URL
-	 * @throws UtilException UnsupportedEncodingException
-	 * @since 5.6.5
-	 */
-	public static String encodePathSegment(String url) throws UtilException {
-		return encodePathSegment(url, CharsetUtil.CHARSET_UTF_8);
-	}
-
-	/**
-	 * 编码字符为URL中查询语句

-	 * 将需要转换的内容（ASCII码形式之外的内容），用十六进制表示法转换出来，并在之前加上%开头。

-	 * 此方法用于URL的Segment中自动编码，转义大部分特殊字符
-	 *
-	 * 
-	 * pchar = unreserved / pct-encoded / sub-delims / ":" / "@"
-	 * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
-	 * sub-delims = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
-	 * 

-	 *
-	 * @param url     被编码内容
-	 * @param charset 编码
-	 * @return 编码后的字符
-	 * @since 5.6.5
-	 */
-	public static String encodePathSegment(String url, Charset charset) {
-		if (StrUtil.isEmpty(url)) {
-			return url;
-		}
-		return RFC3986.SEGMENT.encode(url, charset);
-	}
-
-	/**
-	 * 编码URL，默认使用UTF-8编码

-	 * URL的Fragment URLEncoder

-	 * 默认的编码器针对Fragment，定义如下：
-	 *
-	 * 
-	 * fragment    = *( pchar / "/" / "?" )
-	 * pchar       = unreserved / pct-encoded / sub-delims / ":" / "@"
-	 * unreserved  = ALPHA / DIGIT / "-" / "." / "_" / "~"
-	 * sub-delims  = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
-	 * 

-	 *
-	 * 具体见：https://datatracker.ietf.org/doc/html/rfc3986#section-3.5
-	 *
-	 * @param url     被编码内容
-	 * @return 编码后的字符
-	 * @since 5.7.13
-	 */
-	public static String encodeFragment(String url) throws UtilException {
-		return encodeFragment(url, CharsetUtil.CHARSET_UTF_8);
-	}
-
-	/**
-	 * URL的Fragment URLEncoder

-	 * 默认的编码器针对Fragment，定义如下：
-	 *
-	 * 
-	 * fragment    = *( pchar / "/" / "?" )
-	 * pchar       = unreserved / pct-encoded / sub-delims / ":" / "@"
-	 * unreserved  = ALPHA / DIGIT / "-" / "." / "_" / "~"
-	 * sub-delims  = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
-	 * 

-	 *
-	 * 具体见：https://datatracker.ietf.org/doc/html/rfc3986#section-3.5
-	 *
-	 * @param url     被编码内容
-	 * @param charset 编码
-	 * @return 编码后的字符
-	 * @since 5.7.13
-	 */
-	public static String encodeFragment(String url, Charset charset) {
-		if (StrUtil.isEmpty(url)) {
-			return url;
-		}
-		return RFC3986.FRAGMENT.encode(url, charset);
-	}
-}
diff --git a/hutool-core/src/main/java/cn/hutool/core/net/URLEncoder.java b/hutool-core/src/main/java/cn/hutool/core/net/URLEncoder.java
new file mode 100644
index 000000000..38c9857de
--- /dev/null
+++ b/hutool-core/src/main/java/cn/hutool/core/net/URLEncoder.java
@@ -0,0 +1,100 @@
+package cn.hutool.core.net;
+
+import cn.hutool.core.exceptions.UtilException;
+import cn.hutool.core.util.CharUtil;
+import cn.hutool.core.util.CharsetUtil;
+
+import java.nio.charset.Charset;
+
+/**
+ * URL编码器，提供百分号编码实现
+ *
+ * @author looly
+ * @since 6.0.0
+ */
+public class URLEncoder {
+
+	private static final Charset DEFAULT_CHARSET = CharsetUtil.UTF_8;
+
+	/**
+	 * 编码URL，默认使用UTF-8编码

+	 * 将需要转换的内容（ASCII码形式之外的内容），用十六进制表示法转换出来，并在之前加上%开头。。不参与编码的字符：

+	 * 
+	 *     unreserved  = ALPHA / DIGIT / "-" / "." / "_" / "~"
+	 * 

+	 *
+	 * @param url URL
+	 * @return 编码后的URL
+	 * @throws UtilException UnsupportedEncodingException
+	 */
+	public static String encodeAll(String url) {
+		return encodeAll(url, DEFAULT_CHARSET);
+	}
+
+	/**
+	 * 编码URL

+	 * 将需要转换的内容（ASCII码形式之外的内容），用十六进制表示法转换出来，并在之前加上%开头。不参与编码的字符：

+	 * 
+	 *     unreserved  = ALPHA / DIGIT / "-" / "." / "_" / "~"
+	 * 

+	 *
+	 * @param url     URL
+	 * @param charset 编码，为null表示不编码
+	 * @return 编码后的URL
+	 * @throws UtilException UnsupportedEncodingException
+	 */
+	public static String encodeAll(String url, Charset charset) throws UtilException {
+		return RFC3986.UNRESERVED.encode(url, charset);
+	}
+
+	/**
+	 * 编码URL，默认使用UTF-8编码

+	 * 将需要转换的内容（ASCII码形式之外的内容），用十六进制表示法转换出来，并在之前加上%开头。

+	 * 此方法用于POST请求中的请求体自动编码，转义大部分特殊字符
+	 *
+	 * @param url URL
+	 * @return 编码后的URL
+	 */
+	public static String encodeQuery(String url) {
+		return encodeQuery(url, DEFAULT_CHARSET);
+	}
+
+	/**
+	 * 编码字符为URL中查询语句

+	 * 将需要转换的内容（ASCII码形式之外的内容），用十六进制表示法转换出来，并在之前加上%开头。

+	 * 此方法用于POST请求中的请求体自动编码，转义大部分特殊字符
+	 *
+	 * @param url     被编码内容
+	 * @param charset 编码
+	 * @return 编码后的字符
+	 */
+	public static String encodeQuery(String url, Charset charset) {
+		return RFC3986.QUERY.encode(url, charset);
+	}
+
+	/**
+	 * 单独编码URL中的空白符，空白符编码为%20
+	 *
+	 * @param urlStr URL字符串
+	 * @return 编码后的字符串
+	 * @since 4.5.14
+	 */
+	public static String encodeBlank(CharSequence urlStr) {
+		if (urlStr == null) {
+			return null;
+		}
+
+		int len = urlStr.length();
+		final StringBuilder sb = new StringBuilder(len);
+		char c;
+		for (int i = 0; i < len; i++) {
+			c = urlStr.charAt(i);
+			if (CharUtil.isBlankChar(c)) {
+				sb.append("%20");
+			} else {
+				sb.append(c);
+			}
+		}
+		return sb.toString();
+	}
+}
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/URLUtil.java b/hutool-core/src/main/java/cn/hutool/core/net/URLUtil.java
similarity index 88%
rename from hutool-core/src/main/java/cn/hutool/core/util/URLUtil.java
rename to hutool-core/src/main/java/cn/hutool/core/net/URLUtil.java
index fde460ff2..9c9984e1a 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/URLUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/net/URLUtil.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.util;
+package cn.hutool.core.net;
 
 import cn.hutool.core.exceptions.UtilException;
 import cn.hutool.core.io.FileUtil;
@@ -6,9 +6,10 @@ import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.net.URLDecoder;
-import cn.hutool.core.net.URLEncodeUtil;
 import cn.hutool.core.net.url.UrlQuery;
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.core.util.ClassLoaderUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -40,7 +41,7 @@ import java.util.jar.JarFile;
  *
  * @author xiaoleilu
  */
-public class URLUtil extends URLEncodeUtil {
+public class URLUtil {
 
 	/**
 	 * 针对ClassPath路径的伪协议前缀（兼容Spring）: "classpath:"
@@ -193,7 +194,7 @@ public class URLUtil extends URLEncodeUtil {
 	public static URL toUrlForHttp(String urlStr, URLStreamHandler handler) {
 		Assert.notBlank(urlStr, "Url is blank !");
 		// 编码空白符，防止空格引起的请求异常
-		urlStr = encodeBlank(urlStr);
+		urlStr = URLEncoder.encodeBlank(urlStr);
 		try {
 			return new URL(null, urlStr, handler);
 		} catch (MalformedURLException e) {
@@ -201,32 +202,6 @@ public class URLUtil extends URLEncodeUtil {
 		}
 	}
 
-	/**
-	 * 单独编码URL中的空白符，空白符编码为%20
-	 *
-	 * @param urlStr URL字符串
-	 * @return 编码后的字符串
-	 * @since 4.5.14
-	 */
-	public static String encodeBlank(CharSequence urlStr) {
-		if (urlStr == null) {
-			return null;
-		}
-
-		int len = urlStr.length();
-		final StringBuilder sb = new StringBuilder(len);
-		char c;
-		for (int i = 0; i < len; i++) {
-			c = urlStr.charAt(i);
-			if (CharUtil.isBlankChar(c)) {
-				sb.append("%20");
-			} else {
-				sb.append(c);
-			}
-		}
-		return sb.toString();
-	}
-
 	/**
 	 * 获得URL
 	 *
@@ -327,61 +302,6 @@ public class URLUtil extends URLEncodeUtil {
 			throw new UtilException(e);
 		}
 	}
-	//-------------------------------------------------------------------------- decode
-
-	/**
-	 * 解码URL

-	 * 将%开头的16进制表示的内容解码。
-	 *
-	 * @param url URL
-	 * @return 解码后的URL
-	 * @throws UtilException UnsupportedEncodingException
-	 * @since 3.1.2
-	 */
-	public static String decode(String url) throws UtilException {
-		return decode(url, CharsetUtil.UTF_8);
-	}
-
-	/**
-	 * 解码application/x-www-form-urlencoded字符

-	 * 将%开头的16进制表示的内容解码。

-	 * 规则见：https://url.spec.whatwg.org/#urlencoded-parsing
-	 *
-	 * @param content 被解码内容
-	 * @param charset 编码，null表示不解码
-	 * @return 编码后的字符
-	 * @since 4.4.1
-	 */
-	public static String decode(String content, Charset charset) {
-		return URLDecoder.decode(content, charset);
-	}
-
-	/**
-	 * 解码application/x-www-form-urlencoded字符

-	 * 将%开头的16进制表示的内容解码。
-	 *
-	 * @param content       被解码内容
-	 * @param charset       编码，null表示不解码
-	 * @param isPlusToSpace 是否+转换为空格
-	 * @return 编码后的字符
-	 * @since 5.6.3
-	 */
-	public static String decode(String content, Charset charset, boolean isPlusToSpace) {
-		return URLDecoder.decode(content, charset, isPlusToSpace);
-	}
-
-	/**
-	 * 解码application/x-www-form-urlencoded字符

-	 * 将%开头的16进制表示的内容解码。
-	 *
-	 * @param content URL
-	 * @param charset 编码
-	 * @return 解码后的URL
-	 * @throws UtilException UnsupportedEncodingException
-	 */
-	public static String decode(String content, String charset) throws UtilException {
-		return decode(content, StrUtil.isEmpty(charset) ? null : CharsetUtil.charset(charset));
-	}
 
 	/**
 	 * 获得path部分

@@ -468,7 +388,7 @@ public class URLUtil extends URLEncodeUtil {
 	 */
 	public static URI toURI(String location, boolean isEncode) throws UtilException {
 		if (isEncode) {
-			location = encode(location);
+			location = RFC3986.PATH.encode(location, CharsetUtil.UTF_8);
 		}
 		try {
 			return new URI(StrUtil.trim(location));
@@ -657,7 +577,7 @@ public class URLUtil extends URLEncodeUtil {
 			path = StrUtil.subSuf(body, pathSepIndex);
 		}
 		if (isEncodePath) {
-			path = encode(path);
+			path = RFC3986.PATH.encode(path, CharsetUtil.UTF_8);
 		}
 		return protocol + domain + StrUtil.nullToEmpty(path) + StrUtil.nullToEmpty(params);
 	}
diff --git a/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java b/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java
index 50cea5f34..9e2ba3432 100644
--- a/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java
+++ b/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java
@@ -2,7 +2,7 @@ package cn.hutool.core.net.multipart;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFileHeader.java b/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFileHeader.java
index c04b649d9..c8f19947c 100644
--- a/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFileHeader.java
+++ b/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFileHeader.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.net.multipart;
 
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 上传的文件的头部信息

diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlBuilder.java b/hutool-core/src/main/java/cn/hutool/core/net/url/UrlBuilder.java
index fb78ec9f0..749007559 100755
--- a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlBuilder.java
+++ b/hutool-core/src/main/java/cn/hutool/core/net/url/UrlBuilder.java
@@ -4,8 +4,8 @@ import cn.hutool.core.builder.Builder;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.net.RFC3986;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.URLUtil;
+import cn.hutool.core.text.StrUtil;
+import cn.hutool.core.net.URLUtil;
 
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -96,7 +96,7 @@ public final class UrlBuilder implements Builder {
 	 * @since 5.6.3
 	 */
 	public static UrlBuilder ofHttp(String httpUrl) {
-		return ofHttp(httpUrl, CharsetUtil.CHARSET_UTF_8);
+		return ofHttp(httpUrl, CharsetUtil.UTF_8);
 	}
 
 	/**
@@ -123,7 +123,7 @@ public final class UrlBuilder implements Builder {
 	 * @return UrlBuilder
 	 */
 	public static UrlBuilder of(String url) {
-		return of(url, CharsetUtil.CHARSET_UTF_8);
+		return of(url, CharsetUtil.UTF_8);
 	}
 
 	/**
@@ -196,7 +196,7 @@ public final class UrlBuilder implements Builder {
 	 * 构造
 	 */
 	public UrlBuilder() {
-		this.charset = CharsetUtil.CHARSET_UTF_8;
+		this.charset = CharsetUtil.UTF_8;
 	}
 
 	/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlPath.java b/hutool-core/src/main/java/cn/hutool/core/net/url/UrlPath.java
index 39a04ba71..bc6d98261 100644
--- a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlPath.java
+++ b/hutool-core/src/main/java/cn/hutool/core/net/url/UrlPath.java
@@ -5,7 +5,7 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.net.RFC3986;
 import cn.hutool.core.net.URLDecoder;
 import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.nio.charset.Charset;
 import java.util.LinkedList;
diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlQuery.java b/hutool-core/src/main/java/cn/hutool/core/net/url/UrlQuery.java
index 6a59c64f6..ae4bd5892 100644
--- a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlQuery.java
+++ b/hutool-core/src/main/java/cn/hutool/core/net/url/UrlQuery.java
@@ -9,7 +9,7 @@ import cn.hutool.core.map.TableMap;
 import cn.hutool.core.net.FormUrlencoded;
 import cn.hutool.core.net.RFC3986;
 import cn.hutool.core.net.URLDecoder;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.nio.charset.Charset;
 import java.util.Iterator;
diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/ActualTypeMapperPool.java b/hutool-core/src/main/java/cn/hutool/core/reflect/ActualTypeMapperPool.java
old mode 100755
new mode 100644
similarity index 99%
rename from hutool-core/src/main/java/cn/hutool/core/lang/reflect/ActualTypeMapperPool.java
rename to hutool-core/src/main/java/cn/hutool/core/reflect/ActualTypeMapperPool.java
index ea213ec1c..83e23d6be
--- a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/ActualTypeMapperPool.java
+++ b/hutool-core/src/main/java/cn/hutool/core/reflect/ActualTypeMapperPool.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.lang.reflect;
+package cn.hutool.core.reflect;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.map.WeakConcurrentMap;
diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/LookupFactory.java b/hutool-core/src/main/java/cn/hutool/core/reflect/LookupFactory.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-core/src/main/java/cn/hutool/core/lang/reflect/LookupFactory.java
rename to hutool-core/src/main/java/cn/hutool/core/reflect/LookupFactory.java
index 5ae8392fa..d833dcd4c
--- a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/LookupFactory.java
+++ b/hutool-core/src/main/java/cn/hutool/core/reflect/LookupFactory.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.lang.reflect;
+package cn.hutool.core.reflect;
 
 import cn.hutool.core.exceptions.UtilException;
 
diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/MethodHandleUtil.java b/hutool-core/src/main/java/cn/hutool/core/reflect/MethodHandleUtil.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-core/src/main/java/cn/hutool/core/lang/reflect/MethodHandleUtil.java
rename to hutool-core/src/main/java/cn/hutool/core/reflect/MethodHandleUtil.java
index 1914a096f..2902f58be
--- a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/MethodHandleUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/reflect/MethodHandleUtil.java
@@ -1,9 +1,8 @@
-package cn.hutool.core.lang.reflect;
+package cn.hutool.core.reflect;
 
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ModifierUtil.java b/hutool-core/src/main/java/cn/hutool/core/reflect/ModifierUtil.java
similarity index 99%
rename from hutool-core/src/main/java/cn/hutool/core/util/ModifierUtil.java
rename to hutool-core/src/main/java/cn/hutool/core/reflect/ModifierUtil.java
index dec42bed0..1839ca78f 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/ModifierUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/reflect/ModifierUtil.java
@@ -1,4 +1,6 @@
-package cn.hutool.core.util;
+package cn.hutool.core.reflect;
+
+import cn.hutool.core.util.ArrayUtil;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/ParameterizedTypeImpl.java b/hutool-core/src/main/java/cn/hutool/core/reflect/ParameterizedTypeImpl.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-core/src/main/java/cn/hutool/core/lang/reflect/ParameterizedTypeImpl.java
rename to hutool-core/src/main/java/cn/hutool/core/reflect/ParameterizedTypeImpl.java
index d92b138a0..a06d10aac
--- a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/ParameterizedTypeImpl.java
+++ b/hutool-core/src/main/java/cn/hutool/core/reflect/ParameterizedTypeImpl.java
@@ -1,11 +1,11 @@
-package cn.hutool.core.lang.reflect;
+package cn.hutool.core.reflect;
 
 import java.io.Serializable;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * {@link ParameterizedType} 接口实现，用于重新定义泛型类型
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java b/hutool-core/src/main/java/cn/hutool/core/reflect/ReflectUtil.java
old mode 100755
new mode 100644
similarity index 99%
rename from hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java
rename to hutool-core/src/main/java/cn/hutool/core/reflect/ReflectUtil.java
index 279e2158b..f5b5bff7e
--- a/hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/reflect/ReflectUtil.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.util;
+package cn.hutool.core.reflect;
 
 import cn.hutool.core.annotation.Alias;
 import cn.hutool.core.bean.NullWrapperBean;
@@ -8,9 +8,11 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.exceptions.UtilException;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.func.Filter;
-import cn.hutool.core.lang.reflect.MethodHandleUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.map.WeakConcurrentMap;
+import cn.hutool.core.text.StrUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ClassUtil;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Array;
diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/TypeReference.java b/hutool-core/src/main/java/cn/hutool/core/reflect/TypeReference.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-core/src/main/java/cn/hutool/core/lang/reflect/TypeReference.java
rename to hutool-core/src/main/java/cn/hutool/core/reflect/TypeReference.java
index db971a5c0..f317a2c3b
--- a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/TypeReference.java
+++ b/hutool-core/src/main/java/cn/hutool/core/reflect/TypeReference.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.lang.reflect;
+package cn.hutool.core.reflect;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/package-info.java b/hutool-core/src/main/java/cn/hutool/core/reflect/package-info.java
old mode 100755
new mode 100644
similarity index 69%
rename from hutool-core/src/main/java/cn/hutool/core/lang/reflect/package-info.java
rename to hutool-core/src/main/java/cn/hutool/core/reflect/package-info.java
index 1d46de461..6cc2a174e
--- a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/package-info.java
+++ b/hutool-core/src/main/java/cn/hutool/core/reflect/package-info.java
@@ -4,4 +4,4 @@
  * @author looly
  * @since 5.4.2
  */
-package cn.hutool.core.lang.reflect;
+package cn.hutool.core.reflect;
diff --git a/hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java b/hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java
index 0bf59755d..995e319e9 100755
--- a/hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java
@@ -4,16 +4,14 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.exceptions.UtilException;
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.regex.PatternPool;
-import cn.hutool.core.regex.RegexPool;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.lang.func.Func1;
 import cn.hutool.core.lang.mutable.Mutable;
 import cn.hutool.core.lang.mutable.MutableObj;
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.reflect.ReflectUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -268,7 +266,7 @@ public class ReUtil {
 		}
 
 		//提取模板中的编号
-		final TreeSet varNums = new TreeSet<>((o1, o2) -> ObjectUtil.compare(o2, o1));
+		final TreeSet varNums = new TreeSet<>((o1, o2) -> ObjUtil.compare(o2, o1));
 		final Matcher matcherForTemplate = PatternPool.GROUP_VAR.matcher(template);
 		while (matcherForTemplate.find()) {
 			varNums.add(Integer.parseInt(matcherForTemplate.group(1)));
diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/CollectorUtil.java b/hutool-core/src/main/java/cn/hutool/core/stream/CollectorUtil.java
index 5d9c9d87a..a50e16054 100644
--- a/hutool-core/src/main/java/cn/hutool/core/stream/CollectorUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/stream/CollectorUtil.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.stream;
 
 import cn.hutool.core.lang.Opt;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.Collections;
 import java.util.EnumSet;
diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/StreamUtil.java b/hutool-core/src/main/java/cn/hutool/core/stream/StreamUtil.java
index b3e04bbfc..b4a303095 100644
--- a/hutool-core/src/main/java/cn/hutool/core/stream/StreamUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/stream/StreamUtil.java
@@ -63,7 +63,7 @@ public class StreamUtil {
 	 * @return {@link Stream}
 	 */
 	public static Stream of(File file) {
-		return of(file, CharsetUtil.CHARSET_UTF_8);
+		return of(file, CharsetUtil.UTF_8);
 	}
 
 	/**
@@ -73,7 +73,7 @@ public class StreamUtil {
 	 * @return {@link Stream}
 	 */
 	public static Stream of(Path path) {
-		return of(path, CharsetUtil.CHARSET_UTF_8);
+		return of(path, CharsetUtil.UTF_8);
 	}
 
 	/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/AntPathMatcher.java b/hutool-core/src/main/java/cn/hutool/core/text/AntPathMatcher.java
index 11d07c3ea..7145c8d48 100755
--- a/hutool-core/src/main/java/cn/hutool/core/text/AntPathMatcher.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/AntPathMatcher.java
@@ -1,8 +1,6 @@
 package cn.hutool.core.text;
 
 
-import cn.hutool.core.util.StrUtil;
-
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
index 6f80d5f08..dc5ae8674 100755
--- a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
@@ -13,10 +13,8 @@ import cn.hutool.core.text.finder.StrFinder;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.DesensitizedUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.util.StrUtil;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
@@ -2016,7 +2014,7 @@ public class CharSequenceUtil {
 		}
 
 		int counterOfDoubleByte = 0;
-		final byte[] b = bytes(str, CharsetUtil.CHARSET_GBK);
+		final byte[] b = bytes(str, CharsetUtil.GBK);
 		if (b.length <= len) {
 			return str.toString();
 		}
@@ -2033,7 +2031,7 @@ public class CharSequenceUtil {
 				len -= 1;
 			}
 		}
-		return new String(b, 0, len, CharsetUtil.CHARSET_GBK);
+		return new String(b, 0, len, CharsetUtil.GBK);
 	}
 
 	/**
@@ -2744,7 +2742,7 @@ public class CharSequenceUtil {
 	 * @return 编码后的字节码
 	 */
 	public static byte[] utf8Bytes(CharSequence str) {
-		return bytes(str, CharsetUtil.CHARSET_UTF_8);
+		return bytes(str, CharsetUtil.UTF_8);
 	}
 
 	/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/DesensitizedUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/DesensitizedUtil.java
similarity index 99%
rename from hutool-core/src/main/java/cn/hutool/core/util/DesensitizedUtil.java
rename to hutool-core/src/main/java/cn/hutool/core/text/DesensitizedUtil.java
index 24d2bf800..333b351ec 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/DesensitizedUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/DesensitizedUtil.java
@@ -1,4 +1,6 @@
-package cn.hutool.core.util;
+package cn.hutool.core.text;
+
+import cn.hutool.core.util.CharUtil;
 
 /**
  * 脱敏工具类，支持以下类型信息的脱敏自动处理：
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/NamingCase.java b/hutool-core/src/main/java/cn/hutool/core/text/NamingCase.java
index 56eb04c46..c1799c09d 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/NamingCase.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/NamingCase.java
@@ -1,7 +1,6 @@
 package cn.hutool.core.text;
 
 import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.StrUtil;
 
 /**
  * 命名规则封装，主要是针对驼峰风格命名、连接符命名等的封装
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/PasswdStrength.java b/hutool-core/src/main/java/cn/hutool/core/text/PasswdStrength.java
index d4805738b..4ba35d1be 100755
--- a/hutool-core/src/main/java/cn/hutool/core/text/PasswdStrength.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/PasswdStrength.java
@@ -1,7 +1,5 @@
 package cn.hutool.core.text;
 
-import cn.hutool.core.util.StrUtil;
-
 /**
  * 检测密码强度

  * 来自：https://github.com/venshine/CheckPasswordStrength
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrBuilder.java b/hutool-core/src/main/java/cn/hutool/core/text/StrBuilder.java
index 18a18bd92..f45b08414 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/StrBuilder.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/StrBuilder.java
@@ -2,7 +2,6 @@ package cn.hutool.core.text;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrFormatter.java b/hutool-core/src/main/java/cn/hutool/core/text/StrFormatter.java
index b90c23ce1..a46a44554 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/StrFormatter.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/StrFormatter.java
@@ -1,7 +1,6 @@
 package cn.hutool.core.text;
 
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
 
 import java.util.Map;
 
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrJoiner.java b/hutool-core/src/main/java/cn/hutool/core/text/StrJoiner.java
index 4124f8d27..3459bc509 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/StrJoiner.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/StrJoiner.java
@@ -4,8 +4,7 @@ import cn.hutool.core.collection.ArrayIter;
 import cn.hutool.core.collection.IterUtil;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -212,7 +211,7 @@ public class StrJoiner implements Appendable, Serializable {
 		} else if (obj instanceof Iterable) {
 			append(((Iterable) obj).iterator());
 		} else {
-			append(ObjectUtil.toString(obj));
+			append(ObjUtil.toString(obj));
 		}
 		return this;
 	}
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrMatcher.java b/hutool-core/src/main/java/cn/hutool/core/text/StrMatcher.java
index ccc59f87f..df51a6370 100755
--- a/hutool-core/src/main/java/cn/hutool/core/text/StrMatcher.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/StrMatcher.java
@@ -1,7 +1,6 @@
 package cn.hutool.core.text;
 
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrSplitter.java b/hutool-core/src/main/java/cn/hutool/core/text/StrSplitter.java
index 9a0249c76..cbc3e7713 100755
--- a/hutool-core/src/main/java/cn/hutool/core/text/StrSplitter.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/StrSplitter.java
@@ -8,7 +8,6 @@ import cn.hutool.core.text.finder.PatternFinder;
 import cn.hutool.core.text.finder.StrFinder;
 import cn.hutool.core.text.split.SplitIter;
 import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.StrUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/StrUtil.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java
rename to hutool-core/src/main/java/cn/hutool/core/text/StrUtil.java
index 59d7c1561..126376b1d
--- a/hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/StrUtil.java
@@ -1,11 +1,8 @@
-package cn.hutool.core.util;
+package cn.hutool.core.text;
 
 import cn.hutool.core.lang.id.IdUtil;
-import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.text.StrBuilder;
-import cn.hutool.core.text.StrFormatter;
-import cn.hutool.core.text.StrPool;
-import cn.hutool.core.text.TextSimilarity;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.CharsetUtil;
 
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -118,7 +115,7 @@ public class StrUtil extends CharSequenceUtil implements StrPool {
 	 * @return 字符串
 	 */
 	public static String utf8Str(Object obj) {
-		return str(obj, CharsetUtil.CHARSET_UTF_8);
+		return str(obj, CharsetUtil.UTF_8);
 	}
 
 	/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/TextSimilarity.java b/hutool-core/src/main/java/cn/hutool/core/text/TextSimilarity.java
index 2401d2f77..bd7ba4251 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/TextSimilarity.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/TextSimilarity.java
@@ -1,7 +1,6 @@
 package cn.hutool.core.text;
 
 import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.StrUtil;
 
 /**
  * 文本相似度计算

diff --git a/hutool-core/src/main/java/cn/hutool/core/text/UnicodeUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/UnicodeUtil.java
index d62ee3b37..80c810a86 100755
--- a/hutool-core/src/main/java/cn/hutool/core/text/UnicodeUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/UnicodeUtil.java
@@ -2,7 +2,6 @@ package cn.hutool.core.text;
 
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.util.StrUtil;
 
 /**
  * 提供Unicode字符串和普通字符串之间的转换
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/dfa/SensitiveUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/dfa/SensitiveUtil.java
index 82e4de1d2..c3d5309a2 100755
--- a/hutool-core/src/main/java/cn/hutool/core/text/dfa/SensitiveUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/dfa/SensitiveUtil.java
@@ -2,7 +2,7 @@ package cn.hutool.core.text.dfa;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java b/hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java
index 4b815794f..08376d51d 100755
--- a/hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.text.dfa;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/escape/EscapeUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/escape/EscapeUtil.java
index 39aabe481..df70d6a47 100755
--- a/hutool-core/src/main/java/cn/hutool/core/text/escape/EscapeUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/escape/EscapeUtil.java
@@ -1,6 +1,6 @@
 package cn.hutool.core.text.escape;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.function.Predicate;
 
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/split/SplitIter.java b/hutool-core/src/main/java/cn/hutool/core/text/split/SplitIter.java
index b1cb444d9..d4469964b 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/split/SplitIter.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/split/SplitIter.java
@@ -3,7 +3,7 @@ package cn.hutool.core.text.split;
 import cn.hutool.core.collection.ComputeIter;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.text.finder.TextFinder;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/ExecutorBuilder.java b/hutool-core/src/main/java/cn/hutool/core/thread/ExecutorBuilder.java
index ccb9c86d3..b1eafc036 100644
--- a/hutool-core/src/main/java/cn/hutool/core/thread/ExecutorBuilder.java
+++ b/hutool-core/src/main/java/cn/hutool/core/thread/ExecutorBuilder.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.thread;
 
 import cn.hutool.core.builder.Builder;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
@@ -242,7 +242,7 @@ public class ExecutorBuilder implements Builder {
 			workQueue = (corePoolSize <= 0) ? new SynchronousQueue<>() : new LinkedBlockingQueue<>(DEFAULT_QUEUE_CAPACITY);
 		}
 		final ThreadFactory threadFactory = (null != builder.threadFactory) ? builder.threadFactory : Executors.defaultThreadFactory();
-		RejectedExecutionHandler handler = ObjectUtil.defaultIfNull(builder.handler, RejectPolicy.ABORT.getValue());
+		RejectedExecutionHandler handler = ObjUtil.defaultIfNull(builder.handler, RejectPolicy.ABORT.getValue());
 
 		final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(//
 				corePoolSize, //
diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/NamedThreadFactory.java b/hutool-core/src/main/java/cn/hutool/core/thread/NamedThreadFactory.java
index 3f1ea70fc..2bfe54cf0 100644
--- a/hutool-core/src/main/java/cn/hutool/core/thread/NamedThreadFactory.java
+++ b/hutool-core/src/main/java/cn/hutool/core/thread/NamedThreadFactory.java
@@ -4,7 +4,7 @@ import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 线程创建工厂类，此工厂可选配置：
diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadException.java b/hutool-core/src/main/java/cn/hutool/core/thread/ThreadException.java
index b61963b2c..c930e6d7d 100644
--- a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadException.java
+++ b/hutool-core/src/main/java/cn/hutool/core/thread/ThreadException.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.thread;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 工具类异常
diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadFactoryBuilder.java b/hutool-core/src/main/java/cn/hutool/core/thread/ThreadFactoryBuilder.java
index 686f95cfd..bd39ab005 100644
--- a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadFactoryBuilder.java
+++ b/hutool-core/src/main/java/cn/hutool/core/thread/ThreadFactoryBuilder.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.thread;
 
 import cn.hutool.core.builder.Builder;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.concurrent.Executors;
diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/Tree.java b/hutool-core/src/main/java/cn/hutool/core/tree/Tree.java
index 5bc6cec07..0ab6bd007 100755
--- a/hutool-core/src/main/java/cn/hutool/core/tree/Tree.java
+++ b/hutool-core/src/main/java/cn/hutool/core/tree/Tree.java
@@ -5,8 +5,8 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.func.Filter;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -38,7 +38,7 @@ public class Tree extends LinkedHashMap implements Node {
 	 * @param treeNodeConfig TreeNode配置
 	 */
 	public Tree(TreeNodeConfig treeNodeConfig) {
-		this.treeNodeConfig = ObjectUtil.defaultIfNull(
+		this.treeNodeConfig = ObjUtil.defaultIfNull(
 				treeNodeConfig, TreeNodeConfig.DEFAULT_CONFIG);
 	}
 
@@ -314,7 +314,7 @@ public class Tree extends LinkedHashMap implements Node {
 	 * @since 5.7.17
 	 */
 	public Tree cloneTree() {
-		final Tree result = ObjectUtil.clone(this);
+		final Tree result = ObjUtil.clone(this);
 		result.setChildren(cloneChildren());
 		return result;
 	}
diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/TreeBuilder.java b/hutool-core/src/main/java/cn/hutool/core/tree/TreeBuilder.java
index be690aa3c..4fb7848ee 100755
--- a/hutool-core/src/main/java/cn/hutool/core/tree/TreeBuilder.java
+++ b/hutool-core/src/main/java/cn/hutool/core/tree/TreeBuilder.java
@@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.tree.parser.NodeParser;
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -234,7 +234,7 @@ public class TreeBuilder implements Builder> {
 				continue;
 			}
 			parentId = node.getParentId();
-			if (ObjectUtil.equals(this.root.getId(), parentId)) {
+			if (ObjUtil.equals(this.root.getId(), parentId)) {
 				this.root.addChildren(node);
 				continue;
 			}
diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/TreeUtil.java b/hutool-core/src/main/java/cn/hutool/core/tree/TreeUtil.java
index b08f3bd53..5ff1d65be 100755
--- a/hutool-core/src/main/java/cn/hutool/core/tree/TreeUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/tree/TreeUtil.java
@@ -3,7 +3,7 @@ package cn.hutool.core.tree;
 import cn.hutool.core.collection.IterUtil;
 import cn.hutool.core.tree.parser.DefaultNodeParser;
 import cn.hutool.core.tree.parser.NodeParser;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -172,7 +172,7 @@ public class TreeUtil {
 	 * @since 5.2.4
 	 */
 	public static  Tree getNode(Tree node, T id) {
-		if (ObjectUtil.equal(id, node.getId())) {
+		if (ObjUtil.equal(id, node.getId())) {
 			return node;
 		}
 
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java
index 95efc370c..d9c6b45bb 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java
@@ -11,6 +11,7 @@ import cn.hutool.core.lang.func.Filter;
 import cn.hutool.core.lang.func.Matcher;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.text.StrJoiner;
+import cn.hutool.core.text.StrUtil;
 
 import java.lang.reflect.Array;
 import java.nio.ByteBuffer;
@@ -118,7 +119,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	public static  boolean hasNull(T... array) {
 		if (isNotEmpty(array)) {
 			for (T element : array) {
-				if (ObjectUtil.isNull(element)) {
+				if (ObjUtil.isNull(element)) {
 					return true;
 				}
 			}
@@ -150,7 +151,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	 */
 	@SuppressWarnings("unchecked")
 	public static  T firstNonNull(T... array) {
-		return firstMatch(ObjectUtil::isNotNull, array);
+		return firstMatch(ObjUtil::isNotNull, array);
 	}
 
 	/**
@@ -797,7 +798,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	 * @since 3.0.7
 	 */
 	public static  int indexOf(T[] array, Object value, int beginIndexInclude) {
-		return matchIndex((obj) -> ObjectUtil.equal(value, obj), beginIndexInclude, array);
+		return matchIndex((obj) -> ObjUtil.equal(value, obj), beginIndexInclude, array);
 	}
 
 	/**
@@ -810,7 +811,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	 * @since 3.0.7
 	 */
 	public static  int indexOf(T[] array, Object value) {
-		return matchIndex((obj) -> ObjectUtil.equal(value, obj), array);
+		return matchIndex((obj) -> ObjUtil.equal(value, obj), array);
 	}
 
 	/**
@@ -861,7 +862,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	public static  int lastIndexOf(T[] array, Object value, int endInclude) {
 		if (isNotEmpty(array)) {
 			for (int i = endInclude; i >= 0; i--) {
-				if (ObjectUtil.equal(value, array[i])) {
+				if (ObjUtil.equal(value, array[i])) {
 					return i;
 				}
 			}
@@ -1539,7 +1540,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	}
 
 	/**
-	 * 计算{@code null}或空元素对象的个数，通过{@link ObjectUtil#isEmpty(Object)} 判断元素
+	 * 计算{@code null}或空元素对象的个数，通过{@link ObjUtil#isEmpty(Object)} 判断元素
 	 *
 	 * @param args 被检查的对象,一个或者多个
 	 * @return 存在{@code null}的数量
@@ -1549,7 +1550,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 		int count = 0;
 		if (isNotEmpty(args)) {
 			for (Object element : args) {
-				if (ObjectUtil.isEmpty(element)) {
+				if (ObjUtil.isEmpty(element)) {
 					count++;
 				}
 			}
@@ -1558,7 +1559,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	}
 
 	/**
-	 * 是否存在{@code null}或空对象，通过{@link ObjectUtil#isEmpty(Object)} 判断元素
+	 * 是否存在{@code null}或空对象，通过{@link ObjUtil#isEmpty(Object)} 判断元素
 	 *
 	 * @param args 被检查对象
 	 * @return 是否存在
@@ -1567,7 +1568,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	public static boolean hasEmpty(Object... args) {
 		if (isNotEmpty(args)) {
 			for (Object element : args) {
-				if (ObjectUtil.isEmpty(element)) {
+				if (ObjUtil.isEmpty(element)) {
 					return true;
 				}
 			}
@@ -1576,7 +1577,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	}
 
 	/**
-	 * 是否存都为{@code null}或空对象，通过{@link ObjectUtil#isEmpty(Object)} 判断元素
+	 * 是否存都为{@code null}或空对象，通过{@link ObjUtil#isEmpty(Object)} 判断元素
 	 *
 	 * @param args 被检查的对象,一个或者多个
 	 * @return 是否都为空
@@ -1584,7 +1585,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	 */
 	public static boolean isAllEmpty(Object... args) {
 		for (Object obj : args) {
-			if (false == ObjectUtil.isEmpty(obj)) {
+			if (false == ObjUtil.isEmpty(obj)) {
 				return false;
 			}
 		}
@@ -1592,7 +1593,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	}
 
 	/**
-	 * 是否存都不为{@code null}或空对象，通过{@link ObjectUtil#isEmpty(Object)} 判断元素
+	 * 是否存都不为{@code null}或空对象，通过{@link ObjUtil#isEmpty(Object)} 判断元素
 	 *
 	 * @param args 被检查的对象,一个或者多个
 	 * @return 是否都不为空
@@ -1816,7 +1817,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 		}
 
 		for (int i = 0; i < subArray.length; i++) {
-			if (false == ObjectUtil.equal(array[i + firstIndex], subArray[i])) {
+			if (false == ObjUtil.equal(array[i + firstIndex], subArray[i])) {
 				return indexOfSub(array, firstIndex + 1, subArray);
 			}
 		}
@@ -1861,7 +1862,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 		}
 
 		for (int i = 0; i < subArray.length; i++) {
-			if (false == ObjectUtil.equal(array[i + firstIndex], subArray[i])) {
+			if (false == ObjUtil.equal(array[i + firstIndex], subArray[i])) {
 				return lastIndexOfSub(array, firstIndex - 1, subArray);
 			}
 		}
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java
index 542f89096..f557a2890 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java
@@ -2,6 +2,7 @@ package cn.hutool.core.util;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.Set;
 
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/CharsetUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/CharsetUtil.java
index b2fff1553..fff8932af 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/CharsetUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/CharsetUtil.java
@@ -2,6 +2,7 @@ package cn.hutool.core.util;
 
 import cn.hutool.core.io.CharsetDetector;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.File;
 import java.io.InputStream;
@@ -12,45 +13,45 @@ import java.nio.charset.UnsupportedCharsetException;
 /**
  * 字符集工具类
  *
- * @author xiaoleilu
+ * @author looly
  */
 public class CharsetUtil {
 
 	/**
 	 * ISO-8859-1
 	 */
-	public static final String ISO_8859_1 = "ISO-8859-1";
+	public static final String NAME_ISO_8859_1 = "ISO-8859-1";
 	/**
 	 * UTF-8
 	 */
-	public static final String UTF_8 = "UTF-8";
+	public static final String NAME_UTF_8 = "UTF-8";
 	/**
 	 * GBK
 	 */
-	public static final String GBK = "GBK";
+	public static final String NAME_GBK = "GBK";
 
 	/**
 	 * ISO-8859-1
 	 */
-	public static final Charset CHARSET_ISO_8859_1 = StandardCharsets.ISO_8859_1;
+	public static final Charset ISO_8859_1 = StandardCharsets.ISO_8859_1;
 	/**
 	 * UTF-8
 	 */
-	public static final Charset CHARSET_UTF_8 = StandardCharsets.UTF_8;
+	public static final Charset UTF_8 = StandardCharsets.UTF_8;
 	/**
 	 * GBK
 	 */
-	public static final Charset CHARSET_GBK;
+	public static final Charset GBK;
 
 	static {
 		//避免不支持GBK的系统中运行报错 issue#731
-		Charset _CHARSET_GBK = null;
+		Charset _GBK = null;
 		try {
-			_CHARSET_GBK = Charset.forName(GBK);
+			_GBK = Charset.forName(NAME_GBK);
 		} catch (UnsupportedCharsetException e) {
 			//ignore
 		}
-		CHARSET_GBK = _CHARSET_GBK;
+		GBK = _GBK;
 	}
 
 	/**
@@ -127,11 +128,11 @@ public class CharsetUtil {
 	 */
 	public static String convert(String source, Charset srcCharset, Charset destCharset) {
 		if (null == srcCharset) {
-			srcCharset = StandardCharsets.ISO_8859_1;
+			srcCharset = ISO_8859_1;
 		}
 
 		if (null == destCharset) {
-			destCharset = StandardCharsets.UTF_8;
+			destCharset = UTF_8;
 		}
 
 		if (StrUtil.isBlank(source) || srcCharset.equals(destCharset)) {
@@ -174,7 +175,7 @@ public class CharsetUtil {
 	 * @since 3.1.2
 	 */
 	public static Charset systemCharset() {
-		return FileUtil.isWindows() ? CHARSET_GBK : defaultCharset();
+		return FileUtil.isWindows() ? GBK : defaultCharset();
 	}
 
 	/**
@@ -205,7 +206,7 @@ public class CharsetUtil {
 	 * @see CharsetDetector#detect(InputStream, Charset...)
 	 * @since 5.7.10
 	 */
-	public static Charset defaultCharset(InputStream in, Charset... charsets) {
+	public static Charset detect(InputStream in, Charset... charsets) {
 		return CharsetDetector.detect(in, charsets);
 	}
 
@@ -220,7 +221,7 @@ public class CharsetUtil {
 	 * @see CharsetDetector#detect(int, InputStream, Charset...)
 	 * @since 5.7.10
 	 */
-	public static Charset defaultCharset(int bufferSize, InputStream in, Charset... charsets) {
+	public static Charset detect(int bufferSize, InputStream in, Charset... charsets) {
 		return CharsetDetector.detect(bufferSize, in, charsets);
 	}
 }
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ClassLoaderUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ClassLoaderUtil.java
index 2300fe107..2b932c4eb 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/ClassLoaderUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ClassLoaderUtil.java
@@ -7,6 +7,7 @@ import cn.hutool.core.lang.JarClassLoader;
 import cn.hutool.core.lang.Pair;
 import cn.hutool.core.map.WeakConcurrentMap;
 import cn.hutool.core.text.CharPool;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.File;
 import java.lang.reflect.Array;
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ClassUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ClassUtil.java
index 76a7b3b1f..6977f456c 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/ClassUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ClassUtil.java
@@ -10,6 +10,10 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.ClassScanner;
 import cn.hutool.core.lang.func.Filter;
 import cn.hutool.core.lang.Singleton;
+import cn.hutool.core.reflect.ReflectUtil;
+import cn.hutool.core.net.URLDecoder;
+import cn.hutool.core.net.URLUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
@@ -113,7 +117,7 @@ public class ClassUtil {
 
 	/**
 	 * 获取完整类名的短格式如：

-	 * cn.hutool.core.util.StrUtil -》c.h.c.u.StrUtil
+	 * cn.hutool.core.text.StrUtil -》c.h.c.u.StrUtil
 	 *
 	 * @param className 类名
 	 * @return 短格式类名
@@ -442,7 +446,7 @@ public class ClassUtil {
 		String path;
 		while (resources.hasMoreElements()) {
 			path = resources.nextElement().getPath();
-			paths.add(isDecode ? URLUtil.decode(path, CharsetUtil.systemCharsetName()) : path);
+			paths.add(isDecode ? URLDecoder.decode(path, CharsetUtil.defaultCharset()) : path);
 		}
 		return paths;
 	}
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/CoordinateUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/CoordinateUtil.java
index f915358ad..445522090 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/CoordinateUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/CoordinateUtil.java
@@ -11,8 +11,8 @@ import java.util.Objects;
  *     
  • BD09坐标系：即百度坐标系，GCJ02坐标系经加密后的坐标系。百度、搜狗等使用
    • 
  * 
  * 
    
- * 坐标转换相关参考: https://tool.lu/coordinate/
    
- * 参考：https://github.com/JourWon/coordinate-transform
+ * 坐标转换相关参考: https://tool.lu/coordinate/
    
+ * 参考：https://github.com/JourWon/coordinate-transform
  *
  * @author hongzhe.qin(qin462328037at163.com), looly
  * @since 5.7.16
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/CreditCodeUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/CreditCodeUtil.java
index e655ede42..b5cfc9e7a 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/CreditCodeUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/CreditCodeUtil.java
@@ -2,6 +2,7 @@ package cn.hutool.core.util;
 
 import cn.hutool.core.regex.PatternPool;
 import cn.hutool.core.regex.ReUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -9,7 +10,7 @@ import java.util.regex.Pattern;
 
 /**
  * 统一社会信用代码（GB32100-2015）工具类
    
- * 标准见：https://www.cods.org.cn/c/2020-10-29/12575.html
+ * 标准见：https://www.cods.org.cn/c/2020-10-29/12575.html
  *
  * 
      * 第一部分：登记管理部门代码1位 (数字或大写英文字母)
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java
index 018baa3dd..3747cba1d 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java
@@ -3,7 +3,9 @@ package cn.hutool.core.util;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.func.Func1;
 import cn.hutool.core.lang.func.LambdaUtil;
+import cn.hutool.core.reflect.ReflectUtil;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -94,7 +96,7 @@ public class EnumUtil {
 	 * @since 4.5.18
 	 */
 	public static > E fromString(Class enumClass, String value, E defaultValue) {
-		return ObjectUtil.defaultIfNull(fromStringQuietly(enumClass, value), defaultValue);
+		return ObjUtil.defaultIfNull(fromStringQuietly(enumClass, value), defaultValue);
 	}
 
 	/**
@@ -142,7 +144,7 @@ public class EnumUtil {
 				continue;
 			}
 			for (Enum enumObj : enums) {
-				if (ObjectUtil.equal(value, ReflectUtil.getFieldValue(enumObj, field))) {
+				if (ObjUtil.equal(value, ReflectUtil.getFieldValue(enumObj, field))) {
 					return (E) enumObj;
 				}
 			}
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
index 3f8a2dd06..483c7c50f 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
@@ -7,6 +7,7 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.regex.PatternPool;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.regex.ReUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/JAXBUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/JAXBUtil.java
index 3ac2459f1..36d86f5b7 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/JAXBUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/JAXBUtil.java
@@ -3,6 +3,7 @@ package cn.hutool.core.util;
 import cn.hutool.core.exceptions.UtilException;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.text.StrUtil;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
@@ -21,8 +22,8 @@ import java.nio.charset.Charset;
  * 
    
  * 相关介绍：
  * 
    
  *
  * @author dazer
@@ -44,7 +45,7 @@ public class JAXBUtil {
 	 * @see XmlTransient JAXB "有两个名为 "**" 的属性,类的两个属性具有相同名称 "**""解决方案
 	 */
 	public static String beanToXml(Object bean) {
-		return beanToXml(bean, CharsetUtil.CHARSET_UTF_8, true);
+		return beanToXml(bean, CharsetUtil.UTF_8, true);
 	}
 
 	/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/JNDIUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/JNDIUtil.java
index c6c242e5d..dee8024c3 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/JNDIUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/JNDIUtil.java
@@ -17,7 +17,7 @@ import java.util.Map;
  * 它是为JAVA应用程序提供命名和目录访问服务的API（Application Programing Interface，应用程序编程接口）。
  *
  * 
    
- * 见：https://blog.csdn.net/u010430304/article/details/54601302
+ * 见：https://blog.csdn.net/u010430304/article/details/54601302
  * 
    
  *
  * @author loolY
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java
index 3deccb27a..aef8a3543 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java
@@ -3,6 +3,7 @@ package cn.hutool.core.util;
 import cn.hutool.core.exceptions.UtilException;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.math.Calculator;
+import cn.hutool.core.text.StrUtil;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ObjectUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ObjUtil.java
similarity index 97%
rename from hutool-core/src/main/java/cn/hutool/core/util/ObjectUtil.java
rename to hutool-core/src/main/java/cn/hutool/core/util/ObjUtil.java
index 8fe082b43..14d67e3d2 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/ObjectUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ObjUtil.java
@@ -4,7 +4,9 @@ import cn.hutool.core.collection.IterUtil;
 import cn.hutool.core.comparator.CompareUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.exceptions.UtilException;
+import cn.hutool.core.reflect.ReflectUtil;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.lang.reflect.Array;
 import java.math.BigDecimal;
@@ -20,7 +22,7 @@ import java.util.function.Supplier;
  *
  * @author Looly
  */
-public class ObjectUtil {
+public class ObjUtil {
 
 	/**
 	 * 比较两个对象是否相等，此方法是 {@link #equal(Object, Object)}的别名方法。
    
@@ -607,7 +609,7 @@ public class ObjectUtil {
 	}
 
 	/**
-	 * 存在多少个{@code null}或空对象，通过{@link ObjectUtil#isEmpty(Object)} 判断元素
+	 * 存在多少个{@code null}或空对象，通过{@link ObjUtil#isEmpty(Object)} 判断元素
 	 *
 	 * @param objs 被检查的对象,一个或者多个
 	 * @return 存在{@code null}的数量
@@ -617,7 +619,7 @@ public class ObjectUtil {
 	}
 
 	/**
-	 * 是否存在{@code null}对象，通过{@link ObjectUtil#isNull(Object)} 判断元素
+	 * 是否存在{@code null}对象，通过{@link ObjUtil#isNull(Object)} 判断元素
 	 *
 	 * @param objs 被检查对象
 	 * @return 是否存在
@@ -629,7 +631,7 @@ public class ObjectUtil {
 	}
 
 	/**
-	 * 是否存在{@code null}或空对象，通过{@link ObjectUtil#isEmpty(Object)} 判断元素
+	 * 是否存在{@code null}或空对象，通过{@link ObjUtil#isEmpty(Object)} 判断元素
 	 *
 	 * @param objs 被检查对象
 	 * @return 是否存在
@@ -640,7 +642,7 @@ public class ObjectUtil {
 	}
 
 	/**
-	 * 是否全都为{@code null}或空对象，通过{@link ObjectUtil#isEmpty(Object)} 判断元素
+	 * 是否全都为{@code null}或空对象，通过{@link ObjUtil#isEmpty(Object)} 判断元素
 	 *
 	 * @param objs 被检查的对象,一个或者多个
 	 * @return 是否都为空
@@ -650,7 +652,7 @@ public class ObjectUtil {
 	}
 
 	/**
-	 * 是否全都不为{@code null}或空对象，通过{@link ObjectUtil#isEmpty(Object)} 判断元素
+	 * 是否全都不为{@code null}或空对象，通过{@link ObjUtil#isEmpty(Object)} 判断元素
 	 *
 	 * @param objs 被检查的对象,一个或者多个
 	 * @return 是否都不为空
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java
index df72211c9..afdca4da7 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java
@@ -3,6 +3,7 @@ package cn.hutool.core.util;
 import cn.hutool.core.regex.PatternPool;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.regex.ReUtil;
+import cn.hutool.core.text.StrUtil;
 
 
 /**
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/PrimitiveArrayUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/PrimitiveArrayUtil.java
index fd9392ce1..448cbf6e7 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/PrimitiveArrayUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/PrimitiveArrayUtil.java
@@ -991,7 +991,7 @@ public class PrimitiveArrayUtil {
 
 		final int[] array = new int[length];
 		for (int i = 0; i < length; i++) {
-			array[i] = ObjectUtil.defaultIfNull(values[i], 0);
+			array[i] = ObjUtil.defaultIfNull(values[i], 0);
 		}
 		return array;
 	}
@@ -1035,7 +1035,7 @@ public class PrimitiveArrayUtil {
 
 		final long[] array = new long[length];
 		for (int i = 0; i < length; i++) {
-			array[i] = ObjectUtil.defaultIfNull(values[i], 0L);
+			array[i] = ObjUtil.defaultIfNull(values[i], 0L);
 		}
 		return array;
 	}
@@ -1079,7 +1079,7 @@ public class PrimitiveArrayUtil {
 
 		char[] array = new char[length];
 		for (int i = 0; i < length; i++) {
-			array[i] = ObjectUtil.defaultIfNull(values[i], Character.MIN_VALUE);
+			array[i] = ObjUtil.defaultIfNull(values[i], Character.MIN_VALUE);
 		}
 		return array;
 	}
@@ -1123,7 +1123,7 @@ public class PrimitiveArrayUtil {
 
 		final byte[] array = new byte[length];
 		for (int i = 0; i < length; i++) {
-			array[i] = ObjectUtil.defaultIfNull(values[i], (byte) 0);
+			array[i] = ObjUtil.defaultIfNull(values[i], (byte) 0);
 		}
 		return array;
 	}
@@ -1167,7 +1167,7 @@ public class PrimitiveArrayUtil {
 
 		final short[] array = new short[length];
 		for (int i = 0; i < length; i++) {
-			array[i] = ObjectUtil.defaultIfNull(values[i], (short) 0);
+			array[i] = ObjUtil.defaultIfNull(values[i], (short) 0);
 		}
 		return array;
 	}
@@ -1211,7 +1211,7 @@ public class PrimitiveArrayUtil {
 
 		final float[] array = new float[length];
 		for (int i = 0; i < length; i++) {
-			array[i] = ObjectUtil.defaultIfNull(values[i], 0F);
+			array[i] = ObjUtil.defaultIfNull(values[i], 0F);
 		}
 		return array;
 	}
@@ -1255,7 +1255,7 @@ public class PrimitiveArrayUtil {
 
 		final double[] array = new double[length];
 		for (int i = 0; i < length; i++) {
-			array[i] = ObjectUtil.defaultIfNull(values[i], 0D);
+			array[i] = ObjUtil.defaultIfNull(values[i], 0D);
 		}
 		return array;
 	}
@@ -1299,7 +1299,7 @@ public class PrimitiveArrayUtil {
 
 		final boolean[] array = new boolean[length];
 		for (int i = 0; i < length; i++) {
-			array[i] = ObjectUtil.defaultIfNull(values[i], false);
+			array[i] = ObjUtil.defaultIfNull(values[i], false);
 		}
 		return array;
 	}
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java
index e3a4f40ea..221c0fc4a 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java
@@ -8,6 +8,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.exceptions.UtilException;
 import cn.hutool.core.lang.WeightRandom;
 import cn.hutool.core.lang.WeightRandom.WeightObj;
+import cn.hutool.core.text.StrUtil;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java
index 3b95b6cd9..5640186d6 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java
@@ -5,6 +5,7 @@ import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.id.Pid;
 import cn.hutool.core.text.StrBuilder;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ScriptUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ScriptUtil.java
index 982b2be12..7beca564f 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/ScriptUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ScriptUtil.java
@@ -2,6 +2,7 @@ package cn.hutool.core.util;
 
 import cn.hutool.core.exceptions.UtilException;
 import cn.hutool.core.map.WeakConcurrentMap;
+import cn.hutool.core.text.StrUtil;
 
 import javax.script.Bindings;
 import javax.script.Compilable;
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ServiceLoaderUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ServiceLoaderUtil.java
index d04807d5f..97ff97f3a 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/ServiceLoaderUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ServiceLoaderUtil.java
@@ -76,7 +76,7 @@ public class ServiceLoaderUtil {
 	 * @return 服务接口实现列表
 	 */
 	public static  ServiceLoader load(Class clazz, ClassLoader loader) {
-		return ServiceLoader.load(clazz, ObjectUtil.defaultIfNull(loader, ClassLoaderUtil::getClassLoader));
+		return ServiceLoader.load(clazz, ObjUtil.defaultIfNull(loader, ClassLoaderUtil::getClassLoader));
 	}
 
 	/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/SystemPropsUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/SystemPropsUtil.java
index 83d9d1cf7..c02a31452 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/SystemPropsUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/SystemPropsUtil.java
@@ -2,6 +2,7 @@ package cn.hutool.core.util;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Console;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.Properties;
 
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java
index dbd21f9b0..cf46f802e 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java
@@ -1,7 +1,8 @@
 package cn.hutool.core.util;
 
-import cn.hutool.core.lang.reflect.ParameterizedTypeImpl;
-import cn.hutool.core.lang.reflect.ActualTypeMapperPool;
+import cn.hutool.core.reflect.ParameterizedTypeImpl;
+import cn.hutool.core.reflect.ActualTypeMapperPool;
+import cn.hutool.core.reflect.ReflectUtil;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -337,7 +338,7 @@ public class TypeUtil {
 		if (null == field) {
 			return null;
 		}
-		return getActualType(ObjectUtil.defaultIfNull(type, field.getDeclaringClass()), field.getGenericType());
+		return getActualType(ObjUtil.defaultIfNull(type, field.getDeclaringClass()), field.getGenericType());
 	}
 
 	/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java
index d0dbe0221..60bbf1e26 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java
@@ -9,6 +9,7 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.map.BiMap;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.core.text.escape.EscapeUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -412,7 +413,7 @@ public class XmlUtil {
 	 * @since 5.4.5
 	 */
 	public static String toStr(Node doc, boolean isPretty) {
-		return toStr(doc, CharsetUtil.UTF_8, isPretty);
+		return toStr(doc, CharsetUtil.NAME_UTF_8, isPretty);
 	}
 
 	/**
@@ -522,7 +523,7 @@ public class XmlUtil {
 			charsetName = doc.getXmlEncoding();
 		}
 		if (StrUtil.isBlank(charsetName)) {
-			charsetName = CharsetUtil.UTF_8;
+			charsetName = CharsetUtil.NAME_UTF_8;
 		}
 
 		BufferedWriter writer = null;
@@ -1140,7 +1141,7 @@ public class XmlUtil {
 	 * @since 5.1.2
 	 */
 	public static String mapToXmlStr(Map data, boolean omitXmlDeclaration) {
-		return toStr(mapToXml(data, "xml"), CharsetUtil.UTF_8, false, omitXmlDeclaration);
+		return toStr(mapToXml(data, "xml"), CharsetUtil.NAME_UTF_8, false, omitXmlDeclaration);
 	}
 
 	/**
@@ -1182,7 +1183,7 @@ public class XmlUtil {
 	 * @since 5.1.2
 	 */
 	public static String mapToXmlStr(Map data, String rootName, String namespace, boolean omitXmlDeclaration) {
-		return toStr(mapToXml(data, rootName, namespace), CharsetUtil.UTF_8, false, omitXmlDeclaration);
+		return toStr(mapToXml(data, rootName, namespace), CharsetUtil.NAME_UTF_8, false, omitXmlDeclaration);
 	}
 
 	/**
@@ -1198,7 +1199,7 @@ public class XmlUtil {
 	 * @since 5.1.2
 	 */
 	public static String mapToXmlStr(Map data, String rootName, String namespace, boolean isPretty, boolean omitXmlDeclaration) {
-		return toStr(mapToXml(data, rootName, namespace), CharsetUtil.UTF_8, isPretty, omitXmlDeclaration);
+		return toStr(mapToXml(data, rootName, namespace), CharsetUtil.NAME_UTF_8, isPretty, omitXmlDeclaration);
 	}
 
 	/**
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java
index 89de82f85..484ab5377 100755
--- a/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java
@@ -9,8 +9,8 @@ import cn.hutool.core.map.MapBuilder;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.text.StrUtil;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -330,7 +330,7 @@ public class BeanUtilTest {
 
 		for (int i=0;i<5000;i++){
 			new Thread(()->{
-				List list = ObjectUtil.clone(studentList);
+				List list = ObjUtil.clone(studentList);
 				List listReps = list.stream().map(s1 -> {
 					Student s2 = new Student();
 					BeanUtil.copyProperties(s1, s2);
diff --git a/hutool-core/src/test/java/cn/hutool/core/builder/GenericBuilderTest.java b/hutool-core/src/test/java/cn/hutool/core/builder/GenericBuilderTest.java
index e74a985ac..3297bd469 100644
--- a/hutool-core/src/test/java/cn/hutool/core/builder/GenericBuilderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/builder/GenericBuilderTest.java
@@ -1,6 +1,6 @@
 package cn.hutool.core.builder;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/Base32Test.java b/hutool-core/src/test/java/cn/hutool/core/codec/Base32Test.java
index 5d74654bf..6e239f6c0 100644
--- a/hutool-core/src/test/java/cn/hutool/core/codec/Base32Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/Base32Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.codec;
 
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/Base64Test.java b/hutool-core/src/test/java/cn/hutool/core/codec/Base64Test.java
index 02f603591..79f227a43 100644
--- a/hutool-core/src/test/java/cn/hutool/core/codec/Base64Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/Base64Test.java
@@ -2,7 +2,7 @@ package cn.hutool.core.codec;
 
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -54,10 +54,10 @@ public class Base64Test {
 	@Test
 	public void encodeAndDecodeTest2() {
 		String a = "a61a5db5a67c01445ca2-HZ20181120172058/pdf/中国电信影像云单体网关Docker版-V1.2.pdf";
-		String encode = Base64.encode(a, CharsetUtil.UTF_8);
+		String encode = Base64.encode(a, CharsetUtil.NAME_UTF_8);
 		Assert.assertEquals("YTYxYTVkYjVhNjdjMDE0NDVjYTItSFoyMDE4MTEyMDE3MjA1OC9wZGYv5Lit5Zu955S15L+h5b2x5YOP5LqR5Y2V5L2T572R5YWzRG9ja2Vy54mILVYxLjIucGRm", encode);
 
-		String decodeStr = Base64.decodeStr(encode, CharsetUtil.UTF_8);
+		String decodeStr = Base64.decodeStr(encode, CharsetUtil.NAME_UTF_8);
 		Assert.assertEquals(a, decodeStr);
 	}
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
index 9a52bb068..2f7e2f41a 100755
--- a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
@@ -4,7 +4,7 @@ import cn.hutool.core.comparator.ComparableComparator;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.Dict;
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.junit.Assert;
diff --git a/hutool-core/src/test/java/cn/hutool/core/compiler/JavaSourceCompilerTest.java b/hutool-core/src/test/java/cn/hutool/core/compiler/JavaSourceCompilerTest.java
index 607008231..21de095c0 100644
--- a/hutool-core/src/test/java/cn/hutool/core/compiler/JavaSourceCompilerTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/compiler/JavaSourceCompilerTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.compiler;
 
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.core.util.ZipUtil;
+import cn.hutool.core.reflect.ReflectUtil;
+import cn.hutool.core.compress.ZipUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/compress/ZipReaderTest.java b/hutool-core/src/test/java/cn/hutool/core/compress/ZipReaderTest.java
index e1de7097c..9eeb90fd8 100755
--- a/hutool-core/src/test/java/cn/hutool/core/compress/ZipReaderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/compress/ZipReaderTest.java
@@ -1,7 +1,6 @@
 package cn.hutool.core.compress;
 
 import cn.hutool.core.lang.Console;
-import cn.hutool.core.util.ZipUtil;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/compress/ZipWriterTest.java b/hutool-core/src/test/java/cn/hutool/core/compress/ZipWriterTest.java
index c2a2f5bd4..f575483ab 100755
--- a/hutool-core/src/test/java/cn/hutool/core/compress/ZipWriterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/compress/ZipWriterTest.java
@@ -3,7 +3,6 @@ package cn.hutool.core.compress;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.resource.FileResource;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ZipUtil;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -20,7 +19,7 @@ public class ZipWriterTest {
 	@Test
 	@Ignore
 	public void addTest(){
-		final ZipWriter writer = ZipWriter.of(FileUtil.file("d:/test/test.zip"), CharsetUtil.CHARSET_UTF_8);
+		final ZipWriter writer = ZipWriter.of(FileUtil.file("d:/test/test.zip"), CharsetUtil.UTF_8);
 		writer.add(new FileResource("d:/test/qr_c.png"));
 		writer.close();
 	}
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertOtherTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertOtherTest.java
index 9f2ea4bd3..9da7dc2df 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertOtherTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertOtherTest.java
@@ -15,10 +15,10 @@ public class ConvertOtherTest {
 	@Test
 	public void hexTest() {
 		String a = "我是一个小小的可爱的字符串";
-		String hex = Convert.toHex(a, CharsetUtil.CHARSET_UTF_8);
+		String hex = Convert.toHex(a, CharsetUtil.UTF_8);
 		Assert.assertEquals("e68891e698afe4b880e4b8aae5b08fe5b08fe79a84e58fafe788b1e79a84e5ad97e7aca6e4b8b2", hex);
 
-		String raw = Convert.hexToStr(hex, CharsetUtil.CHARSET_UTF_8);
+		String raw = Convert.hexToStr(hex, CharsetUtil.UTF_8);
 		Assert.assertEquals(a, raw);
 	}
 
@@ -45,8 +45,8 @@ public class ConvertOtherTest {
 	public void convertCharsetTest() {
 		String a = "我不是乱码";
 		// 转换后result为乱码
-		String result = Convert.convertCharset(a, CharsetUtil.UTF_8, CharsetUtil.ISO_8859_1);
-		String raw = Convert.convertCharset(result, CharsetUtil.ISO_8859_1, "UTF-8");
+		String result = Convert.convertCharset(a, CharsetUtil.NAME_UTF_8, CharsetUtil.NAME_ISO_8859_1);
+		String raw = Convert.convertCharset(result, CharsetUtil.NAME_ISO_8859_1, "UTF-8");
 		Assert.assertEquals(raw, a);
 	}
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java
index 5f0463c66..de7a7f60b 100755
--- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java
@@ -3,7 +3,7 @@ package cn.hutool.core.convert;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateException;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ByteUtil;
 import cn.hutool.core.codec.HexUtil;
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java
index c7363f3c8..e6b20ccae 100755
--- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.convert;
 
 import cn.hutool.core.bean.BeanUtilTest.SubPerson;
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java
index 50ccdee57..f3cac49ad 100755
--- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.convert;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java b/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java
index bb983173a..c10220e14 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java
@@ -1,6 +1,6 @@
 package cn.hutool.core.date;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/BufferUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/BufferUtilTest.java
index 657e500a5..1dcc3a94e 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/BufferUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/BufferUtilTest.java
@@ -6,11 +6,11 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * BufferUtil单元测试
- * 
+ *
  * @author looly
  *
  */
@@ -49,15 +49,15 @@ public class BufferUtilTest {
 		ByteBuffer buffer = ByteBuffer.wrap(text.getBytes());
 
 		// 第一行
-		String line = BufferUtil.readLine(buffer, CharsetUtil.CHARSET_UTF_8);
+		String line = BufferUtil.readLine(buffer, CharsetUtil.UTF_8);
 		Assert.assertEquals("aa", line);
 
 		// 第二行
-		line = BufferUtil.readLine(buffer, CharsetUtil.CHARSET_UTF_8);
+		line = BufferUtil.readLine(buffer, CharsetUtil.UTF_8);
 		Assert.assertEquals("bbb", line);
 
 		// 第三行因为没有行结束标志，因此返回null
-		line = BufferUtil.readLine(buffer, CharsetUtil.CHARSET_UTF_8);
+		line = BufferUtil.readLine(buffer, CharsetUtil.UTF_8);
 		Assert.assertNull(line);
 
 		// 读取剩余部分
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/CharsetDetectorTest.java b/hutool-core/src/test/java/cn/hutool/core/io/CharsetDetectorTest.java
index 6fcb72d8e..e487e40ed 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/CharsetDetectorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/CharsetDetectorTest.java
@@ -13,7 +13,7 @@ public class CharsetDetectorTest {
 	public void detectTest(){
 		// 测试多个Charset对同一个流的处理是否有问题
 		final Charset detect = CharsetDetector.detect(ResourceUtil.getStream("test.xml"),
-				CharsetUtil.CHARSET_GBK, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals(CharsetUtil.CHARSET_UTF_8, detect);
+				CharsetUtil.GBK, CharsetUtil.UTF_8);
+		Assert.assertEquals(CharsetUtil.UTF_8, detect);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/ClassPathResourceTest.java b/hutool-core/src/test/java/cn/hutool/core/io/ClassPathResourceTest.java
index 64a3a7c3b..f378e80ef 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/ClassPathResourceTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/ClassPathResourceTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.io;
 
 import cn.hutool.core.io.resource.ClassPathResource;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java
index 2571ca59d..4cc3cb475 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java
@@ -138,7 +138,7 @@ public class FileUtilTest {
 	@Test
 	@Ignore
 	public void convertLineSeparatorTest() {
-		FileUtil.convertLineSeparator(FileUtil.file("d:/aaa.txt"), CharsetUtil.CHARSET_UTF_8, LineSeparator.WINDOWS);
+		FileUtil.convertLineSeparator(FileUtil.file("d:/aaa.txt"), CharsetUtil.UTF_8, LineSeparator.WINDOWS);
 	}
 
 	@Test
@@ -466,7 +466,7 @@ public class FileUtilTest {
 	@Ignore
 	public void appendLinesTest(){
 		List list = ListUtil.toList("a", "b", "c");
-		FileUtil.appendLines(list, FileUtil.file("d:/test/appendLines.txt"), CharsetUtil.CHARSET_UTF_8);
+		FileUtil.appendLines(list, FileUtil.file("d:/test/appendLines.txt"), CharsetUtil.UTF_8);
 	}
 
 	@Test
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java b/hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java
index cf5deeced..3ca0a3f43 100755
--- a/hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java
@@ -2,7 +2,7 @@ package cn.hutool.core.io.checksum;
 
 import cn.hutool.core.io.checksum.crc16.CRC16XModem;
 import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/FileSystemUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/file/FileSystemUtilTest.java
index 130b400f8..24fab7338 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/file/FileSystemUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/file/FileSystemUtilTest.java
@@ -17,7 +17,7 @@ public class FileSystemUtilTest {
 	@Ignore
 	public void listTest(){
 		final FileSystem fileSystem = FileSystemUtil.createZip("d:/test/test.zip",
-				CharsetUtil.CHARSET_GBK);
+				CharsetUtil.GBK);
 		final Path root = FileSystemUtil.getRoot(fileSystem);
 		PathUtil.walkFiles(root, new SimpleFileVisitor() {
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/TailerTest.java b/hutool-core/src/test/java/cn/hutool/core/io/file/TailerTest.java
index de2bedd48..0ce13822e 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/file/TailerTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/file/TailerTest.java
@@ -11,7 +11,7 @@ public class TailerTest {
 	@Test
 	@Ignore
 	public void tailTest() {
-		FileUtil.tail(FileUtil.file("d:/test/tail.txt"), CharsetUtil.CHARSET_GBK);
+		FileUtil.tail(FileUtil.file("d:/test/tail.txt"), CharsetUtil.GBK);
 	}
 
 	@Test
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/resource/ResourceUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/resource/ResourceUtilTest.java
index 552a8e40a..1f65dbfb9 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/resource/ResourceUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/resource/ResourceUtilTest.java
@@ -2,7 +2,7 @@ package cn.hutool.core.io.resource;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/RangeTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/RangeTest.java
index b10b115eb..98c4cdac8 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/RangeTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/RangeTest.java
@@ -4,7 +4,7 @@ import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateRange;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/SimhashTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/SimhashTest.java
index 6c6d4fe66..c2179a46f 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/SimhashTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/SimhashTest.java
@@ -4,19 +4,19 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import cn.hutool.core.text.Simhash;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 public class SimhashTest {
-	
+
 	@Test
 	public void simTest() {
 		String text1 = "我是 一个 普通 字符串";
 		String text2 = "我是 一个 普通 字符串";
-		
+
 		Simhash simhash = new Simhash();
 		long hash = simhash.hash(StrUtil.split(text1, ' '));
 		Assert.assertTrue(hash != 0);
-		
+
 		simhash.store(hash);
 		boolean duplicate = simhash.equals(StrUtil.split(text2, ' '));
 		Assert.assertTrue(duplicate);
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java
index f20a3f3b5..e350df6e5 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java
@@ -5,7 +5,7 @@ import cn.hutool.core.exceptions.UtilException;
 import cn.hutool.core.lang.id.Snowflake;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.lang.id.IdUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/hash/CityHashTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/hash/CityHashTest.java
index d253ffa2e..1fa261e44 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/hash/CityHashTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/hash/CityHashTest.java
@@ -1,6 +1,6 @@
 package cn.hutool.core.lang.hash;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/hash/MetroHashTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/hash/MetroHashTest.java
index 1d75bbe2c..a1ab48948 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/hash/MetroHashTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/hash/MetroHashTest.java
@@ -4,7 +4,7 @@ package cn.hutool.core.lang.hash;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.codec.HexUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -21,14 +21,14 @@ public class MetroHashTest {
 
 	@Test
 	public void metroHash64Test() {
-		byte[] str = "我是一段测试123".getBytes(CharsetUtil.CHARSET_UTF_8);
+		byte[] str = "我是一段测试123".getBytes(CharsetUtil.UTF_8);
 		final long hash64 = MetroHash.hash64(str);
 		Assert.assertEquals(62920234463891865L, hash64);
 	}
 
 	@Test
 	public void metroHash128Test() {
-		byte[] str = "我是一段测试123".getBytes(CharsetUtil.CHARSET_UTF_8);
+		byte[] str = "我是一段测试123".getBytes(CharsetUtil.UTF_8);
 		final long[] hash128 = MetroHash.hash128(str).getLongArray();
 		Assert.assertEquals(4956592424592439349L, hash128[0]);
 		Assert.assertEquals(6301214698325086246L, hash128[1]);
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/hash/MurMurHashTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/hash/MurMurHashTest.java
index fcf946b5e..070a95e92 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/hash/MurMurHashTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/hash/MurMurHashTest.java
@@ -1,6 +1,6 @@
 package cn.hutool.core.lang.hash;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/reflect/ActualTypeMapperPoolTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/reflect/ActualTypeMapperPoolTest.java
index 8ccd2087f..df6617f7e 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/reflect/ActualTypeMapperPoolTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/reflect/ActualTypeMapperPoolTest.java
@@ -1,5 +1,6 @@
 package cn.hutool.core.lang.reflect;
 
+import cn.hutool.core.reflect.ActualTypeMapperPool;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/reflect/MethodHandleUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/reflect/MethodHandleUtilTest.java
index 3eb2120ae..d68cfc6c7 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/reflect/MethodHandleUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/reflect/MethodHandleUtilTest.java
@@ -1,7 +1,8 @@
 package cn.hutool.core.lang.reflect;
 
+import cn.hutool.core.reflect.MethodHandleUtil;
+import cn.hutool.core.reflect.ReflectUtil;
 import cn.hutool.core.util.ClassLoaderUtil;
-import cn.hutool.core.util.ReflectUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java
index 876e31446..cee1bf642 100644
--- a/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java
@@ -2,7 +2,7 @@ package cn.hutool.core.map;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Opt;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import lombok.Builder;
 import lombok.Data;
 import org.junit.Assert;
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/TolerantMapTest.java b/hutool-core/src/test/java/cn/hutool/core/map/TolerantMapTest.java
index b6ed7cbe2..6facc3904 100644
--- a/hutool-core/src/test/java/cn/hutool/core/map/TolerantMapTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/TolerantMapTest.java
@@ -1,6 +1,6 @@
 package cn.hutool.core.map;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.RandomUtil;
 import org.junit.Before;
 import org.junit.Test;
@@ -19,15 +19,15 @@ public class TolerantMapTest {
 
 	@Test
 	public void testSerialize() {
-		byte[] bytes = ObjectUtil.serialize(map);
-		TolerantMap serializedMap = ObjectUtil.deserialize(bytes);
+		byte[] bytes = ObjUtil.serialize(map);
+		TolerantMap serializedMap = ObjUtil.deserialize(bytes);
 		assert serializedMap != map;
 		assert map.equals(serializedMap);
 	}
 
 	@Test
 	public void testClone() {
-		TolerantMap clonedMap = ObjectUtil.clone(map);
+		TolerantMap clonedMap = ObjUtil.clone(map);
 		assert clonedMap != map;
 		assert map.equals(clonedMap);
 	}
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/WeakConcurrentMapTest.java b/hutool-core/src/test/java/cn/hutool/core/map/WeakConcurrentMapTest.java
index 7824d1918..bdf35b7cb 100755
--- a/hutool-core/src/test/java/cn/hutool/core/map/WeakConcurrentMapTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/WeakConcurrentMapTest.java
@@ -2,7 +2,7 @@ package cn.hutool.core.map;
 
 import cn.hutool.core.thread.ConcurrencyTester;
 import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.RandomUtil;
 import org.junit.Assert;
 import org.junit.Test;
@@ -46,7 +46,7 @@ public class WeakConcurrentMapTest {
 		tester.test(()-> cache.computeIfAbsent("aaa" + RandomUtil.randomInt(2), (key)-> "aaaValue"));
 
 		Assert.assertTrue(tester.getInterval() > 0);
-		String value = ObjectUtil.defaultIfNull(cache.get("aaa0"), cache.get("aaa1"));
+		String value = ObjUtil.defaultIfNull(cache.get("aaa0"), cache.get("aaa1"));
 		Assert.assertEquals("aaaValue", value);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/net/FormUrlencodedTest.java b/hutool-core/src/test/java/cn/hutool/core/net/FormUrlencodedTest.java
index 8006dbf9c..c44bd0397 100644
--- a/hutool-core/src/test/java/cn/hutool/core/net/FormUrlencodedTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/net/FormUrlencodedTest.java
@@ -8,10 +8,10 @@ public class FormUrlencodedTest {
 
 	@Test
 	public void encodeParamTest(){
-		String encode = FormUrlencoded.ALL.encode("a+b", CharsetUtil.CHARSET_UTF_8);
+		String encode = FormUrlencoded.ALL.encode("a+b", CharsetUtil.UTF_8);
 		Assert.assertEquals("a%2Bb", encode);
 
-		encode = FormUrlencoded.ALL.encode("a b", CharsetUtil.CHARSET_UTF_8);
+		encode = FormUrlencoded.ALL.encode("a b", CharsetUtil.UTF_8);
 		Assert.assertEquals("a+b", encode);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/net/RFC3986Test.java b/hutool-core/src/test/java/cn/hutool/core/net/RFC3986Test.java
index 781b78001..57d9ee16b 100644
--- a/hutool-core/src/test/java/cn/hutool/core/net/RFC3986Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/net/RFC3986Test.java
@@ -8,22 +8,22 @@ public class RFC3986Test {
 
 	@Test
 	public void encodeQueryTest(){
-		String encode = RFC3986.QUERY_PARAM_VALUE.encode("a=b", CharsetUtil.CHARSET_UTF_8);
+		String encode = RFC3986.QUERY_PARAM_VALUE.encode("a=b", CharsetUtil.UTF_8);
 		Assert.assertEquals("a=b", encode);
 
-		encode = RFC3986.QUERY_PARAM_VALUE.encode("a+1=b", CharsetUtil.CHARSET_UTF_8);
+		encode = RFC3986.QUERY_PARAM_VALUE.encode("a+1=b", CharsetUtil.UTF_8);
 		Assert.assertEquals("a+1=b", encode);
 	}
 
 	@Test
 	public void encodeQueryPercentTest(){
-		String encode = RFC3986.QUERY_PARAM_VALUE.encode("a=%b", CharsetUtil.CHARSET_UTF_8);
+		String encode = RFC3986.QUERY_PARAM_VALUE.encode("a=%b", CharsetUtil.UTF_8);
 		Assert.assertEquals("a=%25b", encode);
 	}
 
 	@Test
 	public void encodeQueryWithSafeTest(){
-		String encode = RFC3986.QUERY_PARAM_VALUE.encode("a=%25", CharsetUtil.CHARSET_UTF_8, '%');
+		String encode = RFC3986.QUERY_PARAM_VALUE.encode("a=%25", CharsetUtil.UTF_8, '%');
 		Assert.assertEquals("a=%25", encode);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/net/URLEncoderTest.java b/hutool-core/src/test/java/cn/hutool/core/net/URLEncoderTest.java
new file mode 100644
index 000000000..75ca99522
--- /dev/null
+++ b/hutool-core/src/test/java/cn/hutool/core/net/URLEncoderTest.java
@@ -0,0 +1,24 @@
+package cn.hutool.core.net;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class URLEncoderTest {
+	@Test
+	public void encodeTest() {
+		String body = "366466 - 副本.jpg";
+		String encode = URLEncoder.encodeAll(body);
+		Assert.assertEquals("366466%20-%20%E5%89%AF%E6%9C%AC.jpg", encode);
+		Assert.assertEquals(body, URLDecoder.decode(encode));
+
+		String encode2 = URLEncoder.encodeQuery(body);
+		Assert.assertEquals("366466%20-%20%E5%89%AF%E6%9C%AC.jpg", encode2);
+	}
+
+	@Test
+	public void encodeQueryPlusTest() {
+		String body = "+";
+		String encode2 = URLEncoder.encodeQuery(body);
+		Assert.assertEquals("+", encode2);
+	}
+}
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/URLUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/net/URLUtilTest.java
similarity index 81%
rename from hutool-core/src/test/java/cn/hutool/core/util/URLUtilTest.java
rename to hutool-core/src/test/java/cn/hutool/core/net/URLUtilTest.java
index b8a997e32..1129d9ed7 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/URLUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/net/URLUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.util;
+package cn.hutool.core.net;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -75,24 +75,6 @@ public class URLUtilTest {
 		Assert.assertEquals("https://www.hutool.cn", host.toString());
 	}
 
-	@Test
-	public void encodeTest() {
-		String body = "366466 - 副本.jpg";
-		String encode = URLUtil.encode(body);
-		Assert.assertEquals("366466%20-%20%E5%89%AF%E6%9C%AC.jpg", encode);
-		Assert.assertEquals(body, URLUtil.decode(encode));
-
-		String encode2 = URLUtil.encodeQuery(body);
-		Assert.assertEquals("366466%20-%20%E5%89%AF%E6%9C%AC.jpg", encode2);
-	}
-
-	@Test
-	public void encodeQueryPlusTest() {
-		String body = "+";
-		String encode2 = URLUtil.encodeQuery(body);
-		Assert.assertEquals("+", encode2);
-	}
-
 	@Test
 	public void getPathTest(){
 		String url = " http://www.aaa.bbb/search?scope=ccc&q=ddd";
diff --git a/hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java b/hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java
index 7d54c4503..e1da7ae2d 100644
--- a/hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java
@@ -23,7 +23,7 @@ public class UrlBuilderTest {
 	@Test
 	public void buildTest2() {
 		// path中的+不做处理
-		String buildUrl = UrlBuilder.ofHttp("http://www.hutool.cn/+8618888888888", CharsetUtil.CHARSET_UTF_8).build();
+		String buildUrl = UrlBuilder.ofHttp("http://www.hutool.cn/+8618888888888", CharsetUtil.UTF_8).build();
 		Assert.assertEquals("http://www.hutool.cn/+8618888888888", buildUrl);
 	}
 
@@ -126,7 +126,7 @@ public class UrlBuilderTest {
 
 	@Test
 	public void ofTest() {
-		final UrlBuilder builder = UrlBuilder.of("http://www.hutool.cn/aaa/bbb/?a=1&b=2#frag1", CharsetUtil.CHARSET_UTF_8);
+		final UrlBuilder builder = UrlBuilder.of("http://www.hutool.cn/aaa/bbb/?a=1&b=2#frag1", CharsetUtil.UTF_8);
 		Assert.assertEquals("http", builder.getScheme());
 		Assert.assertEquals("www.hutool.cn", builder.getHost());
 
@@ -141,14 +141,14 @@ public class UrlBuilderTest {
 
 	@Test
 	public void ofNullQueryTest() {
-		final UrlBuilder builder = UrlBuilder.of("http://www.hutool.cn/aaa/bbb", CharsetUtil.CHARSET_UTF_8);
+		final UrlBuilder builder = UrlBuilder.of("http://www.hutool.cn/aaa/bbb", CharsetUtil.UTF_8);
 		Assert.assertNotNull(builder.getQuery());
 		Assert.assertNull(builder.getQuery().get("a"));
 	}
 
 	@Test
 	public void ofWithChineseTest() {
-		final UrlBuilder builder = UrlBuilder.ofHttp("www.hutool.cn/aaa/bbb/?a=张三&b=%e6%9d%8e%e5%9b%9b#frag1", CharsetUtil.CHARSET_UTF_8);
+		final UrlBuilder builder = UrlBuilder.ofHttp("www.hutool.cn/aaa/bbb/?a=张三&b=%e6%9d%8e%e5%9b%9b#frag1", CharsetUtil.UTF_8);
 		Assert.assertEquals("http", builder.getScheme());
 		Assert.assertEquals("www.hutool.cn", builder.getHost());
 
@@ -163,7 +163,7 @@ public class UrlBuilderTest {
 
 	@Test
 	public void ofWithBlankTest() {
-		final UrlBuilder builder = UrlBuilder.ofHttp(" www.hutool.cn/aaa/bbb/?a=张三&b=%e6%9d%8e%e5%9b%9b#frag1", CharsetUtil.CHARSET_UTF_8);
+		final UrlBuilder builder = UrlBuilder.ofHttp(" www.hutool.cn/aaa/bbb/?a=张三&b=%e6%9d%8e%e5%9b%9b#frag1", CharsetUtil.UTF_8);
 		Assert.assertEquals("http", builder.getScheme());
 		Assert.assertEquals("www.hutool.cn", builder.getHost());
 
@@ -179,7 +179,7 @@ public class UrlBuilderTest {
 	@Test
 	public void ofSpecialTest() {
 		//测试不规范的或者无需解码的字符串是否成功解码
-		final UrlBuilder builder = UrlBuilder.ofHttp(" www.hutool.cn/aaa/bbb/?a=张三&b=%%e5%9b%9b#frag1", CharsetUtil.CHARSET_UTF_8);
+		final UrlBuilder builder = UrlBuilder.ofHttp(" www.hutool.cn/aaa/bbb/?a=张三&b=%%e5%9b%9b#frag1", CharsetUtil.UTF_8);
 		Assert.assertEquals("http", builder.getScheme());
 		Assert.assertEquals("www.hutool.cn", builder.getHost());
 
@@ -200,7 +200,7 @@ public class UrlBuilderTest {
 				"&idx=1" +
 				"&sn=1044c0d19723f74f04f4c1da34eefa35" +
 				"&chksm=6cbda3a25bca2ab4516410db6ce6e125badaac2f8c5548ea6e18eab6dc3c5422cb8cbe1095f7";
-		final UrlBuilder builder = UrlBuilder.ofHttp(urlStr, CharsetUtil.CHARSET_UTF_8);
+		final UrlBuilder builder = UrlBuilder.ofHttp(urlStr, CharsetUtil.UTF_8);
 		// 原URL中的&替换为&
 		Assert.assertEquals("https://mp.weixin.qq.com/s?" +
 				"__biz=MzI5NjkyNTIxMg==" +
@@ -215,26 +215,26 @@ public class UrlBuilderTest {
 		// 原URL中以/结尾，则这个规则需保留，issue#I1G44J@Gitee
 		final String today = DateUtil.date().toString("yyyyMMdd");
 		final String getWorkDayUrl = "https://tool.bitefu.net/jiari/?info=1&d=" + today;
-		final UrlBuilder builder = UrlBuilder.ofHttp(getWorkDayUrl, CharsetUtil.CHARSET_UTF_8);
+		final UrlBuilder builder = UrlBuilder.ofHttp(getWorkDayUrl, CharsetUtil.UTF_8);
 		Assert.assertEquals(getWorkDayUrl, builder.toString());
 	}
 
 	@Test
 	public void blankEncodeTest(){
-		final UrlBuilder urlBuilder = UrlBuilder.ofHttp("http://a.com/aaa bbb.html", CharsetUtil.CHARSET_UTF_8);
+		final UrlBuilder urlBuilder = UrlBuilder.ofHttp("http://a.com/aaa bbb.html", CharsetUtil.UTF_8);
 		Assert.assertEquals("http://a.com/aaa%20bbb.html", urlBuilder.toString());
 	}
 
 	@Test
 	public void dotEncodeTest(){
-		final UrlBuilder urlBuilder = UrlBuilder.ofHttp("http://xtbgyy.digitalgd.com.cn/ebus/../../..", CharsetUtil.CHARSET_UTF_8);
+		final UrlBuilder urlBuilder = UrlBuilder.ofHttp("http://xtbgyy.digitalgd.com.cn/ebus/../../..", CharsetUtil.UTF_8);
 		Assert.assertEquals("http://xtbgyy.digitalgd.com.cn/ebus/../../..", urlBuilder.toString());
 	}
 
 	@Test
 	public void multiSlashTest(){
 		//issue#I25MZL，某些URL中有多个斜杠，此为合法路径
-		final UrlBuilder urlBuilder = UrlBuilder.ofHttp("https://hutool.cn//file/test.jpg", CharsetUtil.CHARSET_UTF_8);
+		final UrlBuilder urlBuilder = UrlBuilder.ofHttp("https://hutool.cn//file/test.jpg", CharsetUtil.UTF_8);
 		Assert.assertEquals("https://hutool.cn//file/test.jpg", urlBuilder.toString());
 	}
 
@@ -256,7 +256,7 @@ public class UrlBuilderTest {
 	public void encodePathTest(){
 		// Path中的某些符号无需转义，比如=
 		final String urlStr = "http://hq.sinajs.cn/list=sh600519";
-		final UrlBuilder urlBuilder = UrlBuilder.ofHttp(urlStr, CharsetUtil.CHARSET_UTF_8);
+		final UrlBuilder urlBuilder = UrlBuilder.ofHttp(urlStr, CharsetUtil.UTF_8);
 		Assert.assertEquals(urlStr, urlBuilder.toString());
 	}
 
@@ -265,7 +265,7 @@ public class UrlBuilderTest {
 		// https://gitee.com/dromara/hutool/issues/I4RA42
 		// Path中`:`在第一个segment需要转义，之后的不需要
 		final String urlStr = "https://hutool.cn/aa/bb/Pre-K,Kindergarten,First,Second,Third,Fourth,Fifth/Page:3";
-		final UrlBuilder urlBuilder = UrlBuilder.ofHttp(urlStr, CharsetUtil.CHARSET_UTF_8);
+		final UrlBuilder urlBuilder = UrlBuilder.ofHttp(urlStr, CharsetUtil.UTF_8);
 		Assert.assertEquals(urlStr, urlBuilder.toString());
 	}
 
@@ -423,7 +423,7 @@ public class UrlBuilderTest {
 		// https://github.com/dromara/hutool/issues/2243
 		// 如果用户已经做了%编码，不应该重复编码
 		String url = "https://hutool.cn/v1.0?privateNum=%2B8616512884988";
-		final String s = UrlBuilder.of(url, null).setCharset(CharsetUtil.CHARSET_UTF_8).toString();
+		final String s = UrlBuilder.of(url, null).setCharset(CharsetUtil.UTF_8).toString();
 		Assert.assertEquals(url, s);
 	}
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/net/UrlDecoderTest.java b/hutool-core/src/test/java/cn/hutool/core/net/UrlDecoderTest.java
index 906b5784a..12cac566b 100644
--- a/hutool-core/src/test/java/cn/hutool/core/net/UrlDecoderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/net/UrlDecoderTest.java
@@ -7,6 +7,6 @@ import org.junit.Test;
 public class UrlDecoderTest {
 	@Test
 	public void decodeForPathTest(){
-		Assert.assertEquals("+", URLDecoder.decodeForPath("+", CharsetUtil.CHARSET_UTF_8));
+		Assert.assertEquals("+", URLDecoder.decodeForPath("+", CharsetUtil.UTF_8));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/net/UrlQueryTest.java b/hutool-core/src/test/java/cn/hutool/core/net/UrlQueryTest.java
index c50b3c11b..53da6e8ac 100644
--- a/hutool-core/src/test/java/cn/hutool/core/net/UrlQueryTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/net/UrlQueryTest.java
@@ -4,7 +4,6 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.net.url.UrlQuery;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.URLUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -54,7 +53,7 @@ public class UrlQueryTest {
 	public void parseTest4(){
 		// https://github.com/dromara/hutool/issues/1989
 		String queryStr = "imageMogr2/thumbnail/x800/format/jpg";
-		final UrlQuery query = UrlQuery.of(queryStr, CharsetUtil.CHARSET_UTF_8);
+		final UrlQuery query = UrlQuery.of(queryStr, CharsetUtil.UTF_8);
 		Assert.assertEquals(queryStr, query.toString());
 	}
 
@@ -112,22 +111,22 @@ public class UrlQueryTest {
 	@Test
 	public void plusTest(){
 		// 根据RFC3986，在URL中，+是安全字符，即此符号不转义
-		final String a = UrlQuery.of(MapUtil.of("a+b", "1+2")).build(CharsetUtil.CHARSET_UTF_8);
+		final String a = UrlQuery.of(MapUtil.of("a+b", "1+2")).build(CharsetUtil.UTF_8);
 		Assert.assertEquals("a+b=1+2", a);
 	}
 
 	@Test
 	public void parsePlusTest(){
 		// 根据RFC3986，在URL中，+是安全字符，即此符号不转义
-		final String a = UrlQuery.of("a+b=1+2", CharsetUtil.CHARSET_UTF_8)
-				.build(CharsetUtil.CHARSET_UTF_8);
+		final String a = UrlQuery.of("a+b=1+2", CharsetUtil.UTF_8)
+				.build(CharsetUtil.UTF_8);
 		Assert.assertEquals("a+b=1+2", a);
 	}
 
 	@Test
 	public void spaceTest(){
 		// 根据RFC3986，在URL中，空格编码为"%20"
-		final String a = UrlQuery.of(MapUtil.of("a ", " ")).build(CharsetUtil.CHARSET_UTF_8);
+		final String a = UrlQuery.of(MapUtil.of("a ", " ")).build(CharsetUtil.UTF_8);
 		Assert.assertEquals("a%20=%20", a);
 	}
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
index 2672c628b..b1b8a3306 100755
--- a/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
@@ -92,10 +92,10 @@ public class CharSequenceUtilTest {
 		String s = "华硕K42Intel酷睿i31代2G以下独立显卡不含机械硬盘固态硬盘120GB-192GB4GB-6GB";
 
 		String v = CharSequenceUtil.subPreGbk(s, 40, false);
-		Assert.assertEquals(39, v.getBytes(CharsetUtil.CHARSET_GBK).length);
+		Assert.assertEquals(39, v.getBytes(CharsetUtil.GBK).length);
 
 		v = CharSequenceUtil.subPreGbk(s, 40, true);
-		Assert.assertEquals(41, v.getBytes(CharsetUtil.CHARSET_GBK).length);
+		Assert.assertEquals(41, v.getBytes(CharsetUtil.GBK).length);
 	}
 
 	@Test
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ClassUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ClassUtilTest.java
index 89c0c33cc..e6fb1dbc6 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/ClassUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ClassUtilTest.java
@@ -9,12 +9,12 @@ import java.util.Objects;
 
 /**
  * {@link ClassUtil} 单元测试
- * 
+ *
  * @author Looly
  *
  */
 public class ClassUtilTest {
-	
+
 	@Test
 	public void getClassNameTest() {
 		String className = ClassUtil.getClassName(ClassUtil.class, false);
@@ -39,7 +39,7 @@ public class ClassUtilTest {
 	@SuppressWarnings({"unused", "InnerClassMayBeStatic"})
 	class TestSubClass extends TestClass {
 		private String subField;
-		
+
 		private void privateSubMethod() {
 		}
 
@@ -90,16 +90,16 @@ public class ClassUtilTest {
 		Field subField = ClassUtil.getDeclaredField(TestSubClass.class, "subField");
 		Assert.assertNotNull(subField);
 	}
-	
+
 	@Test
 	public void getClassPathTest() {
 		String classPath = ClassUtil.getClassPath();
 		Assert.assertNotNull(classPath);
 	}
-	
+
 	@Test
 	public void getShortClassNameTest() {
-		String className = "cn.hutool.core.util.StrUtil";
+		String className = "cn.hutool.core.text.StrUtil";
 		String result = ClassUtil.getShortClassName(className);
 		Assert.assertEquals("c.h.c.u.StrUtil", result);
 	}
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/DesensitizedUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/DesensitizedUtilTest.java
index 2bd7e0b42..e2c7d8cda 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/DesensitizedUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/DesensitizedUtilTest.java
@@ -1,5 +1,6 @@
 package cn.hutool.core.util;
 
+import cn.hutool.core.text.DesensitizedUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java
index aa7e1ce8a..8870920d3 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java
@@ -1,6 +1,7 @@
 package cn.hutool.core.util;
 
 import cn.hutool.core.lang.hash.HashUtil;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java
index 1d30f6a7f..ee26e2b69 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java
@@ -17,7 +17,7 @@ public class HexUtilTest {
 	public void hexStrTest(){
 		String str = "我是一个字符串";
 
-		String hex = HexUtil.encodeHexStr(str, CharsetUtil.CHARSET_UTF_8);
+		String hex = HexUtil.encodeHexStr(str, CharsetUtil.UTF_8);
 		String decodedStr = HexUtil.decodeHexStr(hex);
 
 		Assert.assertEquals(str, decodedStr);
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ModifierUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ModifierUtilTest.java
index a2f64945c..2411eb421 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/ModifierUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ModifierUtilTest.java
@@ -1,5 +1,6 @@
 package cn.hutool.core.util;
 
+import cn.hutool.core.reflect.ModifierUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ObjectUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ObjectUtilTest.java
index 347a534f7..72e634ec5 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/ObjectUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ObjectUtilTest.java
@@ -18,20 +18,20 @@ public class ObjectUtilTest {
 	public void equalsTest(){
 		Object a = null;
 		Object b = null;
-		Assert.assertTrue(ObjectUtil.equals(a, b));
+		Assert.assertTrue(ObjUtil.equals(a, b));
 	}
 
 	@Test
 	public void lengthTest(){
 		int[] array = new int[]{1,2,3,4,5};
-		int length = ObjectUtil.length(array);
+		int length = ObjUtil.length(array);
 		Assert.assertEquals(5, length);
 
 		Map map = new HashMap<>();
 		map.put("a", "a1");
 		map.put("b", "b1");
 		map.put("c", "c1");
-		length = ObjectUtil.length(map);
+		length = ObjUtil.length(map);
 		Assert.assertEquals(3, length);
 	}
 
@@ -39,14 +39,14 @@ public class ObjectUtilTest {
 	public void containsTest(){
 		int[] array = new int[]{1,2,3,4,5};
 
-		final boolean contains = ObjectUtil.contains(array, 1);
+		final boolean contains = ObjUtil.contains(array, 1);
 		Assert.assertTrue(contains);
 	}
 
 	@Test
 	public void cloneTest() {
 		Obj obj = new Obj();
-		Obj obj2 = ObjectUtil.clone(obj);
+		Obj obj2 = ObjUtil.clone(obj);
 		Assert.assertEquals("OK", obj2.doSomeThing());
 	}
 
@@ -59,7 +59,7 @@ public class ObjectUtilTest {
 	@Test
 	public void toStringTest() {
 		ArrayList strings = CollUtil.newArrayList("1", "2");
-		String result = ObjectUtil.toString(strings);
+		String result = ObjUtil.toString(strings);
 		Assert.assertEquals("[1, 2]", result);
 	}
 
@@ -67,10 +67,10 @@ public class ObjectUtilTest {
 	public void defaultIfNullTest() {
 		final String nullValue = null;
 		final String dateStr = "2020-10-23 15:12:30";
-		Instant result1 = ObjectUtil.defaultIfNull(dateStr,
+		Instant result1 = ObjUtil.defaultIfNull(dateStr,
 				() -> DateUtil.parse(dateStr, DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant.now());
 		Assert.assertNotNull(result1);
-		Instant result2 = ObjectUtil.defaultIfNull(nullValue,
+		Instant result2 = ObjUtil.defaultIfNull(nullValue,
 				() -> DateUtil.parse(nullValue, DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant.now());
 		Assert.assertNotNull(result2);
 	}
@@ -79,10 +79,10 @@ public class ObjectUtilTest {
 	public void defaultIfEmptyTest() {
 		final String emptyValue = "";
 		final String dateStr = "2020-10-23 15:12:30";
-		Instant result1 = ObjectUtil.defaultIfEmpty(emptyValue,
+		Instant result1 = ObjUtil.defaultIfEmpty(emptyValue,
 				() -> DateUtil.parse(emptyValue, DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant.now());
 		Assert.assertNotNull(result1);
-		Instant result2 = ObjectUtil.defaultIfEmpty(dateStr,
+		Instant result2 = ObjUtil.defaultIfEmpty(dateStr,
 				() -> DateUtil.parse(dateStr, DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant.now());
 		Assert.assertNotNull(result2);
 	}
@@ -90,7 +90,7 @@ public class ObjectUtilTest {
 	@Test
 	public void isBasicTypeTest(){
 		int a = 1;
-		final boolean basicType = ObjectUtil.isBasicType(a);
+		final boolean basicType = ObjUtil.isBasicType(a);
 		Assert.assertTrue(basicType);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java
index ad8efdd17..327a628f9 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.regex.PatternPool;
 import cn.hutool.core.regex.ReUtil;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ReflectUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ReflectUtilTest.java
index 7792804a8..16006e8c7 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/ReflectUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ReflectUtilTest.java
@@ -4,7 +4,9 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.TimeInterval;
 import cn.hutool.core.date.Week;
 import cn.hutool.core.lang.Console;
+import cn.hutool.core.reflect.ReflectUtil;
 import cn.hutool.core.lang.test.bean.ExamInfoDict;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.core.util.ClassUtilTest.TestSubClass;
 import lombok.Data;
 import org.junit.Assert;
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
index c909b8f4f..7dc06ee77 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
@@ -1,6 +1,7 @@
 package cn.hutool.core.util;
 
 import cn.hutool.core.map.Dict;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/TypeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/TypeUtilTest.java
index 81c9f030d..804a81d9b 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/TypeUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/TypeUtilTest.java
@@ -1,5 +1,6 @@
 package cn.hutool.core.util;
 
+import cn.hutool.core.reflect.ReflectUtil;
 import lombok.Data;
 import org.junit.Assert;
 import org.junit.Test;
@@ -10,32 +11,32 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class TypeUtilTest {
-	
+
 	@Test
 	public void getEleTypeTest() {
 		Method method = ReflectUtil.getMethod(TestClass.class, "getList");
 		Type type = TypeUtil.getReturnType(method);
 		Assert.assertEquals("java.util.List", type.toString());
-		
+
 		Type type2 = TypeUtil.getTypeArgument(type);
 		Assert.assertEquals(String.class, type2);
 	}
-	
+
 	@Test
 	public void getParamTypeTest() {
 		Method method = ReflectUtil.getMethod(TestClass.class, "intTest", Integer.class);
 		Type type = TypeUtil.getParamType(method, 0);
 		Assert.assertEquals(Integer.class, type);
-		
+
 		Type returnType = TypeUtil.getReturnType(method);
 		Assert.assertEquals(Integer.class, returnType);
 	}
-	
+
 	public static class TestClass {
 		public List getList(){
 			return new ArrayList<>();
 		}
-		
+
 		public Integer intTest(Integer integer) {
 			return 1;
 		}
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ZipUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ZipUtilTest.java
index 5b9462a55..c25e61cd4 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/ZipUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ZipUtilTest.java
@@ -1,9 +1,11 @@
 package cn.hutool.core.util;
 
 import cn.hutool.core.compress.ZipReader;
+import cn.hutool.core.compress.ZipUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.lang.Console;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -67,7 +69,7 @@ public class ZipUtilTest {
 	 */
 	private List zipEntryNames(File zipFile) {
 		List fileNames = new ArrayList<>();
-		ZipReader reader = ZipReader.of(zipFile, CharsetUtil.CHARSET_UTF_8);
+		ZipReader reader = ZipReader.of(zipFile, CharsetUtil.UTF_8);
 		reader.read(zipEntry -> fileNames.add(zipEntry.getName()));
 		reader.close();
 		return fileNames;
@@ -89,14 +91,14 @@ public class ZipUtilTest {
 	@Test
 	@Ignore
 	public void unzipTest2() {
-		File unzip = ZipUtil.unzip("f:/test/各种资源.zip", "f:/test/各种资源", CharsetUtil.CHARSET_GBK);
+		File unzip = ZipUtil.unzip("f:/test/各种资源.zip", "f:/test/各种资源", CharsetUtil.GBK);
 		Console.log(unzip);
 	}
 
 	@Test
 	@Ignore
 	public void unzipFromStreamTest() {
-		File unzip = ZipUtil.unzip(FileUtil.getInputStream("e:/test/hutool-core-5.1.0.jar"), FileUtil.file("e:/test/"), CharsetUtil.CHARSET_UTF_8);
+		File unzip = ZipUtil.unzip(FileUtil.getInputStream("e:/test/hutool-core-5.1.0.jar"), FileUtil.file("e:/test/"), CharsetUtil.UTF_8);
 		Console.log(unzip);
 	}
 
@@ -109,7 +111,7 @@ public class ZipUtilTest {
 	@Test
 	@Ignore
 	public void unzipFileBytesTest() {
-		byte[] fileBytes = ZipUtil.unzipFileBytes(FileUtil.file("e:/02 电力相关设备及服务2-241-.zip"), CharsetUtil.CHARSET_GBK, "images/CE-EP-HY-MH01-ES-0001.jpg");
+		byte[] fileBytes = ZipUtil.unzipFileBytes(FileUtil.file("e:/02 电力相关设备及服务2-241-.zip"), CharsetUtil.GBK, "images/CE-EP-HY-MH01-ES-0001.jpg");
 		Assert.assertNotNull(fileBytes);
 	}
 
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/CronException.java b/hutool-cron/src/main/java/cn/hutool/cron/CronException.java
index 8e45db950..b52c86f37 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/CronException.java
+++ b/hutool-cron/src/main/java/cn/hutool/cron/CronException.java
@@ -1,6 +1,6 @@
 package cn.hutool.cron;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 定时任务异常
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java b/hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java
index 07da4ff1b..4818e6b47 100755
--- a/hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java
+++ b/hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java
@@ -5,7 +5,7 @@ import cn.hutool.core.thread.ExecutorBuilder;
 import cn.hutool.core.thread.ThreadFactoryBuilder;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.lang.id.IdUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.cron.listener.TaskListener;
 import cn.hutool.cron.listener.TaskListenerManager;
 import cn.hutool.cron.pattern.CronPattern;
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/TaskTable.java b/hutool-cron/src/main/java/cn/hutool/cron/TaskTable.java
index c68015408..6ae69dc79 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/TaskTable.java
+++ b/hutool-cron/src/main/java/cn/hutool/cron/TaskTable.java
@@ -1,6 +1,6 @@
 package cn.hutool.cron;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.cron.pattern.CronPattern;
 import cn.hutool.cron.task.CronTask;
 import cn.hutool.cron.task.Task;
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternBuilder.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternBuilder.java
index 307902b52..45b98ec6e 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternBuilder.java
+++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternBuilder.java
@@ -4,7 +4,7 @@ import cn.hutool.core.builder.Builder;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.text.StrJoiner;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 定时任务表达式构建器
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java
index 6d65fd88b..9683c005e 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java
+++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java
@@ -1,6 +1,6 @@
 package cn.hutool.cron.pattern.matcher;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 所有值匹配，始终返回{@code true}
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/BoolArrayMatcher.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/BoolArrayMatcher.java
index d60909ec5..7dee182c3 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/BoolArrayMatcher.java
+++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/BoolArrayMatcher.java
@@ -2,7 +2,7 @@ package cn.hutool.cron.pattern.matcher;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/PartParser.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/PartParser.java
index 05cb0d350..51566015e 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/PartParser.java
+++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/PartParser.java
@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.Month;
 import cn.hutool.core.date.Week;
 import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.cron.CronException;
 import cn.hutool.cron.pattern.Part;
 import cn.hutool.cron.pattern.matcher.AlwaysTrueMatcher;
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/PatternParser.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/PatternParser.java
index cf33e0866..0a791d088 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/PatternParser.java
+++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/PatternParser.java
@@ -1,7 +1,7 @@
 package cn.hutool.cron.pattern.parser;
 
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.cron.CronException;
 import cn.hutool.cron.pattern.Part;
 import cn.hutool.cron.pattern.matcher.AlwaysTrueMatcher;
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/task/InvokeTask.java b/hutool-cron/src/main/java/cn/hutool/cron/task/InvokeTask.java
index 97f5a09f8..87f147867 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/task/InvokeTask.java
+++ b/hutool-cron/src/main/java/cn/hutool/cron/task/InvokeTask.java
@@ -3,8 +3,8 @@ package cn.hutool.cron.task;
 import cn.hutool.core.exceptions.UtilException;
 import cn.hutool.core.util.ClassLoaderUtil;
 import cn.hutool.core.util.ClassUtil;
-import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.reflect.ReflectUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.cron.CronException;
 
 import java.lang.reflect.Method;
@@ -13,7 +13,7 @@ import java.lang.reflect.Method;
  * 反射执行任务
    
  * 通过传入类名#方法名，通过反射执行相应的方法
    
  * 如果是静态方法直接执行，如果是对象方法，需要类有默认的构造方法。
- * 
+ *
  * @author Looly
  *
  */
@@ -21,7 +21,7 @@ public class InvokeTask implements Task{
 
 	private final Object obj;
 	private final Method method;
-	
+
 	/**
 	 * 构造
 	 * @param classNameWithMethodName 类名与方法名的字符串表示，方法名和类名使用#隔开或者.隔开
@@ -45,7 +45,7 @@ public class InvokeTask implements Task{
 			throw new IllegalArgumentException("Load class with name of [" + className + "] fail !");
 		}
 		this.obj = ReflectUtil.newInstanceIfPossible(clazz);
-		
+
 		//方法
 		final String methodName = classNameWithMethodName.substring(splitIndex + 1);
 		if(StrUtil.isBlank(methodName)) {
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/CryptoException.java b/hutool-crypto/src/main/java/cn/hutool/crypto/CryptoException.java
index 5b2092eda..407761495 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/CryptoException.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/CryptoException.java
@@ -1,7 +1,7 @@
 package cn.hutool.crypto;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 加密异常
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/KeyUtil.java b/hutool-crypto/src/main/java/cn/hutool/crypto/KeyUtil.java
index 518f09917..6fb0293bb 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/KeyUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/KeyUtil.java
@@ -7,7 +7,7 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.asymmetric.AsymmetricAlgorithm;
 import cn.hutool.crypto.symmetric.SymmetricAlgorithm;
 
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/PemUtil.java b/hutool-crypto/src/main/java/cn/hutool/crypto/PemUtil.java
index c7ca4205b..03b756eeb 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/PemUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/PemUtil.java
@@ -2,7 +2,7 @@ package cn.hutool.crypto;
 
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.bouncycastle.util.io.pem.PemObject;
 import org.bouncycastle.util.io.pem.PemObjectGenerator;
 import org.bouncycastle.util.io.pem.PemReader;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java b/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java
index ca507f8bb..c3106e6b2 100755
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java
@@ -4,7 +4,7 @@ import cn.hutool.core.codec.Base64;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.asymmetric.AsymmetricAlgorithm;
 import cn.hutool.crypto.asymmetric.RSA;
 import cn.hutool.crypto.asymmetric.Sign;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/SignUtil.java b/hutool-crypto/src/main/java/cn/hutool/crypto/SignUtil.java
index a7a3690ba..a32db7496 100755
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/SignUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/SignUtil.java
@@ -1,7 +1,7 @@
 package cn.hutool.crypto;
 
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.asymmetric.Sign;
 import cn.hutool.crypto.asymmetric.SignAlgorithm;
 import cn.hutool.crypto.digest.DigestAlgorithm;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricDecryptor.java b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricDecryptor.java
index 74083d609..583a76049 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricDecryptor.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricDecryptor.java
@@ -5,7 +5,7 @@ import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 
 import java.io.InputStream;
@@ -80,7 +80,7 @@ public interface AsymmetricDecryptor {
 	 * @since 4.5.2
 	 */
 	default String decryptStr(String data, KeyType keyType) {
-		return decryptStr(data, keyType, CharsetUtil.CHARSET_UTF_8);
+		return decryptStr(data, keyType, CharsetUtil.UTF_8);
 	}
 
 	/**
@@ -92,7 +92,7 @@ public interface AsymmetricDecryptor {
 	 * @since 4.1.0
 	 */
 	default byte[] decryptFromBcd(String data, KeyType keyType) {
-		return decryptFromBcd(data, keyType, CharsetUtil.CHARSET_UTF_8);
+		return decryptFromBcd(data, keyType, CharsetUtil.UTF_8);
 	}
 
 	/**
@@ -132,6 +132,6 @@ public interface AsymmetricDecryptor {
 	 * @since 4.5.2
 	 */
 	default String decryptStrFromBcd(String data, KeyType keyType) {
-		return decryptStrFromBcd(data, keyType, CharsetUtil.CHARSET_UTF_8);
+		return decryptStrFromBcd(data, keyType, CharsetUtil.UTF_8);
 	}
 }
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricEncryptor.java b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricEncryptor.java
index 984886b68..148c37082 100755
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricEncryptor.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricEncryptor.java
@@ -6,7 +6,7 @@ import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -187,7 +187,7 @@ public interface AsymmetricEncryptor {
 	 * @since 4.1.0
 	 */
 	default String encryptBcd(String data, KeyType keyType) {
-		return encryptBcd(data, keyType, CharsetUtil.CHARSET_UTF_8);
+		return encryptBcd(data, keyType, CharsetUtil.UTF_8);
 	}
 
 	/**
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java
index 0e261320f..2c6c9b1fc 100755
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java
@@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.CryptoException;
 import cn.hutool.crypto.SecureUtil;
 
@@ -207,7 +207,7 @@ public class Sign extends BaseAsymmetric {
 	 * @since 5.7.0
 	 */
 	public byte[] sign(String data) {
-		return sign(data, CharsetUtil.CHARSET_UTF_8);
+		return sign(data, CharsetUtil.UTF_8);
 	}
 
 	/**
@@ -230,7 +230,7 @@ public class Sign extends BaseAsymmetric {
 	 * @since 5.7.0
 	 */
 	public String signHex(String data) {
-		return signHex(data, CharsetUtil.CHARSET_UTF_8);
+		return signHex(data, CharsetUtil.UTF_8);
 	}
 
 	/**
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/BCrypt.java b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/BCrypt.java
index 511691e16..86c741ff3 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/BCrypt.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/BCrypt.java
@@ -437,7 +437,7 @@ public class BCrypt {
 		rounds = Integer.parseInt(salt.substring(off, off + 2));
 
 		real_salt = salt.substring(off + 3, off + 25);
-		byte[] passwordb = (password + (minor >= 'a' ? "\000" : "")).getBytes(CharsetUtil.CHARSET_UTF_8);
+		byte[] passwordb = (password + (minor >= 'a' ? "\000" : "")).getBytes(CharsetUtil.UTF_8);
 		saltb = decodeBase64(real_salt, BCRYPT_SALT_LEN);
 
 		bcrypt = new BCrypt();
@@ -521,8 +521,8 @@ public class BCrypt {
 			// 生成密文时错误直接返回false issue#1377@Github
 			return false;
 		}
-		hashed_bytes = hashed.getBytes(CharsetUtil.CHARSET_UTF_8);
-		try_bytes = try_pw.getBytes(CharsetUtil.CHARSET_UTF_8);
+		hashed_bytes = hashed.getBytes(CharsetUtil.UTF_8);
+		try_bytes = try_pw.getBytes(CharsetUtil.UTF_8);
 		if (hashed_bytes.length != try_bytes.length) {
 			return false;
 		}
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestUtil.java b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestUtil.java
index fc6fd61ce..82da9b07c 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestUtil.java
@@ -44,7 +44,7 @@ public class DigestUtil {
 	 * @return MD5摘要
 	 */
 	public static byte[] md5(String data) {
-		return md5(data, CharsetUtil.UTF_8);
+		return md5(data, CharsetUtil.NAME_UTF_8);
 	}
 
 	/**
@@ -107,7 +107,7 @@ public class DigestUtil {
 	 * @return MD5摘要的16进制表示
 	 */
 	public static String md5Hex(String data) {
-		return md5Hex(data, CharsetUtil.UTF_8);
+		return md5Hex(data, CharsetUtil.NAME_UTF_8);
 	}
 
 	/**
@@ -163,7 +163,7 @@ public class DigestUtil {
 	 * @since 4.6.0
 	 */
 	public static String md5Hex16(String data) {
-		return md5Hex16(data, CharsetUtil.CHARSET_UTF_8);
+		return md5Hex16(data, CharsetUtil.UTF_8);
 	}
 
 	/**
@@ -229,7 +229,7 @@ public class DigestUtil {
 	 * @return MD5摘要
 	 */
 	public static byte[] sha1(String data) {
-		return sha1(data, CharsetUtil.UTF_8);
+		return sha1(data, CharsetUtil.NAME_UTF_8);
 	}
 
 	/**
@@ -280,7 +280,7 @@ public class DigestUtil {
 	 * @return SHA-1摘要的16进制表示
 	 */
 	public static String sha1Hex(String data) {
-		return sha1Hex(data, CharsetUtil.UTF_8);
+		return sha1Hex(data, CharsetUtil.NAME_UTF_8);
 	}
 
 	/**
@@ -336,7 +336,7 @@ public class DigestUtil {
 	 * @since 3.0.8
 	 */
 	public static byte[] sha256(String data) {
-		return sha256(data, CharsetUtil.UTF_8);
+		return sha256(data, CharsetUtil.NAME_UTF_8);
 	}
 
 	/**
@@ -392,7 +392,7 @@ public class DigestUtil {
 	 * @since 3.0.8
 	 */
 	public static String sha256Hex(String data) {
-		return sha256Hex(data, CharsetUtil.UTF_8);
+		return sha256Hex(data, CharsetUtil.NAME_UTF_8);
 	}
 
 	/**
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java
index 1923ab2a6..e87ec0e1f 100755
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java
@@ -6,7 +6,7 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.CryptoException;
 import cn.hutool.crypto.SecureUtil;
 
@@ -189,7 +189,7 @@ public class Digester implements Serializable {
 	 * @return 摘要
 	 */
 	public byte[] digest(String data) {
-		return digest(data, CharsetUtil.CHARSET_UTF_8);
+		return digest(data, CharsetUtil.UTF_8);
 	}
 
 	/**
@@ -222,7 +222,7 @@ public class Digester implements Serializable {
 	 * @return 摘要
 	 */
 	public String digestHex(String data) {
-		return digestHex(data, CharsetUtil.UTF_8);
+		return digestHex(data, CharsetUtil.NAME_UTF_8);
 	}
 
 	/**
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java
index 3a144398b..f9fee2963 100755
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java
@@ -5,7 +5,7 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.CryptoException;
 
 import java.io.ByteArrayInputStream;
@@ -69,7 +69,7 @@ public class Mac implements Serializable {
 	 * @return 摘要
 	 */
 	public byte[] digest(String data) {
-		return digest(data, CharsetUtil.CHARSET_UTF_8);
+		return digest(data, CharsetUtil.UTF_8);
 	}
 
 	/**
@@ -80,7 +80,7 @@ public class Mac implements Serializable {
 	 * @return 摘要
 	 */
 	public String digestBase64(String data, boolean isUrlSafe) {
-		return digestBase64(data, CharsetUtil.CHARSET_UTF_8, isUrlSafe);
+		return digestBase64(data, CharsetUtil.UTF_8, isUrlSafe);
 	}
 
 	/**
@@ -114,7 +114,7 @@ public class Mac implements Serializable {
 	 * @return 摘要
 	 */
 	public String digestHex(String data) {
-		return digestHex(data, CharsetUtil.CHARSET_UTF_8);
+		return digestHex(data, CharsetUtil.UTF_8);
 	}
 
 	/**
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/otp/TOTP.java b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/otp/TOTP.java
index 7a3b96b3f..8671011e3 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/otp/TOTP.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/otp/TOTP.java
@@ -1,6 +1,6 @@
 package cn.hutool.crypto.digest.otp;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.digest.HmacAlgorithm;
 
 import java.time.Duration;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/AES.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/AES.java
index dc03596a5..3a92ad10b 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/AES.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/AES.java
@@ -1,7 +1,7 @@
 package cn.hutool.crypto.symmetric;
 
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.KeyUtil;
 import cn.hutool.crypto.Mode;
 import cn.hutool.crypto.Padding;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/DES.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/DES.java
index ab397a77b..8260ffb80 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/DES.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/DES.java
@@ -3,7 +3,7 @@ package cn.hutool.crypto.symmetric;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.Mode;
 import cn.hutool.crypto.Padding;
 import cn.hutool.crypto.SecureUtil;
@@ -12,7 +12,7 @@ import cn.hutool.crypto.SecureUtil;
  * DES加密算法实现
    
  * DES全称为Data Encryption Standard，即数据加密标准，是一种使用密钥加密的块算法
    
  * Java中默认实现为：DES/CBC/PKCS5Padding
- * 
+ *
  * @author Looly
  * @since 3.0.8
  */
@@ -29,7 +29,7 @@ public class DES extends SymmetricCrypto {
 
 	/**
 	 * 构造，使用默认的DES/CBC/PKCS5Padding
-	 * 
+	 *
 	 * @param key 密钥
 	 */
 	public DES(byte[] key) {
@@ -38,7 +38,7 @@ public class DES extends SymmetricCrypto {
 
 	/**
 	 * 构造，使用随机密钥
-	 * 
+	 *
 	 * @param mode 模式{@link Mode}
 	 * @param padding {@link Padding}补码方式
 	 */
@@ -48,7 +48,7 @@ public class DES extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式{@link Mode}
 	 * @param padding {@link Padding}补码方式
 	 * @param key 密钥，长度：8的倍数
@@ -59,7 +59,7 @@ public class DES extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式{@link Mode}
 	 * @param padding {@link Padding}补码方式
 	 * @param key 密钥，长度：8的倍数
@@ -72,7 +72,7 @@ public class DES extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式{@link Mode}
 	 * @param padding {@link Padding}补码方式
 	 * @param key 密钥，长度：8的倍数
@@ -84,7 +84,7 @@ public class DES extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式{@link Mode}
 	 * @param padding {@link Padding}补码方式
 	 * @param key 密钥，长度：8的倍数
@@ -97,7 +97,7 @@ public class DES extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式
 	 * @param padding 补码方式
 	 */
@@ -107,7 +107,7 @@ public class DES extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式
 	 * @param padding 补码方式
 	 * @param key 密钥，长度：8的倍数
@@ -118,7 +118,7 @@ public class DES extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式
 	 * @param padding 补码方式
 	 * @param key 密钥，长度：8的倍数
@@ -130,7 +130,7 @@ public class DES extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式
 	 * @param padding 补码方式
 	 * @param key 密钥，长度：8的倍数
@@ -141,7 +141,7 @@ public class DES extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式
 	 * @param padding 补码方式
 	 * @param key 密钥，长度：8的倍数
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/DESede.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/DESede.java
index bff346a16..b17e9e042 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/DESede.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/DESede.java
@@ -3,7 +3,7 @@ package cn.hutool.crypto.symmetric;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.Mode;
 import cn.hutool.crypto.Padding;
 import cn.hutool.crypto.SecureUtil;
@@ -13,7 +13,7 @@ import cn.hutool.crypto.SecureUtil;
  * 使用 168 位的密钥对资料进行三次加密的一种机制；它通常（但非始终）提供极其强大的安全性。
    
  * 如果三个 56 位的子元素都相同，则三重 DES 向后兼容 DES。
    
  * Java中默认实现为：DESede/ECB/PKCS5Padding
- * 
+ *
  * @author Looly
  * @since 3.3.0
  */
@@ -30,7 +30,7 @@ public class DESede extends SymmetricCrypto {
 
 	/**
 	 * 构造，使用默认的DESede/ECB/PKCS5Padding
-	 * 
+	 *
 	 * @param key 密钥
 	 */
 	public DESede(byte[] key) {
@@ -39,7 +39,7 @@ public class DESede extends SymmetricCrypto {
 
 	/**
 	 * 构造，使用随机密钥
-	 * 
+	 *
 	 * @param mode 模式{@link Mode}
 	 * @param padding {@link Padding}补码方式
 	 */
@@ -49,7 +49,7 @@ public class DESede extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式{@link Mode}
 	 * @param padding {@link Padding}补码方式
 	 * @param key 密钥，长度24位
@@ -60,7 +60,7 @@ public class DESede extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式{@link Mode}
 	 * @param padding {@link Padding}补码方式
 	 * @param key 密钥，长度24位
@@ -73,7 +73,7 @@ public class DESede extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式{@link Mode}
 	 * @param padding {@link Padding}补码方式
 	 * @param key 密钥，长度24位
@@ -85,7 +85,7 @@ public class DESede extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式{@link Mode}
 	 * @param padding {@link Padding}补码方式
 	 * @param key 密钥，长度24位
@@ -98,7 +98,7 @@ public class DESede extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式
 	 * @param padding 补码方式
 	 */
@@ -108,7 +108,7 @@ public class DESede extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式
 	 * @param padding 补码方式
 	 * @param key 密钥，长度24位
@@ -119,7 +119,7 @@ public class DESede extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式
 	 * @param padding 补码方式
 	 * @param key 密钥，长度24位
@@ -131,7 +131,7 @@ public class DESede extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式
 	 * @param padding 补码方式
 	 * @param key 密钥
@@ -142,7 +142,7 @@ public class DESede extends SymmetricCrypto {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式
 	 * @param padding 补码方式
 	 * @param key 密钥
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java
index 4f304ee94..d5259785b 100755
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java
@@ -3,7 +3,7 @@ package cn.hutool.crypto.symmetric;
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.CryptoException;
 import cn.hutool.crypto.SecureUtil;
 
@@ -62,7 +62,7 @@ public class RC4 implements Serializable {
 	 * @throws CryptoException key长度小于5或者大于255抛出此异常
 	 */
 	public byte[] encrypt(String message) throws CryptoException {
-		return encrypt(message, CharsetUtil.CHARSET_UTF_8);
+		return encrypt(message, CharsetUtil.UTF_8);
 	}
 
 	/**
@@ -154,7 +154,7 @@ public class RC4 implements Serializable {
 	 * @throws CryptoException key长度小于5或者大于255抛出此异常
 	 */
 	public String decrypt(byte[] message) throws CryptoException {
-		return decrypt(message, CharsetUtil.CHARSET_UTF_8);
+		return decrypt(message, CharsetUtil.UTF_8);
 	}
 
 	/**
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SM4.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SM4.java
index 1348cdad7..19822826e 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SM4.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SM4.java
@@ -1,7 +1,7 @@
 package cn.hutool.crypto.symmetric;
 
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.Mode;
 import cn.hutool.crypto.Padding;
 import cn.hutool.crypto.SecureUtil;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java
index 1fbf9217b..7ef19d5ea 100755
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java
@@ -7,7 +7,7 @@ import cn.hutool.core.lang.Opt;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.codec.HexUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.CipherMode;
 import cn.hutool.crypto.CipherWrapper;
 import cn.hutool.crypto.CryptoException;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricDecryptor.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricDecryptor.java
index c96d2d892..6d05a26d8 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricDecryptor.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricDecryptor.java
@@ -3,7 +3,7 @@ package cn.hutool.crypto.symmetric;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 
 import java.io.InputStream;
@@ -58,7 +58,7 @@ public interface SymmetricDecryptor {
 	 * @return 解密后的String
 	 */
 	default String decryptStr(byte[] bytes) {
-		return decryptStr(bytes, CharsetUtil.CHARSET_UTF_8);
+		return decryptStr(bytes, CharsetUtil.UTF_8);
 	}
 
 	/**
@@ -89,7 +89,7 @@ public interface SymmetricDecryptor {
 	 * @return 解密后的String
 	 */
 	default String decryptStr(String data) {
-		return decryptStr(data, CharsetUtil.CHARSET_UTF_8);
+		return decryptStr(data, CharsetUtil.UTF_8);
 	}
 
 	/**
@@ -121,6 +121,6 @@ public interface SymmetricDecryptor {
 	 * @return 解密后的String
 	 */
 	default String decryptStr(InputStream data) {
-		return decryptStr(data, CharsetUtil.CHARSET_UTF_8);
+		return decryptStr(data, CharsetUtil.UTF_8);
 	}
 }
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricEncryptor.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricEncryptor.java
index 99f127775..ea1618f32 100755
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricEncryptor.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricEncryptor.java
@@ -5,7 +5,7 @@ import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -136,7 +136,7 @@ public interface SymmetricEncryptor {
 	 * @return 加密后的bytes
 	 */
 	default byte[] encrypt(String data) {
-		return encrypt(StrUtil.bytes(data, CharsetUtil.CHARSET_UTF_8));
+		return encrypt(StrUtil.bytes(data, CharsetUtil.UTF_8));
 	}
 
 	/**
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/PemUtilTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/PemUtilTest.java
index 0daea2e31..4a108f28c 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/PemUtilTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/PemUtilTest.java
@@ -2,7 +2,7 @@ package cn.hutool.crypto.test;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.PemUtil;
 import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.RSA;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/SmTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/SmTest.java
index 5888cdf08..e475369cd 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/SmTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/SmTest.java
@@ -32,7 +32,7 @@ public class SmTest {
 		SM4 sm4 = SmUtil.sm4();
 
 		String encryptHex = sm4.encryptHex(content);
-		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
+		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.UTF_8);
 
 		Assert.assertEquals(content, decryptStr);
 	}
@@ -44,7 +44,7 @@ public class SmTest {
 		sm4.setIv("aaaabbbb".getBytes());
 
 		String encryptHex = sm4.encryptHex(content);
-		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
+		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.UTF_8);
 
 		Assert.assertEquals(content, decryptStr);
 	}
@@ -56,7 +56,7 @@ public class SmTest {
 		Assert.assertEquals("SM4/ECB/PKCS5Padding", sm4.getCipher().getAlgorithm());
 
 		String encryptHex = sm4.encryptHex(content);
-		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
+		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.UTF_8);
 		Assert.assertEquals(content, decryptStr);
 	}
 
@@ -70,7 +70,7 @@ public class SmTest {
 		Assert.assertEquals("SM4/ECB/PKCS5Padding", sm4.getCipher().getAlgorithm());
 
 		String encryptHex = sm4.encryptHex(content);
-		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
+		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.UTF_8);
 		Assert.assertEquals(content, decryptStr);
 	}
 
@@ -84,7 +84,7 @@ public class SmTest {
 		Assert.assertEquals("SM4", sm4.getCipher().getAlgorithm());
 
 		String encryptHex = sm4.encryptHex(content);
-		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
+		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.UTF_8);
 		Assert.assertEquals(content, decryptStr);
 	}
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/ECIESTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/ECIESTest.java
index 6e91f8a89..cec7587bd 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/ECIESTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/ECIESTest.java
@@ -1,6 +1,6 @@
 package cn.hutool.crypto.test.asymmetric;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.asymmetric.AsymmetricCrypto;
 import cn.hutool.crypto.asymmetric.ECIES;
 import cn.hutool.crypto.asymmetric.KeyType;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java
index 693632ae9..897f0aad2 100755
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java
@@ -5,7 +5,7 @@ import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.codec.HexUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.KeyUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.asymmetric.AsymmetricAlgorithm;
@@ -42,14 +42,14 @@ public class RSATest {
 		RSA rsa = SecureUtil.rsa(privateKey, publicKey);
 
 		// 公钥加密，私钥解密
-		byte[] encrypt = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey);
+		byte[] encrypt = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.UTF_8), KeyType.PublicKey);
 		byte[] decrypt = rsa.decrypt(encrypt, KeyType.PrivateKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.UTF_8));
 
 		// 私钥加密，公钥解密
-		byte[] encrypt2 = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PrivateKey);
+		byte[] encrypt2 = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.UTF_8), KeyType.PrivateKey);
 		byte[] decrypt2 = rsa.decrypt(encrypt2, KeyType.PublicKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
+		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.UTF_8));
 	}
 
 	@Test
@@ -63,15 +63,15 @@ public class RSATest {
 		Assert.assertNotNull(rsa.getPrivateKeyBase64());
 
 		// 公钥加密，私钥解密
-		byte[] encrypt = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey);
+		byte[] encrypt = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.UTF_8), KeyType.PublicKey);
 
 		byte[] decrypt = rsa.decrypt(encrypt, KeyType.PrivateKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.UTF_8));
 
 		// 私钥加密，公钥解密
-		byte[] encrypt2 = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PrivateKey);
+		byte[] encrypt2 = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.UTF_8), KeyType.PrivateKey);
 		byte[] decrypt2 = rsa.decrypt(encrypt2, KeyType.PublicKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
+		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.UTF_8));
 	}
 
 	@Test
@@ -85,15 +85,15 @@ public class RSATest {
 		Assert.assertNotNull(rsa.getPrivateKeyBase64());
 
 		// 公钥加密，私钥解密
-		byte[] encrypt = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey);
+		byte[] encrypt = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.UTF_8), KeyType.PublicKey);
 
 		byte[] decrypt = rsa.decrypt(encrypt, KeyType.PrivateKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.UTF_8));
 
 		// 私钥加密，公钥解密
-		byte[] encrypt2 = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PrivateKey);
+		byte[] encrypt2 = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.UTF_8), KeyType.PrivateKey);
 		byte[] decrypt2 = rsa.decrypt(encrypt2, KeyType.PublicKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
+		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.UTF_8));
 	}
 
 	@Test
@@ -107,15 +107,15 @@ public class RSATest {
 		Assert.assertNotNull(rsa.getPrivateKeyBase64());
 
 		// 公钥加密，私钥解密
-		byte[] encrypt = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey);
+		byte[] encrypt = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.UTF_8), KeyType.PublicKey);
 
 		byte[] decrypt = rsa.decrypt(encrypt, KeyType.PrivateKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.UTF_8));
 
 		// 私钥加密，公钥解密
-		byte[] encrypt2 = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PrivateKey);
+		byte[] encrypt2 = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.UTF_8), KeyType.PrivateKey);
 		byte[] decrypt2 = rsa.decrypt(encrypt2, KeyType.PublicKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
+		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.UTF_8));
 	}
 
 	@Test
@@ -130,14 +130,14 @@ public class RSATest {
 		Assert.assertNotNull(rsa.getPrivateKeyBase64());
 
 		// 公钥加密，私钥解密
-		byte[] encrypt = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey);
+		byte[] encrypt = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.UTF_8), KeyType.PublicKey);
 		byte[] decrypt = rsa.decrypt(encrypt, KeyType.PrivateKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.UTF_8));
 
 		// 私钥加密，公钥解密
-		byte[] encrypt2 = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PrivateKey);
+		byte[] encrypt2 = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.UTF_8), KeyType.PrivateKey);
 		byte[] decrypt2 = rsa.decrypt(encrypt2, KeyType.PublicKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
+		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.UTF_8));
 	}
 
 	@Test
@@ -200,7 +200,7 @@ public class RSATest {
 		byte[] aByte = HexUtil.decodeHex(a);
 		byte[] decrypt = rsa.decrypt(aByte, KeyType.PrivateKey);
 
-		Assert.assertEquals("虎头闯杭州,多抬头看天,切勿只管种地", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		Assert.assertEquals("虎头闯杭州,多抬头看天,切勿只管种地", StrUtil.str(decrypt, CharsetUtil.UTF_8));
 	}
 
 	@Test
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java
index dec459218..cc46386ed 100755
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java
@@ -3,7 +3,7 @@ package cn.hutool.crypto.test.asymmetric;
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.ECKeyUtil;
 import cn.hutool.crypto.KeyUtil;
 import cn.hutool.crypto.SecureUtil;
@@ -54,9 +54,9 @@ public class SM2Test {
 		sm2.setMode(SM2Engine.Mode.C1C2C3);
 
 		// 公钥加密，私钥解密
-		byte[] encrypt = sm2.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey);
+		byte[] encrypt = sm2.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.UTF_8), KeyType.PublicKey);
 		byte[] decrypt = sm2.decrypt(encrypt, KeyType.PrivateKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.UTF_8));
 	}
 
 	@Test
@@ -70,9 +70,9 @@ public class SM2Test {
 		Assert.assertNotNull(sm2.getPrivateKeyBase64());
 
 		// 公钥加密，私钥解密
-		byte[] encrypt = sm2.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey);
+		byte[] encrypt = sm2.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.UTF_8), KeyType.PublicKey);
 		byte[] decrypt = sm2.decrypt(encrypt, KeyType.PrivateKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.UTF_8));
 	}
 
 	@Test
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SignTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SignTest.java
index 0bc8f268f..6a1e396cf 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SignTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SignTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.crypto.test.asymmetric;
 
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.asymmetric.Sign;
 import cn.hutool.crypto.asymmetric.SignAlgorithm;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/DigestTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/DigestTest.java
index d555b4ec4..102133f1c 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/DigestTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/DigestTest.java
@@ -14,40 +14,40 @@ import cn.hutool.crypto.digest.Digester;
  *
  */
 public class DigestTest {
-	
+
 	@Test
 	public void digesterTest(){
 		String testStr = "test中文";
-		
+
 		Digester md5 = new Digester(DigestAlgorithm.MD5);
 		String digestHex = md5.digestHex(testStr);
 		Assert.assertEquals("5393554e94bf0eb6436f240a4fd71282", digestHex);
 	}
-	
+
 	@Test
 	public void md5Test(){
 		String testStr = "test中文";
-		
+
 		String md5Hex1 = DigestUtil.md5Hex(testStr);
 		Assert.assertEquals("5393554e94bf0eb6436f240a4fd71282", md5Hex1);
-		
-		String md5Hex2 = DigestUtil.md5Hex(IoUtil.toStream(testStr, CharsetUtil.CHARSET_UTF_8));
+
+		String md5Hex2 = DigestUtil.md5Hex(IoUtil.toStream(testStr, CharsetUtil.UTF_8));
 		Assert.assertEquals("5393554e94bf0eb6436f240a4fd71282", md5Hex2);
 	}
-	
+
 	@Test
 	public void md5WithSaltTest(){
 		String testStr = "test中文";
-		
+
 		Digester md5 = new Digester(DigestAlgorithm.MD5);
-		
+
 		//加盐
 		md5.setSalt("saltTest".getBytes());
 		String md5Hex1 = md5.digestHex(testStr);
 		Assert.assertEquals("762f7335200299dfa09bebbb601a5bc6", md5Hex1);
 		String md5Hex2 = md5.digestHex(IoUtil.toUtf8Stream(testStr));
 		Assert.assertEquals("762f7335200299dfa09bebbb601a5bc6", md5Hex2);
-		
+
 		//重复2次
 		md5.setDigestCount(2);
 		String md5Hex3 = md5.digestHex(testStr);
@@ -55,18 +55,18 @@ public class DigestTest {
 		String md5Hex4 = md5.digestHex(IoUtil.toUtf8Stream(testStr));
 		Assert.assertEquals("2b0616296f6755d25efc07f90afe9684", md5Hex4);
 	}
-	
+
 	@Test
 	public void sha1Test(){
 		String testStr = "test中文";
-		
+
 		String sha1Hex1 = DigestUtil.sha1Hex(testStr);
 		Assert.assertEquals("ecabf586cef0d3b11c56549433ad50b81110a836", sha1Hex1);
-		
-		String sha1Hex2 = DigestUtil.sha1Hex(IoUtil.toStream(testStr, CharsetUtil.CHARSET_UTF_8));
+
+		String sha1Hex2 = DigestUtil.sha1Hex(IoUtil.toStream(testStr, CharsetUtil.UTF_8));
 		Assert.assertEquals("ecabf586cef0d3b11c56549433ad50b81110a836", sha1Hex2);
 	}
-	
+
 	@Test
 	public void hash256Test() {
 		String testStr = "Test中文";
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/HmacTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/HmacTest.java
index ccddaa43c..6be61dbd5 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/HmacTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/HmacTest.java
@@ -29,7 +29,7 @@ public class HmacTest {
 		String macHex1 = mac.digestHex(testStr);
 		Assert.assertEquals("b977f4b13f93f549e06140971bded384", macHex1);
 
-		String macHex2 = mac.digestHex(IoUtil.toStream(testStr, CharsetUtil.CHARSET_UTF_8));
+		String macHex2 = mac.digestHex(IoUtil.toStream(testStr, CharsetUtil.UTF_8));
 		Assert.assertEquals("b977f4b13f93f549e06140971bded384", macHex2);
 	}
 
@@ -42,7 +42,7 @@ public class HmacTest {
 		String macHex1 = mac.digestHex(testStr);
 		Assert.assertEquals("b977f4b13f93f549e06140971bded384", macHex1);
 
-		String macHex2 = mac.digestHex(IoUtil.toStream(testStr, CharsetUtil.CHARSET_UTF_8));
+		String macHex2 = mac.digestHex(IoUtil.toStream(testStr, CharsetUtil.UTF_8));
 		Assert.assertEquals("b977f4b13f93f549e06140971bded384", macHex2);
 	}
 
@@ -54,7 +54,7 @@ public class HmacTest {
 		String macHex1 = mac.digestHex(testStr);
 		Assert.assertEquals("1dd68d2f119d5640f0d416e99d3f42408b88d511", macHex1);
 
-		String macHex2 = mac.digestHex(IoUtil.toStream(testStr, CharsetUtil.CHARSET_UTF_8));
+		String macHex2 = mac.digestHex(IoUtil.toStream(testStr, CharsetUtil.UTF_8));
 		Assert.assertEquals("1dd68d2f119d5640f0d416e99d3f42408b88d511", macHex2);
 	}
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/ChaCha20Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/ChaCha20Test.java
index a30e28f0b..b69700ecf 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/ChaCha20Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/ChaCha20Test.java
@@ -24,7 +24,7 @@ public class ChaCha20Test {
 		// 加密为16进制表示
 		String encryptHex = chacha.encryptHex(content);
 		// 解密为字符串
-		String decryptStr = chacha.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
+		String decryptStr = chacha.decryptStr(encryptHex, CharsetUtil.UTF_8);
 
 		Assert.assertEquals(content, decryptStr);
 	}
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/DesTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/DesTest.java
index eb0130c4f..eebe66b06 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/DesTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/DesTest.java
@@ -1,6 +1,6 @@
 package cn.hutool.crypto.test.symmetric;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.Mode;
 import cn.hutool.crypto.Padding;
 import cn.hutool.crypto.SecureUtil;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/RC4Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/RC4Test.java
index d630af7f2..4187c98b7 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/RC4Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/RC4Test.java
@@ -7,7 +7,7 @@ import org.junit.Test;
 import cn.hutool.crypto.symmetric.RC4;
 
 public class RC4Test {
-	
+
 	@Test
 	public void testCryptMessage() {
 		String key = "This is pretty long key";
@@ -16,7 +16,7 @@ public class RC4Test {
 		byte[] crypt = rc4.encrypt(message);
 		String msg = rc4.decrypt(crypt);
 		Assert.assertEquals(message, msg);
-		
+
 		String message2 = "Hello, World， this is megssage 2";
 		byte[] crypt2 = rc4.encrypt(message2);
 		String msg2 = rc4.decrypt(crypt2);
@@ -31,7 +31,7 @@ public class RC4Test {
 		byte[] crypt = rc4.encrypt(message);
 		String msg = rc4.decrypt(crypt);
 		Assert.assertEquals(message, msg);
-		
+
 		String message2 = "这是第二个中文消息！";
 		byte[] crypt2 = rc4.encrypt(message2);
 		String msg2 = rc4.decrypt(crypt2);
@@ -43,7 +43,7 @@ public class RC4Test {
 		String message = "这是第一个用来测试密文为十六进制字符串的消息！";
 		String key = "生成一个密钥";
 		RC4 rc4 = new RC4(key);
-		String encryptHex = rc4.encryptHex(message, CharsetUtil.CHARSET_UTF_8);
+		String encryptHex = rc4.encryptHex(message, CharsetUtil.UTF_8);
 		String msg = rc4.decrypt(encryptHex);
 		Assert.assertEquals(message, msg);
 
@@ -59,7 +59,7 @@ public class RC4Test {
 		String message = "这是第一个用来测试密文为Base64编码的消息！";
 		String key = "生成一个密钥";
 		RC4 rc4 = new RC4(key);
-		String encryptHex = rc4.encryptBase64(message, CharsetUtil.CHARSET_UTF_8);
+		String encryptHex = rc4.encryptBase64(message, CharsetUtil.UTF_8);
 		String msg = rc4.decrypt(encryptHex);
 		Assert.assertEquals(message, msg);
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/SymmetricTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/SymmetricTest.java
index a1f4e04e6..1ebcc9e4c 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/SymmetricTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/SymmetricTest.java
@@ -3,7 +3,7 @@ package cn.hutool.crypto.test.symmetric;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.CipherMode;
 import cn.hutool.crypto.KeyUtil;
 import cn.hutool.crypto.Mode;
@@ -43,12 +43,12 @@ public class SymmetricTest {
 		// 解密
 		byte[] decrypt = aes.decrypt(encrypt);
 
-		Assert.assertEquals(content, StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		Assert.assertEquals(content, StrUtil.str(decrypt, CharsetUtil.UTF_8));
 
 		// 加密为16进制表示
 		String encryptHex = aes.encryptHex(content);
 		// 解密为字符串
-		String decryptStr = aes.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
+		String decryptStr = aes.decryptStr(encryptHex, CharsetUtil.UTF_8);
 
 		Assert.assertEquals(content, decryptStr);
 	}
@@ -73,7 +73,7 @@ public class SymmetricTest {
 		// 加密为16进制表示
 		String encryptHex = aes.encryptHex(content);
 		// 解密为字符串
-		String decryptStr = aes.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
+		String decryptStr = aes.decryptStr(encryptHex, CharsetUtil.UTF_8);
 
 		Assert.assertEquals(content, decryptStr);
 	}
@@ -94,7 +94,7 @@ public class SymmetricTest {
 		// 加密为16进制表示
 		String encryptHex = aes.encryptHex(content);
 		// 解密为字符串
-		String decryptStr = aes.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
+		String decryptStr = aes.decryptStr(encryptHex, CharsetUtil.UTF_8);
 
 		Assert.assertEquals(content, decryptStr);
 	}
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/ZucTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/ZucTest.java
index 81524d95c..e3d33d3ef 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/ZucTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/ZucTest.java
@@ -16,7 +16,7 @@ public class ZucTest {
 
 		String msg = RandomUtil.randomString(500);
 		byte[] crypt2 = zuc.encrypt(msg);
-		String msg2 = zuc.decryptStr(crypt2, CharsetUtil.CHARSET_UTF_8);
+		String msg2 = zuc.decryptStr(crypt2, CharsetUtil.UTF_8);
 		Assert.assertEquals(msg, msg2);
 	}
 
@@ -28,7 +28,7 @@ public class ZucTest {
 
 		String msg = RandomUtil.randomString(500);
 		byte[] crypt2 = zuc.encrypt(msg);
-		String msg2 = zuc.decryptStr(crypt2, CharsetUtil.CHARSET_UTF_8);
+		String msg2 = zuc.decryptStr(crypt2, CharsetUtil.UTF_8);
 		Assert.assertEquals(msg, msg2);
 	}
 }
diff --git a/hutool-db/src/main/java/cn/hutool/db/DaoTemplate.java b/hutool-db/src/main/java/cn/hutool/db/DaoTemplate.java
index cdf1f9e7b..7b4e8e3ad 100644
--- a/hutool-db/src/main/java/cn/hutool/db/DaoTemplate.java
+++ b/hutool-db/src/main/java/cn/hutool/db/DaoTemplate.java
@@ -1,7 +1,7 @@
 package cn.hutool.db;
 
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.ds.DSFactory;
 
 import javax.sql.DataSource;
diff --git a/hutool-db/src/main/java/cn/hutool/db/DbRuntimeException.java b/hutool-db/src/main/java/cn/hutool/db/DbRuntimeException.java
index 085b1b86e..a16b0fc0b 100644
--- a/hutool-db/src/main/java/cn/hutool/db/DbRuntimeException.java
+++ b/hutool-db/src/main/java/cn/hutool/db/DbRuntimeException.java
@@ -1,7 +1,7 @@
 package cn.hutool.db;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 数据库异常
diff --git a/hutool-db/src/main/java/cn/hutool/db/DialectRunner.java b/hutool-db/src/main/java/cn/hutool/db/DialectRunner.java
index 24c535c4b..97703f95c 100644
--- a/hutool-db/src/main/java/cn/hutool/db/DialectRunner.java
+++ b/hutool-db/src/main/java/cn/hutool/db/DialectRunner.java
@@ -3,7 +3,7 @@ package cn.hutool.db;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.dialect.Dialect;
 import cn.hutool.db.dialect.DialectFactory;
 import cn.hutool.db.handler.NumberHandler;
diff --git a/hutool-db/src/main/java/cn/hutool/db/Entity.java b/hutool-db/src/main/java/cn/hutool/db/Entity.java
index adca98375..988fcf737 100755
--- a/hutool-db/src/main/java/cn/hutool/db/Entity.java
+++ b/hutool-db/src/main/java/cn/hutool/db/Entity.java
@@ -5,8 +5,8 @@ import cn.hutool.core.map.Dict;
 import cn.hutool.core.lang.func.Func0;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.reflect.ReflectUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.sql.SqlUtil;
 
 import java.nio.charset.Charset;
@@ -339,7 +339,7 @@ public class Entity extends Dict {
 
 	@Override
 	public String getStr(String field) {
-		return getStr(field, CharsetUtil.CHARSET_UTF_8);
+		return getStr(field, CharsetUtil.UTF_8);
 	}
 
 	/**
diff --git a/hutool-db/src/main/java/cn/hutool/db/Session.java b/hutool-db/src/main/java/cn/hutool/db/Session.java
index 9e6c34295..20be75655 100644
--- a/hutool-db/src/main/java/cn/hutool/db/Session.java
+++ b/hutool-db/src/main/java/cn/hutool/db/Session.java
@@ -1,7 +1,7 @@
 package cn.hutool.db;
 
 import cn.hutool.core.lang.func.VoidFunc1;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.dialect.Dialect;
 import cn.hutool.db.dialect.DialectFactory;
 import cn.hutool.db.ds.DSFactory;
diff --git a/hutool-db/src/main/java/cn/hutool/db/StatementUtil.java b/hutool-db/src/main/java/cn/hutool/db/StatementUtil.java
index b821c819e..915d5d2e0 100644
--- a/hutool-db/src/main/java/cn/hutool/db/StatementUtil.java
+++ b/hutool-db/src/main/java/cn/hutool/db/StatementUtil.java
@@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.handler.HandleHelper;
 import cn.hutool.db.handler.RsHandler;
 import cn.hutool.db.sql.NamedSql;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java b/hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java
index 133c189b7..00344cc00 100755
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java
@@ -2,7 +2,7 @@ package cn.hutool.db.dialect;
 
 import cn.hutool.core.util.ClassLoaderUtil;
 import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.dialect.impl.AnsiSqlDialect;
 import cn.hutool.db.dialect.impl.H2Dialect;
 import cn.hutool.db.dialect.impl.MysqlDialect;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/DialectName.java b/hutool-db/src/main/java/cn/hutool/db/dialect/DialectName.java
index 8e3d978b9..40152a2cc 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/DialectName.java
+++ b/hutool-db/src/main/java/cn/hutool/db/dialect/DialectName.java
@@ -1,6 +1,6 @@
 package cn.hutool.db.dialect;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 方言名
    
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/DriverUtil.java b/hutool-db/src/main/java/cn/hutool/db/dialect/DriverUtil.java
index 5f092955a..1ec3dbc16 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/DriverUtil.java
+++ b/hutool-db/src/main/java/cn/hutool/db/dialect/DriverUtil.java
@@ -6,21 +6,21 @@ import java.sql.SQLException;
 
 import javax.sql.DataSource;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.DbRuntimeException;
 import cn.hutool.db.DbUtil;
 import cn.hutool.db.ds.DataSourceWrapper;
 
 /**
  * 驱动相关工具类，包括自动获取驱动类名
- * 
+ *
  * @author looly
  * @since 4.0.10
  */
 public class DriverUtil {
 	/**
 	 * 通过JDBC URL等信息识别JDBC驱动名
-	 * 
+	 *
 	 * @param nameContainsProductInfo 包含数据库标识的字符串
 	 * @return 驱动
 	 * @see DialectFactory#identifyDriver(String)
@@ -31,7 +31,7 @@ public class DriverUtil {
 
 	/**
 	 * 识别JDBC驱动名
-	 * 
+	 *
 	 * @param ds 数据源
 	 * @return 驱动
 	 */
@@ -42,7 +42,7 @@ public class DriverUtil {
 				return driver;
 			}
 		}
-		
+
 		Connection conn = null;
 		String driver;
 		try {
@@ -63,7 +63,7 @@ public class DriverUtil {
 
 	/**
 	 * 识别JDBC驱动名
-	 * 
+	 *
 	 * @param conn 数据库连接对象
 	 * @return 驱动
 	 * @throws DbRuntimeException SQL异常包装，获取元数据信息失败
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/AnsiSqlDialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/AnsiSqlDialect.java
index a615a45f3..d88c6d555 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/AnsiSqlDialect.java
+++ b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/AnsiSqlDialect.java
@@ -3,7 +3,7 @@ package cn.hutool.db.dialect.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.DbRuntimeException;
 import cn.hutool.db.Entity;
 import cn.hutool.db.Page;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/H2Dialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/H2Dialect.java
index 110aea5f6..2150584c0 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/H2Dialect.java
+++ b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/H2Dialect.java
@@ -2,7 +2,7 @@ package cn.hutool.db.dialect.impl;
 
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.Entity;
 import cn.hutool.db.Page;
 import cn.hutool.db.StatementUtil;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/MysqlDialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/MysqlDialect.java
index a52cfa759..9304d111d 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/MysqlDialect.java
+++ b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/MysqlDialect.java
@@ -1,6 +1,6 @@
 package cn.hutool.db.dialect.impl;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.Entity;
 import cn.hutool.db.Page;
 import cn.hutool.db.StatementUtil;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/OracleDialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/OracleDialect.java
index 037aaf8a0..921842104 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/OracleDialect.java
+++ b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/OracleDialect.java
@@ -1,6 +1,6 @@
 package cn.hutool.db.dialect.impl;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.Page;
 import cn.hutool.db.dialect.DialectName;
 import cn.hutool.db.sql.SqlBuilder;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PostgresqlDialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PostgresqlDialect.java
index 1f5a90122..0b5713143 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PostgresqlDialect.java
+++ b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PostgresqlDialect.java
@@ -2,7 +2,7 @@ package cn.hutool.db.dialect.impl;
 
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.Entity;
 import cn.hutool.db.StatementUtil;
 import cn.hutool.db.dialect.DialectName;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/SqlServer2012Dialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/SqlServer2012Dialect.java
index 5a4ab8a0d..0287c97bf 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/SqlServer2012Dialect.java
+++ b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/SqlServer2012Dialect.java
@@ -1,6 +1,6 @@
 package cn.hutool.db.dialect.impl;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.Page;
 import cn.hutool.db.dialect.DialectName;
 import cn.hutool.db.sql.SqlBuilder;
@@ -8,7 +8,7 @@ import cn.hutool.db.sql.Wrapper;
 
 /**
  * SQLServer2012 方言
- * 
+ *
  * @author loolly
  *
  */
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/AbstractDSFactory.java b/hutool-db/src/main/java/cn/hutool/db/ds/AbstractDSFactory.java
index a585414c2..9fb30f6d3 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/AbstractDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/db/ds/AbstractDSFactory.java
@@ -2,7 +2,7 @@ package cn.hutool.db.ds;
 
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.DbRuntimeException;
 import cn.hutool.db.DbUtil;
 import cn.hutool.db.GlobalDbConfig;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/DSFactory.java b/hutool-db/src/main/java/cn/hutool/db/ds/DSFactory.java
index c389b280e..c2175b4bb 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/DSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/db/ds/DSFactory.java
@@ -1,6 +1,6 @@
 package cn.hutool.db.ds;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.ds.bee.BeeDSFactory;
 import cn.hutool.db.ds.c3p0.C3p0DSFactory;
 import cn.hutool.db.ds.dbcp.DbcpDSFactory;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/bee/BeeDSFactory.java b/hutool-db/src/main/java/cn/hutool/db/ds/bee/BeeDSFactory.java
index b3bfb11c4..974c8ce5b 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/bee/BeeDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/db/ds/bee/BeeDSFactory.java
@@ -2,7 +2,7 @@ package cn.hutool.db.ds.bee;
 
 import cn.beecp.BeeDataSource;
 import cn.beecp.BeeDataSourceConfig;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.ds.AbstractDSFactory;
 import cn.hutool.setting.Setting;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/c3p0/C3p0DSFactory.java b/hutool-db/src/main/java/cn/hutool/db/ds/c3p0/C3p0DSFactory.java
index 4f11a56bc..cdfb6fb1f 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/c3p0/C3p0DSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/db/ds/c3p0/C3p0DSFactory.java
@@ -1,7 +1,7 @@
 package cn.hutool.db.ds.c3p0;
 
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.DbRuntimeException;
 import cn.hutool.db.ds.AbstractDSFactory;
 import cn.hutool.setting.Setting;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/dbcp/DbcpDSFactory.java b/hutool-db/src/main/java/cn/hutool/db/ds/dbcp/DbcpDSFactory.java
index 3a13a8059..b764addbd 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/dbcp/DbcpDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/db/ds/dbcp/DbcpDSFactory.java
@@ -1,6 +1,6 @@
 package cn.hutool.db.ds.dbcp;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.ds.AbstractDSFactory;
 import cn.hutool.setting.Setting;
 import org.apache.commons.dbcp2.BasicDataSource;
@@ -9,13 +9,13 @@ import javax.sql.DataSource;
 
 /**
  * DBCP2数据源工厂类
- * 
+ *
  * @author Looly
  *
  */
 public class DbcpDSFactory extends AbstractDSFactory {
 	private static final long serialVersionUID = -9133501414334104548L;
-	
+
 	public static final String DS_NAME = "commons-dbcp2";
 
 	public DbcpDSFactory() {
@@ -25,11 +25,11 @@ public class DbcpDSFactory extends AbstractDSFactory {
 	public DbcpDSFactory(Setting setting) {
 		super(DS_NAME, BasicDataSource.class, setting);
 	}
-	
+
 	@Override
 	protected DataSource createDataSource(String jdbcUrl, String driver, String user, String pass, Setting poolSetting) {
 		final BasicDataSource ds = new BasicDataSource();
-		
+
 		ds.setUrl(jdbcUrl);
 		ds.setDriverClassName(driver);
 		ds.setUsername(user);
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/druid/DruidDSFactory.java b/hutool-db/src/main/java/cn/hutool/db/ds/druid/DruidDSFactory.java
index da99efcfd..be1c413d0 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/druid/DruidDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/db/ds/druid/DruidDSFactory.java
@@ -1,6 +1,6 @@
 package cn.hutool.db.ds.druid;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.ds.AbstractDSFactory;
 import cn.hutool.setting.Setting;
 import cn.hutool.setting.dialect.Props;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/hikari/HikariDSFactory.java b/hutool-db/src/main/java/cn/hutool/db/ds/hikari/HikariDSFactory.java
index 53e877f16..887b68496 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/hikari/HikariDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/db/ds/hikari/HikariDSFactory.java
@@ -1,6 +1,6 @@
 package cn.hutool.db.ds.hikari;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.ds.AbstractDSFactory;
 import cn.hutool.setting.Setting;
 import cn.hutool.setting.dialect.Props;
@@ -11,13 +11,13 @@ import javax.sql.DataSource;
 
 /**
  * HikariCP数据源工厂类
- * 
+ *
  * @author Looly
  *
  */
 public class HikariDSFactory extends AbstractDSFactory {
 	private static final long serialVersionUID = -8834744983614749401L;
-	
+
 	public static final String DS_NAME = "HikariCP";
 
 	public HikariDSFactory() {
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/jndi/JndiDSFactory.java b/hutool-db/src/main/java/cn/hutool/db/ds/jndi/JndiDSFactory.java
index d499ba189..6efeb7acd 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/jndi/JndiDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/db/ds/jndi/JndiDSFactory.java
@@ -2,7 +2,7 @@ package cn.hutool.db.ds.jndi;
 
 import javax.sql.DataSource;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.DbRuntimeException;
 import cn.hutool.db.DbUtil;
 import cn.hutool.db.ds.AbstractDSFactory;
@@ -15,13 +15,13 @@ import cn.hutool.setting.Setting;
  * [group]
    
  * jndi = jdbc/TestDB
    
  * ---------------------
    
- * 
+ *
  * @author Looly
  *
  */
 public class JndiDSFactory extends AbstractDSFactory {
 	private static final long serialVersionUID = 1573625812927370432L;
-	
+
 	public static final String DS_NAME = "JNDI DataSource";
 
 	public JndiDSFactory() {
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/DbSetting.java b/hutool-db/src/main/java/cn/hutool/db/ds/pooled/DbSetting.java
index bea1fed1f..fa42a6d22 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/DbSetting.java
+++ b/hutool-db/src/main/java/cn/hutool/db/ds/pooled/DbSetting.java
@@ -1,7 +1,7 @@
 package cn.hutool.db.ds.pooled;
 
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.DbRuntimeException;
 import cn.hutool.db.dialect.DriverUtil;
 import cn.hutool.db.ds.DSFactory;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDSFactory.java b/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDSFactory.java
index 1fa45f570..51d5a34ed 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDSFactory.java
@@ -1,6 +1,6 @@
 package cn.hutool.db.ds.pooled;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.ds.AbstractDSFactory;
 import cn.hutool.setting.Setting;
 
@@ -8,13 +8,13 @@ import javax.sql.DataSource;
 
 /**
  * Hutool自身实现的池化数据源工厂类
- * 
+ *
  * @author Looly
  *
  */
 public class PooledDSFactory extends AbstractDSFactory {
 	private static final long serialVersionUID = 8093886210895248277L;
-	
+
 	public static final String DS_NAME = "Hutool-Pooled-DataSource";
 
 	public PooledDSFactory() {
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java b/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java
index cad9b367c..bf720deca 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java
+++ b/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java
@@ -3,7 +3,7 @@ package cn.hutool.db.ds.pooled;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.DbRuntimeException;
 import cn.hutool.db.ds.simple.AbstractDataSource;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/simple/SimpleDataSource.java b/hutool-db/src/main/java/cn/hutool/db/ds/simple/SimpleDataSource.java
index cdbf7bcdf..b9a5be196 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/simple/SimpleDataSource.java
+++ b/hutool-db/src/main/java/cn/hutool/db/ds/simple/SimpleDataSource.java
@@ -1,7 +1,7 @@
 package cn.hutool.db.ds.simple;
 
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.DbRuntimeException;
 import cn.hutool.db.dialect.DriverUtil;
 import cn.hutool.db.ds.DSFactory;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/tomcat/TomcatDSFactory.java b/hutool-db/src/main/java/cn/hutool/db/ds/tomcat/TomcatDSFactory.java
index 9f7391929..e89bad993 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/tomcat/TomcatDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/db/ds/tomcat/TomcatDSFactory.java
@@ -1,6 +1,6 @@
 package cn.hutool.db.ds.tomcat;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.ds.AbstractDSFactory;
 import cn.hutool.setting.Setting;
 import cn.hutool.setting.dialect.Props;
@@ -9,13 +9,13 @@ import org.apache.tomcat.jdbc.pool.PoolProperties;
 
 /**
  * Tomcat-Jdbc-Pool数据源工厂类
- * 
+ *
  * @author Looly
  *
  */
 public class TomcatDSFactory extends AbstractDSFactory {
 	private static final long serialVersionUID = 4925514193275150156L;
-	
+
 	public static final String DS_NAME = "Tomcat-Jdbc-Pool";
 
 	/**
@@ -27,13 +27,13 @@ public class TomcatDSFactory extends AbstractDSFactory {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param setting Setting数据库配置
 	 */
 	public TomcatDSFactory(Setting setting) {
 		super(DS_NAME, DataSource.class, setting);
 	}
-	
+
 	@Override
 	protected javax.sql.DataSource createDataSource(String jdbcUrl, String driver, String user, String pass, Setting poolSetting) {
 		final PoolProperties poolProps = new PoolProperties();
@@ -55,7 +55,7 @@ public class TomcatDSFactory extends AbstractDSFactory {
 
 		// 连接池相关参数
 		poolSetting.toBean(poolProps);
-		
+
 		return new DataSource(poolProps);
 	}
 }
diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/HandleHelper.java b/hutool-db/src/main/java/cn/hutool/db/handler/HandleHelper.java
index 585dd5aa8..567a17cf4 100644
--- a/hutool-db/src/main/java/cn/hutool/db/handler/HandleHelper.java
+++ b/hutool-db/src/main/java/cn/hutool/db/handler/HandleHelper.java
@@ -5,8 +5,8 @@ import cn.hutool.core.bean.PropDesc;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.reflect.ReflectUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.core.util.TypeUtil;
 import cn.hutool.db.Entity;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/IndexInfo.java b/hutool-db/src/main/java/cn/hutool/db/meta/IndexInfo.java
index dd2cfb271..4a635f9a0 100644
--- a/hutool-db/src/main/java/cn/hutool/db/meta/IndexInfo.java
+++ b/hutool-db/src/main/java/cn/hutool/db/meta/IndexInfo.java
@@ -1,7 +1,7 @@
 package cn.hutool.db.meta;
 
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -121,8 +121,8 @@ public class IndexInfo implements Serializable, Cloneable {
 			return false;
 		}
 		IndexInfo indexInfo = (IndexInfo) o;
-		return ObjectUtil.equals(indexName, indexInfo.indexName)
-				&& ObjectUtil.equals(tableName, indexInfo.tableName);
+		return ObjUtil.equals(indexName, indexInfo.indexName)
+				&& ObjUtil.equals(tableName, indexInfo.tableName);
 	}
 
 	@Override
diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java b/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java
index 543c9430d..bd3c44b4b 100755
--- a/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java
+++ b/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java
@@ -2,7 +2,7 @@ package cn.hutool.db.meta;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.DbRuntimeException;
 import cn.hutool.db.DbUtil;
 import cn.hutool.db.Entity;
diff --git a/hutool-db/src/main/java/cn/hutool/db/nosql/mongo/MongoDS.java b/hutool-db/src/main/java/cn/hutool/db/nosql/mongo/MongoDS.java
index 65ce4fa7a..b78a9def5 100644
--- a/hutool-db/src/main/java/cn/hutool/db/nosql/mongo/MongoDS.java
+++ b/hutool-db/src/main/java/cn/hutool/db/nosql/mongo/MongoDS.java
@@ -2,7 +2,7 @@ package cn.hutool.db.nosql.mongo;
 
 import cn.hutool.core.exceptions.NotInitedException;
 import cn.hutool.core.net.NetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.DbRuntimeException;
 import cn.hutool.log.Log;
 import cn.hutool.setting.Setting;
diff --git a/hutool-db/src/main/java/cn/hutool/db/nosql/redis/RedisDS.java b/hutool-db/src/main/java/cn/hutool/db/nosql/redis/RedisDS.java
index 8145e745b..e434a0561 100755
--- a/hutool-db/src/main/java/cn/hutool/db/nosql/redis/RedisDS.java
+++ b/hutool-db/src/main/java/cn/hutool/db/nosql/redis/RedisDS.java
@@ -1,7 +1,7 @@
 package cn.hutool.db.nosql.redis;
 
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.setting.Setting;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/Condition.java b/hutool-db/src/main/java/cn/hutool/db/sql/Condition.java
index cfbfcc251..d50fe2e61 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/Condition.java
+++ b/hutool-db/src/main/java/cn/hutool/db/sql/Condition.java
@@ -6,7 +6,7 @@ import cn.hutool.core.text.StrSplitter;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/ConditionBuilder.java b/hutool-db/src/main/java/cn/hutool/db/sql/ConditionBuilder.java
index 2563e8edc..8278de65a 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/ConditionBuilder.java
+++ b/hutool-db/src/main/java/cn/hutool/db/sql/ConditionBuilder.java
@@ -4,7 +4,7 @@ import cn.hutool.core.builder.Builder;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/ConditionGroup.java b/hutool-db/src/main/java/cn/hutool/db/sql/ConditionGroup.java
index fb33305cd..3b47bc040 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/ConditionGroup.java
+++ b/hutool-db/src/main/java/cn/hutool/db/sql/ConditionGroup.java
@@ -1,7 +1,7 @@
 package cn.hutool.db.sql;
 
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.List;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/Direction.java b/hutool-db/src/main/java/cn/hutool/db/sql/Direction.java
index d8f1ee30c..0065b2c5e 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/Direction.java
+++ b/hutool-db/src/main/java/cn/hutool/db/sql/Direction.java
@@ -1,6 +1,6 @@
 package cn.hutool.db.sql;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 排序方式（升序或者降序）
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/LogicalOperator.java b/hutool-db/src/main/java/cn/hutool/db/sql/LogicalOperator.java
index bbde87123..7b02a91d8 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/LogicalOperator.java
+++ b/hutool-db/src/main/java/cn/hutool/db/sql/LogicalOperator.java
@@ -1,6 +1,6 @@
 package cn.hutool.db.sql;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 逻辑运算符
@@ -12,10 +12,10 @@ public enum LogicalOperator{
 	AND,
 	/** 或，满足多个条件的一个即可 */
 	OR;
-	
+
 	/**
 	 * 给定字符串逻辑运算符是否与当前逻辑运算符一致，不区分大小写，自动去除两边空白符
-	 * 
+	 *
 	 * @param logicalOperatorStr 逻辑运算符字符串
 	 * @return 是否与当前逻辑运算符一致
 	 * @since 3.2.1
@@ -26,4 +26,4 @@ public enum LogicalOperator{
 		}
 		return this.name().equalsIgnoreCase(logicalOperatorStr.trim());
 	}
-}
\ No newline at end of file
+}
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/NamedSql.java b/hutool-db/src/main/java/cn/hutool/db/sql/NamedSql.java
index df2de2e51..5ad2a4acb 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/NamedSql.java
+++ b/hutool-db/src/main/java/cn/hutool/db/sql/NamedSql.java
@@ -3,7 +3,7 @@ package cn.hutool.db.sql;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.text.StrBuilder;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/Order.java b/hutool-db/src/main/java/cn/hutool/db/sql/Order.java
index dfa3ae82e..ddf9f77ae 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/Order.java
+++ b/hutool-db/src/main/java/cn/hutool/db/sql/Order.java
@@ -2,7 +2,7 @@ package cn.hutool.db.sql;
 
 import java.io.Serializable;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * SQL排序对象
@@ -11,16 +11,16 @@ import cn.hutool.core.util.StrUtil;
  */
 public class Order implements Serializable{
 	private static final long serialVersionUID = 1L;
-	
+
 	/** 排序的字段 */
 	private String field;
 	/** 排序方式（正序还是反序） */
 	private Direction direction;
-	
+
 	//---------------------------------------------------------- Constructor start
 	public Order() {
 	}
-	
+
 	/**
 	 * 构造
 	 * @param field 排序字段
@@ -28,7 +28,7 @@ public class Order implements Serializable{
 	public Order(String field) {
 		this.field = field;
 	}
-	
+
 	/**
 	 * 构造
 	 * @param field 排序字段
@@ -38,7 +38,7 @@ public class Order implements Serializable{
 		this(field);
 		this.direction = direction;
 	}
-	
+
 	//---------------------------------------------------------- Constructor end
 
 	//---------------------------------------------------------- Getters and Setters start
@@ -70,7 +70,7 @@ public class Order implements Serializable{
 		this.direction = direction;
 	}
 	//---------------------------------------------------------- Getters and Setters end
-	
+
 	@Override
 	public String toString() {
 		return StrUtil.builder().append(this.field).append(StrUtil.SPACE).append(null == direction ? StrUtil.EMPTY : direction).toString();
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java b/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java
index a2a52634d..de04e7084 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java
+++ b/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java
@@ -3,7 +3,7 @@ package cn.hutool.db.sql;
 import cn.hutool.core.builder.Builder;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.DbRuntimeException;
 import cn.hutool.db.Entity;
 import cn.hutool.db.dialect.DialectName;
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlFormatter.java b/hutool-db/src/main/java/cn/hutool/db/sql/SqlFormatter.java
index 52b94663f..92cb95a5e 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlFormatter.java
+++ b/hutool-db/src/main/java/cn/hutool/db/sql/SqlFormatter.java
@@ -1,6 +1,6 @@
 package cn.hutool.db.sql;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.HashSet;
 import java.util.LinkedList;
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlUtil.java b/hutool-db/src/main/java/cn/hutool/db/sql/SqlUtil.java
index 7bd02948b..0f7c9a6b2 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlUtil.java
+++ b/hutool-db/src/main/java/cn/hutool/db/sql/SqlUtil.java
@@ -2,7 +2,7 @@ package cn.hutool.db.sql;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.DbRuntimeException;
 import cn.hutool.db.Entity;
 import cn.hutool.db.sql.Condition.LikeType;
@@ -143,7 +143,7 @@ public class SqlUtil {
 	 * @return RowId字符串
 	 */
 	public static String rowIdToString(RowId rowId) {
-		return StrUtil.str(rowId.getBytes(), CharsetUtil.CHARSET_ISO_8859_1);
+		return StrUtil.str(rowId.getBytes(), CharsetUtil.ISO_8859_1);
 	}
 
 	/**
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/Wrapper.java b/hutool-db/src/main/java/cn/hutool/db/sql/Wrapper.java
index 8851b2eac..14da8f2b4 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/Wrapper.java
+++ b/hutool-db/src/main/java/cn/hutool/db/sql/Wrapper.java
@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.Entity;
 
 import java.io.Serializable;
diff --git a/hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java b/hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java
index 4f3c6b315..fbc022c09 100644
--- a/hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java
@@ -2,7 +2,7 @@ package cn.hutool.db;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java b/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java
index 0abd88676..9345864ad 100644
--- a/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.db.meta;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.db.ds.DSFactory;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/JdkInterceptor.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/JdkInterceptor.java
index 8700a9b97..095f3bab2 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/JdkInterceptor.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/JdkInterceptor.java
@@ -2,7 +2,7 @@ package cn.hutool.extra.aop.interceptor;
 
 import cn.hutool.extra.aop.aspects.Aspect;
 import cn.hutool.core.util.ClassUtil;
-import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.reflect.ReflectUtil;
 
 import java.io.Serializable;
 import java.lang.reflect.InvocationHandler;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/ProxyFactory.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/ProxyFactory.java
index 39cd56303..aaa71134c 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/ProxyFactory.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/ProxyFactory.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.aop.proxy;
 
 import cn.hutool.extra.aop.aspects.Aspect;
-import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.reflect.ReflectUtil;
 import cn.hutool.core.util.ServiceLoaderUtil;
 
 import java.io.Serializable;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/cglib/BeanCopierCache.java b/hutool-extra/src/main/java/cn/hutool/extra/cglib/BeanCopierCache.java
index e40712d1c..15ec8df09 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/cglib/BeanCopierCache.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/cglib/BeanCopierCache.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.cglib;
 
 import cn.hutool.core.map.WeakConcurrentMap;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import net.sf.cglib.beans.BeanCopier;
 import net.sf.cglib.core.Converter;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/cglib/CglibUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/cglib/CglibUtil.java
index e90d395a8..3f6bcb1d6 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/cglib/CglibUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/cglib/CglibUtil.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.cglib;
 
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.reflect.ReflectUtil;
 import net.sf.cglib.beans.BeanCopier;
 import net.sf.cglib.beans.BeanMap;
 import net.sf.cglib.core.Converter;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressException.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressException.java
index a3691ca5b..2e95bbefa 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressException.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressException.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.compress;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 压缩解压异常语言异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressUtil.java
index f01eb2cee..2bcbc839c 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressUtil.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.compress;
 
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.compress.archiver.Archiver;
 import cn.hutool.extra.compress.archiver.SevenZArchiver;
 import cn.hutool.extra.compress.archiver.StreamArchiver;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/Archiver.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/Archiver.java
index 92ba28ea9..d2c70406c 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/Archiver.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/Archiver.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.compress.archiver;
 
 import cn.hutool.core.lang.func.Filter;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java
index 418e910c8..4353d4652 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java
@@ -5,7 +5,7 @@ import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.func.Filter;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.apache.commons.compress.archivers.sevenz.SevenZOutputFile;
 import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java
index 9111be46f..7ccb023cf 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java
@@ -5,7 +5,7 @@ import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.func.Filter;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.compress.CompressException;
 import org.apache.commons.compress.archivers.ArchiveException;
 import org.apache.commons.compress.archivers.ArchiveOutputStream;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java
index e3f015b8e..ecfd10ee7 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java
@@ -5,7 +5,7 @@ import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.func.Filter;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.sevenz.SevenZArchiveEntry;
 import org.apache.commons.compress.archivers.sevenz.SevenZFile;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java
index 9667273fb..f9225f8ad 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java
@@ -5,7 +5,7 @@ import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.func.Filter;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.compress.CompressException;
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.ArchiveException;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/ExpressionException.java b/hutool-extra/src/main/java/cn/hutool/extra/expression/ExpressionException.java
index f59ac433e..e9ec945f6 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/ExpressionException.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/expression/ExpressionException.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.expression;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 表达式语言异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/ExpressionFactory.java b/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/ExpressionFactory.java
index de805450d..89db052b9 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/ExpressionFactory.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/ExpressionFactory.java
@@ -2,7 +2,7 @@ package cn.hutool.extra.expression.engine;
 
 import cn.hutool.core.lang.Singleton;
 import cn.hutool.core.util.ServiceLoaderUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.StaticLog;
 
 import cn.hutool.extra.expression.ExpressionEngine;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ftp/AbstractFtp.java b/hutool-extra/src/main/java/cn/hutool/extra/ftp/AbstractFtp.java
index 052e79de6..b17274882 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/AbstractFtp.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/ftp/AbstractFtp.java
@@ -3,7 +3,7 @@ package cn.hutool.extra.ftp;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.Closeable;
 import java.io.File;
@@ -18,7 +18,7 @@ import java.util.List;
  */
 public abstract class AbstractFtp implements Closeable {
 
-	public static final Charset DEFAULT_CHARSET = CharsetUtil.CHARSET_UTF_8;
+	public static final Charset DEFAULT_CHARSET = CharsetUtil.UTF_8;
 
 	protected FtpConfig ftpConfig;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java b/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java
index 76c68b2ad..27f5d8b98 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java
@@ -7,7 +7,7 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.func.Filter;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPClientConfig;
 import org.apache.commons.net.ftp.FTPFile;
@@ -75,7 +75,7 @@ public class Ftp extends AbstractFtp {
 	 * @param password 密码
 	 */
 	public Ftp(String host, int port, String user, String password) {
-		this(host, port, user, password, CharsetUtil.CHARSET_UTF_8);
+		this(host, port, user, password, CharsetUtil.UTF_8);
 	}
 
 	/**
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpException.java b/hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpException.java
index f35dfc769..93d60047a 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpException.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpException.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.ftp;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * Ftp异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java b/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java
index 2d71b2dcc..098424f44 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java
@@ -5,8 +5,8 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.text.StrUtil;
 
 import javax.activation.DataHandler;
 import javax.activation.DataSource;
@@ -307,7 +307,7 @@ public class Mail implements Builder {
 	public Mail addImage(String cid, InputStream imageStream, String contentType) {
 		ByteArrayDataSource imgSource;
 		try {
-			imgSource = new ByteArrayDataSource(imageStream, ObjectUtil.defaultIfNull(contentType, "image/jpeg"));
+			imgSource = new ByteArrayDataSource(imageStream, ObjUtil.defaultIfNull(contentType, "image/jpeg"));
 		} catch (IOException e) {
 			throw new IORuntimeException(e);
 		}
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java
index f2d3aef9a..12b275a5f 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java
@@ -1,8 +1,8 @@
 package cn.hutool.extra.mail;
 
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.setting.Setting;
 
 import java.io.Serializable;
@@ -76,7 +76,7 @@ public class MailAccount implements Serializable {
 	/**
 	 * 编码用于编码邮件正文和发送人、收件人等中文
 	 */
-	private Charset charset = CharsetUtil.CHARSET_UTF_8;
+	private Charset charset = CharsetUtil.UTF_8;
 	/**
 	 * 对于超长参数是否切分为多份，默认为false（国内邮箱附件不支持切分的附件名）
 	 */
@@ -537,7 +537,7 @@ public class MailAccount implements Serializable {
 	 * @since 5.6.4
 	 */
 	public MailAccount setCustomProperty(String key, Object value) {
-		if (StrUtil.isNotBlank(key) && ObjectUtil.isNotNull(value)) {
+		if (StrUtil.isNotBlank(key) && ObjUtil.isNotNull(value)) {
 			this.customProperty.put(key, value);
 		}
 		return this;
@@ -622,7 +622,7 @@ public class MailAccount implements Serializable {
 		}
 		if (null == this.charset) {
 			// 默认UTF-8编码
-			this.charset = CharsetUtil.CHARSET_UTF_8;
+			this.charset = CharsetUtil.UTF_8;
 		}
 
 		return this;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailException.java b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailException.java
index 735a712ea..775526d4f 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailException.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailException.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.mail;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 邮件异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java
index 407959e13..dde310e0f 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java
@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import javax.mail.Authenticator;
 import javax.mail.Session;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinEngine.java
index 74e40bb3e..f69c903e3 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinEngine.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.pinyin;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.List;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinException.java b/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinException.java
index 7f2978ae3..b94747d35 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinException.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinException.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.pinyin;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 模板异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinUtil.java
index e1f618ac1..9796cb420 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinUtil.java
@@ -1,6 +1,6 @@
 package cn.hutool.extra.pinyin;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.pinyin.engine.PinyinFactory;
 
 /**
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/PinyinFactory.java b/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/PinyinFactory.java
index 7a2d318a4..895a884a4 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/PinyinFactory.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/PinyinFactory.java
@@ -2,7 +2,7 @@ package cn.hutool.extra.pinyin.engine;
 
 import cn.hutool.core.lang.Singleton;
 import cn.hutool.core.util.ServiceLoaderUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.StaticLog;
 
 import cn.hutool.extra.pinyin.PinyinEngine;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/bopomofo4j/Bopomofo4jEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/bopomofo4j/Bopomofo4jEngine.java
index 433f5d30b..70da6edaa 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/bopomofo4j/Bopomofo4jEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/bopomofo4j/Bopomofo4jEngine.java
@@ -1,6 +1,6 @@
 package cn.hutool.extra.pinyin.engine.bopomofo4j;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.pinyin.PinyinEngine;
 import com.rnkrsoft.bopomofo4j.Bopomofo4j;
 import com.rnkrsoft.bopomofo4j.ToneType;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/pinyin4j/Pinyin4jEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/pinyin4j/Pinyin4jEngine.java
index 241d12bdc..c68f334ab 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/pinyin4j/Pinyin4jEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/pinyin4j/Pinyin4jEngine.java
@@ -2,7 +2,7 @@ package cn.hutool.extra.pinyin.engine.pinyin4j;
 
 import cn.hutool.core.text.StrBuilder;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.pinyin.PinyinEngine;
 import cn.hutool.extra.pinyin.PinyinException;
 import net.sourceforge.pinyin4j.PinyinHelper;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeException.java b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeException.java
index 47bcd2761..48974f3ce 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeException.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeException.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.qrcode;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * Qrcode异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java
index 32593bafd..5a6c01597 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java
@@ -429,7 +429,7 @@ public class QrCodeUtil {
 	 */
 	private static Map buildHints(boolean isTryHarder, boolean isPureBarcode) {
 		final HashMap hints = new HashMap<>();
-		hints.put(DecodeHintType.CHARACTER_SET, CharsetUtil.UTF_8);
+		hints.put(DecodeHintType.CHARACTER_SET, CharsetUtil.NAME_UTF_8);
 
 		// 优化精度
 		if (isTryHarder) {
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java
index 2098e5d55..2e3e9a876 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java
@@ -39,7 +39,7 @@ public class QrConfig {
 	/** 纠错级别 */
 	protected ErrorCorrectionLevel errorCorrection = ErrorCorrectionLevel.M;
 	/** 编码 */
-	protected Charset charset = CharsetUtil.CHARSET_UTF_8;
+	protected Charset charset = CharsetUtil.UTF_8;
 	/** 二维码中的Logo */
 	protected Image img;
 	/** 二维码中的Logo缩放的比例系数，如5表示长宽最小值的1/5 */
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/servlet/JakartaServletUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/servlet/JakartaServletUtil.java
index 46e13be75..8461fee5e 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/servlet/JakartaServletUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/servlet/JakartaServletUtil.java
@@ -12,20 +12,20 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.map.CaseInsensitiveMap;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.net.NetUtil;
+import cn.hutool.core.net.URLEncoder;
 import cn.hutool.core.net.multipart.MultipartFormData;
 import cn.hutool.core.net.multipart.UploadSetting;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.URLUtil;
-
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.reflect.ReflectUtil;
+import cn.hutool.core.text.StrUtil;
 import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.File;
@@ -344,7 +344,7 @@ public class JakartaServletUtil {
 	public static String getHeader(HttpServletRequest request, String name, Charset charset) {
 		final String header = request.getHeader(name);
 		if (null != header) {
-			return CharsetUtil.convert(header, CharsetUtil.CHARSET_ISO_8859_1, charset);
+			return CharsetUtil.convert(header, CharsetUtil.ISO_8859_1, charset);
 		}
 		return null;
 	}
@@ -538,7 +538,7 @@ public class JakartaServletUtil {
 	 */
 	public static void write(HttpServletResponse response, File file) {
 		final String fileName = file.getName();
-		final String contentType = ObjectUtil.defaultIfNull(FileUtil.getMimeType(fileName), "application/octet-stream");
+		final String contentType = ObjUtil.defaultIfNull(FileUtil.getMimeType(fileName), "application/octet-stream");
 		BufferedInputStream in = null;
 		try {
 			in = FileUtil.getInputStream(file);
@@ -572,9 +572,9 @@ public class JakartaServletUtil {
 	 * @since 4.1.15
 	 */
 	public static void write(HttpServletResponse response, InputStream in, String contentType, String fileName) {
-		final String charset = ObjectUtil.defaultIfNull(response.getCharacterEncoding(), CharsetUtil.UTF_8);
+		final String charset = ObjUtil.defaultIfNull(response.getCharacterEncoding(), CharsetUtil.NAME_UTF_8);
 		response.setHeader("Content-Disposition", StrUtil.format("attachment;filename=\"{}\"",
-				URLUtil.encode(fileName, CharsetUtil.charset(charset))));
+				URLEncoder.encodeAll(fileName, CharsetUtil.charset(charset))));
 		response.setContentType(contentType);
 		write(response, in);
 	}
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java
index e76942fd2..9eb1000ab 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java
@@ -12,14 +12,14 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.map.CaseInsensitiveMap;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.net.NetUtil;
+import cn.hutool.core.net.URLEncoder;
 import cn.hutool.core.net.multipart.MultipartFormData;
 import cn.hutool.core.net.multipart.UploadSetting;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.URLUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.reflect.ReflectUtil;
+import cn.hutool.core.text.StrUtil;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.ServletRequest;
@@ -344,7 +344,7 @@ public class ServletUtil {
 	public static String getHeader(HttpServletRequest request, String name, Charset charset) {
 		final String header = request.getHeader(name);
 		if (null != header) {
-			return CharsetUtil.convert(header, CharsetUtil.CHARSET_ISO_8859_1, charset);
+			return CharsetUtil.convert(header, CharsetUtil.ISO_8859_1, charset);
 		}
 		return null;
 	}
@@ -538,7 +538,7 @@ public class ServletUtil {
 	 */
 	public static void write(HttpServletResponse response, File file) {
 		final String fileName = file.getName();
-		final String contentType = ObjectUtil.defaultIfNull(FileUtil.getMimeType(fileName), "application/octet-stream");
+		final String contentType = ObjUtil.defaultIfNull(FileUtil.getMimeType(fileName), "application/octet-stream");
 		BufferedInputStream in = null;
 		try {
 			in = FileUtil.getInputStream(file);
@@ -572,9 +572,9 @@ public class ServletUtil {
 	 * @since 4.1.15
 	 */
 	public static void write(HttpServletResponse response, InputStream in, String contentType, String fileName) {
-		final String charset = ObjectUtil.defaultIfNull(response.getCharacterEncoding(), CharsetUtil.UTF_8);
+		final String charset = ObjUtil.defaultIfNull(response.getCharacterEncoding(), CharsetUtil.NAME_UTF_8);
 		response.setHeader("Content-Disposition", StrUtil.format("attachment;filename=\"{}\"",
-				URLUtil.encode(fileName, CharsetUtil.charset(charset))));
+				URLEncoder.encodeAll(fileName, CharsetUtil.charset(charset))));
 		response.setContentType(contentType);
 		write(response, in);
 	}
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java
index b99fb515d..43d7e4271 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.spring;
 
 import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import cn.hutool.core.util.ArrayUtil;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.ListableBeanFactory;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/GanymedUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/ssh/GanymedUtil.java
index cbe3313a7..4bfa69132 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/GanymedUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/ssh/GanymedUtil.java
@@ -5,7 +5,7 @@ import ch.ethz.ssh2.Session;
 import ch.ethz.ssh2.StreamGobbler;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschRuntimeException.java b/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschRuntimeException.java
index 264c8c569..dfddfd89c 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschRuntimeException.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschRuntimeException.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.ssh;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * Jsch异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java b/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java
index 343f347b5..713bc38ee 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.ssh;
 
 import cn.hutool.core.cache.SimpleCache;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import com.jcraft.jsch.Session;
 
 import java.util.HashMap;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschUtil.java
index dfd14b087..8432fe326 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschUtil.java
@@ -5,7 +5,7 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.net.LocalPortGenerater;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import com.jcraft.jsch.*;
 
 import java.io.IOException;
@@ -439,7 +439,7 @@ public class JschUtil {
 	 */
 	public static String exec(Session session, String cmd, Charset charset, OutputStream errStream) {
 		if (null == charset) {
-			charset = CharsetUtil.CHARSET_UTF_8;
+			charset = CharsetUtil.UTF_8;
 		}
 		final ChannelExec channel = (ChannelExec) createChannel(session, ChannelType.EXEC);
 		channel.setCommand(StrUtil.bytes(cmd, charset));
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java b/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java
index 19a8611c7..c61297dc2 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java
@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.func.Filter;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.ftp.AbstractFtp;
 import cn.hutool.extra.ftp.FtpConfig;
 import cn.hutool.extra.ftp.FtpException;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/SshjSftp.java b/hutool-extra/src/main/java/cn/hutool/extra/ssh/SshjSftp.java
index d458420c1..9cb495e0d 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/SshjSftp.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/ssh/SshjSftp.java
@@ -3,7 +3,7 @@ package cn.hutool.extra.ssh;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.ftp.AbstractFtp;
 import cn.hutool.extra.ftp.FtpConfig;
 import cn.hutool.extra.ftp.FtpException;
@@ -42,7 +42,7 @@ public class SshjSftp extends AbstractFtp {
 	 * @param sshHost 主机
 	 */
 	public SshjSftp(String sshHost) {
-		this(new FtpConfig(sshHost, 22, null, null, CharsetUtil.CHARSET_UTF_8));
+		this(new FtpConfig(sshHost, 22, null, null, CharsetUtil.UTF_8));
 	}
 
 	/**
@@ -53,7 +53,7 @@ public class SshjSftp extends AbstractFtp {
 	 * @param sshPass 密码
 	 */
 	public SshjSftp(String sshHost, String sshUser, String sshPass) {
-		this(new FtpConfig(sshHost, 22, sshUser, sshPass, CharsetUtil.CHARSET_UTF_8));
+		this(new FtpConfig(sshHost, 22, sshUser, sshPass, CharsetUtil.UTF_8));
 	}
 
 	/**
@@ -65,7 +65,7 @@ public class SshjSftp extends AbstractFtp {
 	 * @param sshPass 密码
 	 */
 	public SshjSftp(String sshHost, int sshPort, String sshUser, String sshPass) {
-		this(new FtpConfig(sshHost, sshPort, sshUser, sshPass, CharsetUtil.CHARSET_UTF_8));
+		this(new FtpConfig(sshHost, sshPort, sshUser, sshPass, CharsetUtil.UTF_8));
 	}
 
 	/**
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/system/JavaRuntimeInfo.java b/hutool-extra/src/main/java/cn/hutool/extra/system/JavaRuntimeInfo.java
index 08f2f6262..760476ac1 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/system/JavaRuntimeInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/JavaRuntimeInfo.java
@@ -1,6 +1,6 @@
 package cn.hutool.extra.system;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/system/SystemUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/system/SystemUtil.java
index cbdd6a157..75d37117d 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/system/SystemUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/SystemUtil.java
@@ -2,7 +2,7 @@ package cn.hutool.extra.system;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Singleton;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.core.util.SystemPropsUtil;
 
 import java.io.PrintWriter;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/system/UserInfo.java b/hutool-extra/src/main/java/cn/hutool/extra/system/UserInfo.java
index ab9b66e78..8ce6da68e 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/system/UserInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/UserInfo.java
@@ -1,6 +1,6 @@
 package cn.hutool.extra.system;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.File;
 import java.io.Serializable;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateConfig.java b/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateConfig.java
index 47c922340..f786cfb8f 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateConfig.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateConfig.java
@@ -57,7 +57,7 @@ public class TemplateConfig implements Serializable {
 	 * @param resourceMode 模板资源加载方式
 	 */
 	public TemplateConfig(String path, ResourceMode resourceMode) {
-		this(CharsetUtil.CHARSET_UTF_8, path, resourceMode);
+		this(CharsetUtil.UTF_8, path, resourceMode);
 	}
 
 	/**
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateException.java b/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateException.java
index d7811e4c5..ec82b330d 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateException.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateException.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.template;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 模板异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/TemplateFactory.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/TemplateFactory.java
index f253811df..0ade7ac0b 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/TemplateFactory.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/TemplateFactory.java
@@ -1,9 +1,9 @@
 package cn.hutool.extra.template.engine;
 
 import cn.hutool.core.lang.Singleton;
-import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.reflect.ReflectUtil;
 import cn.hutool.core.util.ServiceLoaderUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateException;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java
index e7cc95244..623304bb0 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java
@@ -2,7 +2,7 @@ package cn.hutool.extra.template.engine.enjoy;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.id.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.extra.template.Template;
 import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateConfig.ResourceMode;
@@ -71,7 +71,7 @@ public class EnjoyEngine implements TemplateEngine {
 		if(null == this.engine){
 			init(TemplateConfig.DEFAULT);
 		}
-		if (ObjectUtil.equal(ResourceMode.STRING, this.resourceMode)) {
+		if (ObjUtil.equal(ResourceMode.STRING, this.resourceMode)) {
 			return EnjoyTemplate.wrap(this.engine.getTemplateByString(resource));
 		}
 		return EnjoyTemplate.wrap(this.engine.getTemplate(resource));
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java
index b3c13bf7a..95ec00cb0 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.template.engine.jetbrick;
 
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import cn.hutool.extra.template.AbstractTemplate;
 import jetbrick.template.JetTemplate;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/loader/StringResourceLoader.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/loader/StringResourceLoader.java
index 768970963..83af9b7f7 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/loader/StringResourceLoader.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/loader/StringResourceLoader.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.template.engine.jetbrick.loader;
 
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import jetbrick.io.resource.AbstractResource;
 import jetbrick.io.resource.Resource;
 import jetbrick.io.resource.ResourceNotFoundException;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java
index 19a42e095..f6014d899 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.template.engine.rythm;
 
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import cn.hutool.extra.template.AbstractTemplate;
 
 import java.io.OutputStream;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java
index 08c4a4fba..e961b70e6 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java
@@ -8,14 +8,14 @@ import org.thymeleaf.templateresolver.ITemplateResolver;
 import org.thymeleaf.templateresolver.StringTemplateResolver;
 
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.template.Template;
 import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateEngine;
 
 /**
  * Thymeleaf模板引擎实现
- * 
+ *
  * @author looly
  * @since 4.1.11
  */
@@ -32,7 +32,7 @@ public class ThymeleafEngine implements TemplateEngine {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param config 模板配置
 	 */
 	public ThymeleafEngine(TemplateConfig config) {
@@ -41,7 +41,7 @@ public class ThymeleafEngine implements TemplateEngine {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param engine {@link org.thymeleaf.TemplateEngine}
 	 */
 	public ThymeleafEngine(org.thymeleaf.TemplateEngine engine) {
@@ -77,7 +77,7 @@ public class ThymeleafEngine implements TemplateEngine {
 
 	/**
 	 * 创建引擎
-	 * 
+	 *
 	 * @param config 模板配置
 	 * @return {@link TemplateEngine}
 	 */
@@ -85,7 +85,7 @@ public class ThymeleafEngine implements TemplateEngine {
 		if (null == config) {
 			config = new TemplateConfig();
 		}
-		
+
 		ITemplateResolver resolver;
 		switch (config.getResourceMode()) {
 		case CLASSPATH:
@@ -116,7 +116,7 @@ public class ThymeleafEngine implements TemplateEngine {
 			resolver = new DefaultTemplateResolver();
 			break;
 		}
-		
+
 		final org.thymeleaf.TemplateEngine engine = new org.thymeleaf.TemplateEngine();
 		engine.setTemplateResolver(resolver);
 		return engine;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java
index 5056b185e..3da3d4ee0 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java
@@ -2,9 +2,9 @@ package cn.hutool.extra.template.engine.thymeleaf;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.extra.template.AbstractTemplate;
 import org.thymeleaf.TemplateEngine;
 import org.thymeleaf.context.Context;
@@ -51,7 +51,7 @@ public class ThymeleafTemplate extends AbstractTemplate implements Serializable
 	public ThymeleafTemplate(TemplateEngine engine, String template, Charset charset) {
 		this.engine = engine;
 		this.template = template;
-		this.charset = ObjectUtil.defaultIfNull(charset, CharsetUtil.CHARSET_UTF_8);
+		this.charset = ObjUtil.defaultIfNull(charset, CharsetUtil.UTF_8);
 	}
 
 	@Override
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/SimpleStringResourceLoader.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/SimpleStringResourceLoader.java
index 5dbc991ef..50dc92624 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/SimpleStringResourceLoader.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/SimpleStringResourceLoader.java
@@ -15,7 +15,7 @@ import cn.hutool.core.util.CharsetUtil;
 /**
  * {@link ResourceLoader} 的字符串实现形式
    
  * 用于直接获取字符串模板
- * 
+ *
  * @author looly
  *
  */
@@ -27,15 +27,15 @@ public class SimpleStringResourceLoader extends ResourceLoader {
 
 	/**
 	 * 获取资源流
-	 * 
+	 *
 	 * @param source 字符串模板
 	 * @return 流
 	 * @throws ResourceNotFoundException 资源未找到
 	 */
 	public InputStream getResourceStream(String source) throws ResourceNotFoundException {
-		return IoUtil.toStream(source, CharsetUtil.CHARSET_UTF_8);
+		return IoUtil.toStream(source, CharsetUtil.UTF_8);
 	}
-	
+
 	@Override
 	public Reader getResourceReader(String source, String encoding) throws ResourceNotFoundException {
 		return new StringReader(source);
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java
index fa8f0b22b..a04cb47b6 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java
@@ -1,6 +1,6 @@
 package cn.hutool.extra.template.engine.velocity;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.template.Template;
 import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateEngine;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityTemplate.java
index fc153820a..e2a1860ad 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityTemplate.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityTemplate.java
@@ -2,9 +2,9 @@ package cn.hutool.extra.template.engine.velocity;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.template.AbstractTemplate;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
@@ -75,6 +75,6 @@ public class VelocityTemplate extends AbstractTemplate implements Serializable {
 	 */
 	private void loadEncoding() {
 		final String charset = (String) Velocity.getProperty(Velocity.INPUT_ENCODING);
-		this.charset = StrUtil.isEmpty(charset) ? CharsetUtil.UTF_8 : charset;
+		this.charset = StrUtil.isEmpty(charset) ? CharsetUtil.NAME_UTF_8 : charset;
 	}
 }
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitTemplate.java
index dde1d49a8..ad1ab7f66 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitTemplate.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitTemplate.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.template.engine.wit;
 
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import cn.hutool.extra.template.AbstractTemplate;
 import org.febit.wit.Template;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerException.java b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerException.java
index 959eee9d7..826890f42 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerException.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerException.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.tokenizer;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 分词异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/TokenizerFactory.java b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/TokenizerFactory.java
index 515b074b3..0d61fbb90 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/TokenizerFactory.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/TokenizerFactory.java
@@ -2,7 +2,7 @@ package cn.hutool.extra.tokenizer.engine;
 
 import cn.hutool.core.lang.Singleton;
 import cn.hutool.core.util.ServiceLoaderUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.tokenizer.TokenizerEngine;
 import cn.hutool.extra.tokenizer.TokenizerException;
 import cn.hutool.log.StaticLog;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/AnalysisEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/AnalysisEngine.java
index da0ea9660..aea5f1492 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/AnalysisEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/AnalysisEngine.java
@@ -5,7 +5,7 @@ import java.io.IOException;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.tokenizer.Result;
 import cn.hutool.extra.tokenizer.TokenizerEngine;
 import cn.hutool.extra.tokenizer.TokenizerException;
@@ -13,7 +13,7 @@ import cn.hutool.extra.tokenizer.TokenizerException;
 /**
  * Lucene-analysis分词抽象封装
    
  * 项目地址：https://github.com/apache/lucene-solr/tree/master/lucene/analysis
- * 
+ *
  * @author looly
  *
  */
@@ -23,7 +23,7 @@ public class AnalysisEngine implements TokenizerEngine {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param analyzer 分析器{@link Analyzer}
 	 */
 	public AnalysisEngine(Analyzer analyzer) {
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ansj/AnsjEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ansj/AnsjEngine.java
index 63d3960bb..f8897a60a 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ansj/AnsjEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ansj/AnsjEngine.java
@@ -3,31 +3,31 @@ package cn.hutool.extra.tokenizer.engine.ansj;
 import org.ansj.splitWord.Analysis;
 import org.ansj.splitWord.analysis.ToAnalysis;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.tokenizer.Result;
 import cn.hutool.extra.tokenizer.TokenizerEngine;
 
 /**
  * Ansj分词引擎实现
    
  * 项目地址：https://github.com/NLPchina/ansj_seg
- * 
+ *
  * @author looly
  *
  */
 public class AnsjEngine implements TokenizerEngine {
 
 	private final Analysis analysis;
-	
+
 	/**
 	 * 构造
 	 */
 	public AnsjEngine() {
 		this(new ToAnalysis());
 	}
-	
+
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param analysis {@link Analysis}
 	 */
 	public AnsjEngine(Analysis analysis) {
@@ -38,5 +38,5 @@ public class AnsjEngine implements TokenizerEngine {
 	public Result parse(CharSequence text) {
 		return new AnsjResult(analysis.parseStr(StrUtil.str(text)));
 	}
-	
+
 }
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/hanlp/HanLPEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/hanlp/HanLPEngine.java
index 3823e6d7f..3b7f37b7a 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/hanlp/HanLPEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/hanlp/HanLPEngine.java
@@ -3,32 +3,32 @@ package cn.hutool.extra.tokenizer.engine.hanlp;
 import com.hankcs.hanlp.HanLP;
 import com.hankcs.hanlp.seg.Segment;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.tokenizer.TokenizerEngine;
 import cn.hutool.extra.tokenizer.Result;
 
 /**
  * HanLP分词引擎实现
    
  * 项目地址：https://github.com/hankcs/HanLP
- * 
+ *
  * @author looly
  *
  */
 public class HanLPEngine implements TokenizerEngine {
 
 	private final Segment seg;
-	
+
 	/**
 	 * 构造
-	 * 
+	 *
 	 */
 	public HanLPEngine() {
 		this(HanLP.newSegment());
 	}
-	
+
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param seg {@link Segment}
 	 */
 	public HanLPEngine(Segment seg) {
@@ -39,5 +39,5 @@ public class HanLPEngine implements TokenizerEngine {
 	public Result parse(CharSequence text) {
 		return new HanLPResult(this.seg.seg(StrUtil.str(text)));
 	}
-	
+
 }
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerEngine.java
index 6cb8c2e7a..8bd4e9b72 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerEngine.java
@@ -2,14 +2,14 @@ package cn.hutool.extra.tokenizer.engine.ikanalyzer;
 
 import org.wltea.analyzer.core.IKSegmenter;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.tokenizer.TokenizerEngine;
 import cn.hutool.extra.tokenizer.Result;
 
 /**
  * IKAnalyzer分词引擎实现
    
  * 项目地址：https://github.com/yozhao/IKAnalyzer
- * 
+ *
  * @author looly
  *
  */
@@ -19,7 +19,7 @@ public class IKAnalyzerEngine implements TokenizerEngine {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 */
 	public IKAnalyzerEngine() {
 		this(new IKSegmenter(null, true));
@@ -27,7 +27,7 @@ public class IKAnalyzerEngine implements TokenizerEngine {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param seg {@link IKSegmenter}
 	 */
 	public IKAnalyzerEngine(IKSegmenter seg) {
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jcseg/JcsegEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jcseg/JcsegEngine.java
index 698c59948..05c2ecd9b 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jcseg/JcsegEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jcseg/JcsegEngine.java
@@ -1,6 +1,6 @@
 package cn.hutool.extra.tokenizer.engine.jcseg;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.tokenizer.Result;
 import cn.hutool.extra.tokenizer.TokenizerEngine;
 import cn.hutool.extra.tokenizer.TokenizerException;
@@ -15,7 +15,7 @@ import java.io.StringReader;
 /**
  * Jcseg分词引擎实现
    
  * 项目地址：https://gitee.com/lionsoul/jcseg
- * 
+ *
  * @author looly
  *
  */
@@ -38,7 +38,7 @@ public class JcsegEngine implements TokenizerEngine {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param segment {@link ISegment}
 	 */
 	public JcsegEngine(ISegment segment) {
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jieba/JiebaEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jieba/JiebaEngine.java
index ce8009b7a..84e3be724 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jieba/JiebaEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jieba/JiebaEngine.java
@@ -3,14 +3,14 @@ package cn.hutool.extra.tokenizer.engine.jieba;
 import com.huaban.analysis.jieba.JiebaSegmenter;
 import com.huaban.analysis.jieba.JiebaSegmenter.SegMode;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.tokenizer.TokenizerEngine;
 import cn.hutool.extra.tokenizer.Result;
 
 /**
  * Jieba分词引擎实现
    
  * 项目地址：https://github.com/huaban/jieba-analysis
- * 
+ *
  * @author looly
  *
  */
@@ -18,17 +18,17 @@ public class JiebaEngine implements TokenizerEngine {
 
 	private final JiebaSegmenter jiebaSegmenter;
 	private final SegMode mode;
-	
+
 	/**
 	 * 构造
 	 */
 	public JiebaEngine() {
 		this(SegMode.SEARCH);
 	}
-	
+
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mode 模式{@link SegMode}
 	 */
 	public JiebaEngine(SegMode mode) {
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mmseg/MmsegEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mmseg/MmsegEngine.java
index 8ac234fd4..3a7c59ab1 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mmseg/MmsegEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mmseg/MmsegEngine.java
@@ -1,6 +1,6 @@
 package cn.hutool.extra.tokenizer.engine.mmseg;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.tokenizer.Result;
 import cn.hutool.extra.tokenizer.TokenizerEngine;
 import com.chenlb.mmseg4j.ComplexSeg;
@@ -12,14 +12,14 @@ import java.io.StringReader;
 /**
  * mmseg4j分词引擎实现
    
  * 项目地址：https://github.com/chenlb/mmseg4j-core
- * 
+ *
  * @author looly
  *
  */
 public class MmsegEngine implements TokenizerEngine {
 
 	private final MMSeg mmSeg;
-	
+
 	/**
 	 * 构造
 	 */
@@ -28,10 +28,10 @@ public class MmsegEngine implements TokenizerEngine {
 		final ComplexSeg seg = new ComplexSeg(dict);
 		this.mmSeg = new MMSeg(new StringReader(""), seg);
 	}
-	
+
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param mmSeg 模式{@link MMSeg}
 	 */
 	public MmsegEngine(MMSeg mmSeg) {
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mynlp/MynlpEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mynlp/MynlpEngine.java
index 1494c7538..fade50244 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mynlp/MynlpEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mynlp/MynlpEngine.java
@@ -4,31 +4,31 @@ import com.mayabot.nlp.segment.Lexer;
 import com.mayabot.nlp.segment.Lexers;
 import com.mayabot.nlp.segment.Sentence;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.tokenizer.Result;
 import cn.hutool.extra.tokenizer.TokenizerEngine;
 
 /**
  * MYNLP 中文NLP工具包分词实现
    
  * 项目地址：https://github.com/mayabot/mynlp/
- * 
+ *
  * @author looly
  *
  */
 public class MynlpEngine implements TokenizerEngine {
 
 	private final Lexer lexer;
-	
+
 	/**
 	 * 构造
 	 */
 	public MynlpEngine() {
 		this.lexer = Lexers.core();
 	}
-	
+
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param lexer 分词器接口{@link Lexer}
 	 */
 	public MynlpEngine(Lexer lexer) {
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/word/WordEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/word/WordEngine.java
index b021c205d..7d75b5e3e 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/word/WordEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/word/WordEngine.java
@@ -4,19 +4,19 @@ import org.apdplat.word.segmentation.Segmentation;
 import org.apdplat.word.segmentation.SegmentationAlgorithm;
 import org.apdplat.word.segmentation.SegmentationFactory;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.tokenizer.Result;
 import cn.hutool.extra.tokenizer.TokenizerEngine;
 
 /**
  * Word分词引擎实现
    
  * 项目地址：https://github.com/ysc/word
- * 
+ *
  * @author looly
  *
  */
 public class WordEngine implements TokenizerEngine {
-	
+
 	private final Segmentation segmentation;
 
 	/**
@@ -25,25 +25,25 @@ public class WordEngine implements TokenizerEngine {
 	public WordEngine() {
 		this(SegmentationAlgorithm.BidirectionalMaximumMatching);
 	}
-	
+
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param algorithm {@link SegmentationAlgorithm}分词算法枚举
 	 */
 	public WordEngine(SegmentationAlgorithm algorithm) {
 		this(SegmentationFactory.getSegmentation(algorithm));
 	}
-	
+
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param segmentation {@link Segmentation}分词实现
 	 */
 	public WordEngine(Segmentation segmentation) {
 		this.segmentation = segmentation;
 	}
-	
+
 	@Override
 	public Result parse(CharSequence text) {
 		return new WordResult(this.segmentation.seg(StrUtil.str(text)));
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java b/hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java
index 326ee30c9..40c7dc88b 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java
@@ -16,7 +16,7 @@ public class ArchiverTest {
 	@Ignore
 	public void zipTest(){
 		final File file = FileUtil.file("d:/test/compress/test.zip");
-		StreamArchiver.create(CharsetUtil.CHARSET_UTF_8, ArchiveStreamFactory.ZIP, file)
+		StreamArchiver.create(CharsetUtil.UTF_8, ArchiveStreamFactory.ZIP, file)
 				.add(FileUtil.file("d:/Java"), (f)->{
 					Console.log("Add: {}", f.getPath());
 					return true;
@@ -28,7 +28,7 @@ public class ArchiverTest {
 	@Ignore
 	public void tarTest(){
 		final File file = FileUtil.file("d:/test/compress/test.tar");
-		StreamArchiver.create(CharsetUtil.CHARSET_UTF_8, ArchiveStreamFactory.TAR, file)
+		StreamArchiver.create(CharsetUtil.UTF_8, ArchiveStreamFactory.TAR, file)
 				.add(FileUtil.file("d:/Java"), (f)->{
 					Console.log("Add: {}", f.getPath());
 					return true;
@@ -40,7 +40,7 @@ public class ArchiverTest {
 	@Ignore
 	public void cpioTest(){
 		final File file = FileUtil.file("d:/test/compress/test.cpio");
-		StreamArchiver.create(CharsetUtil.CHARSET_UTF_8, ArchiveStreamFactory.CPIO, file)
+		StreamArchiver.create(CharsetUtil.UTF_8, ArchiveStreamFactory.CPIO, file)
 				.add(FileUtil.file("d:/Java"), (f)->{
 					Console.log("Add: {}", f.getPath());
 					return true;
@@ -52,7 +52,7 @@ public class ArchiverTest {
 	@Ignore
 	public void sevenZTest(){
 		final File file = FileUtil.file("d:/test/compress/test.7z");
-		CompressUtil.createArchiver(CharsetUtil.CHARSET_UTF_8, ArchiveStreamFactory.SEVEN_Z, file)
+		CompressUtil.createArchiver(CharsetUtil.UTF_8, ArchiveStreamFactory.SEVEN_Z, file)
 				.add(FileUtil.file("d:/Java/apache-maven-3.6.3"), (f)->{
 					Console.log("Add: {}", f.getPath());
 					return true;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/servlet/ServletUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/servlet/ServletUtilTest.java
index 444b3d9fb..24227483a 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/servlet/ServletUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/servlet/ServletUtilTest.java
@@ -1,6 +1,6 @@
 package cn.hutool.extra.servlet;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java
index 17fb1ed13..fdb044c40 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java
@@ -1,6 +1,6 @@
 package cn.hutool.extra.spring;
 
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import cn.hutool.core.map.MapUtil;
 import lombok.Data;
 import org.junit.Assert;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java b/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java
index ff116b284..15582b5e5 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java
@@ -1,6 +1,6 @@
 package cn.hutool.extra.spring;
 
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import cn.hutool.core.map.MapUtil;
 import lombok.Data;
 import org.junit.Assert;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/ssh/SftpTest.java b/hutool-extra/src/test/java/cn/hutool/extra/ssh/SftpTest.java
index 1de875877..07c443c1c 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/ssh/SftpTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/ssh/SftpTest.java
@@ -21,7 +21,7 @@ public class SftpTest {
 	@Before
 	@Ignore
 	public void init() {
-		sshjSftp = new SshjSftp("ip", 22, "test", "test", CharsetUtil.CHARSET_UTF_8);
+		sshjSftp = new SshjSftp("ip", 22, "test", "test", CharsetUtil.UTF_8);
 	}
 
 	@Test
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java
index f0f6c4c11..e77d1bd76 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.template;
 
 import cn.hutool.core.map.Dict;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.template.engine.jetbrick.JetbrickEngine;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java
index b14937d5a..c8838cb3f 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.template;
 
 import cn.hutool.core.map.Dict;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.extra.template.TemplateConfig.ResourceMode;
 import cn.hutool.extra.template.engine.beetl.BeetlEngine;
 import cn.hutool.extra.template.engine.enjoy.EnjoyEngine;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java
index 5ec9b43a3..d5839b061 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java
@@ -12,7 +12,7 @@ public class VelocityTest {
 	public void charsetTest(){
 		final TemplateConfig config = new TemplateConfig("templates", TemplateConfig.ResourceMode.CLASSPATH);
 		config.setCustomEngine(VelocityEngine.class);
-		config.setCharset(CharsetUtil.CHARSET_GBK);
+		config.setCharset(CharsetUtil.GBK);
 		final TemplateEngine engine = TemplateUtil.createEngine(config);
 		Template template = engine.getTemplate("velocity_test_gbk.vtl");
 		String result = template.render(Dict.create().set("name", "hutool"));
diff --git a/hutool-http/src/main/java/cn/hutool/http/ContentType.java b/hutool-http/src/main/java/cn/hutool/http/ContentType.java
index 7c1759a2d..0d4755dd1 100644
--- a/hutool-http/src/main/java/cn/hutool/http/ContentType.java
+++ b/hutool-http/src/main/java/cn/hutool/http/ContentType.java
@@ -1,6 +1,6 @@
 package cn.hutool.http;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.nio.charset.Charset;
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/GlobalHeaders.java b/hutool-http/src/main/java/cn/hutool/http/GlobalHeaders.java
index 210d17d60..cd3d0ee44 100644
--- a/hutool-http/src/main/java/cn/hutool/http/GlobalHeaders.java
+++ b/hutool-http/src/main/java/cn/hutool/http/GlobalHeaders.java
@@ -2,7 +2,7 @@ package cn.hutool.http;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java b/hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java
index d680698d8..d018049d4 100755
--- a/hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java
+++ b/hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java
@@ -2,7 +2,7 @@ package cn.hutool.http;
 
 import cn.hutool.core.text.escape.EscapeUtil;
 import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * HTML工具类
diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpBase.java b/hutool-http/src/main/java/cn/hutool/http/HttpBase.java
index 8b3ebe441..3bca14e82 100644
--- a/hutool-http/src/main/java/cn/hutool/http/HttpBase.java
+++ b/hutool-http/src/main/java/cn/hutool/http/HttpBase.java
@@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.CaseInsensitiveMap;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.nio.charset.Charset;
 import java.util.ArrayList;
@@ -27,7 +27,7 @@ public abstract class HttpBase {
 	/**
 	 * 默认的请求编码、URL的encode、decode编码
 	 */
-	protected static final Charset DEFAULT_CHARSET = CharsetUtil.CHARSET_UTF_8;
+	protected static final Charset DEFAULT_CHARSET = CharsetUtil.UTF_8;
 
 	/**
 	 * HTTP/1.0
diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpConnection.java b/hutool-http/src/main/java/cn/hutool/http/HttpConnection.java
index 44114a3ed..edbdbf7f9 100644
--- a/hutool-http/src/main/java/cn/hutool/http/HttpConnection.java
+++ b/hutool-http/src/main/java/cn/hutool/http/HttpConnection.java
@@ -1,10 +1,10 @@
 package cn.hutool.http;
 
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.URLUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.reflect.ReflectUtil;
+import cn.hutool.core.text.StrUtil;
+import cn.hutool.core.net.URLUtil;
 import cn.hutool.http.ssl.DefaultSSLInfo;
 
 import javax.net.ssl.HostnameVerifier;
@@ -267,8 +267,8 @@ public class HttpConnection {
 			// Https请求
 			final HttpsURLConnection httpsConn = (HttpsURLConnection) conn;
 			// 验证域
-			httpsConn.setHostnameVerifier(ObjectUtil.defaultIfNull(hostnameVerifier, DefaultSSLInfo.TRUST_ANY_HOSTNAME_VERIFIER));
-			httpsConn.setSSLSocketFactory(ObjectUtil.defaultIfNull(ssf, DefaultSSLInfo.DEFAULT_SSF));
+			httpsConn.setHostnameVerifier(ObjUtil.defaultIfNull(hostnameVerifier, DefaultSSLInfo.TRUST_ANY_HOSTNAME_VERIFIER));
+			httpsConn.setSSLSocketFactory(ObjUtil.defaultIfNull(ssf, DefaultSSLInfo.DEFAULT_SSF));
 		}
 
 		return this;
diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpException.java b/hutool-http/src/main/java/cn/hutool/http/HttpException.java
index bd24d2a56..907874d8b 100644
--- a/hutool-http/src/main/java/cn/hutool/http/HttpException.java
+++ b/hutool-http/src/main/java/cn/hutool/http/HttpException.java
@@ -1,6 +1,6 @@
 package cn.hutool.http;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * HTTP异常
diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpGlobalConfig.java b/hutool-http/src/main/java/cn/hutool/http/HttpGlobalConfig.java
index a215caac8..d8221a9a6 100755
--- a/hutool-http/src/main/java/cn/hutool/http/HttpGlobalConfig.java
+++ b/hutool-http/src/main/java/cn/hutool/http/HttpGlobalConfig.java
@@ -2,7 +2,7 @@ package cn.hutool.http;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.reflect.ReflectUtil;
 import cn.hutool.http.cookie.GlobalCookieManager;
 
 import java.io.Serializable;
diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpInputStream.java b/hutool-http/src/main/java/cn/hutool/http/HttpInputStream.java
index 9dc6b0205..903f418b5 100644
--- a/hutool-http/src/main/java/cn/hutool/http/HttpInputStream.java
+++ b/hutool-http/src/main/java/cn/hutool/http/HttpInputStream.java
@@ -1,6 +1,6 @@
 package cn.hutool.http;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java b/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java
index 004493164..57c8dc667 100755
--- a/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java
+++ b/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java
@@ -14,8 +14,8 @@ import cn.hutool.core.net.SSLUtil;
 import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.net.url.UrlQuery;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.http.body.BytesBody;
 import cn.hutool.http.body.FormUrlEncodedBody;
 import cn.hutool.http.body.MultipartBody;
@@ -482,7 +482,7 @@ public class HttpRequest extends HttpBase {
 	 * @return this
 	 */
 	public HttpRequest form(String name, Object value) {
-		if (StrUtil.isBlank(name) || ObjectUtil.isNull(value)) {
+		if (StrUtil.isBlank(name) || ObjUtil.isNull(value)) {
 			return this; // 忽略非法的form表单项内容;
 		}
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java b/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java
index 94b154e30..5b32ef3d0 100755
--- a/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java
+++ b/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java
@@ -7,9 +7,9 @@ import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.io.StreamProgress;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.net.URLEncoder;
 import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.URLUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.http.cookie.GlobalCookieManager;
 
 import java.io.ByteArrayInputStream;
@@ -439,10 +439,10 @@ public class HttpResponse extends HttpBase implements Closeable {
 			fileName = StrUtil.subSuf(path, path.lastIndexOf('/') + 1);
 			if (StrUtil.isBlank(fileName)) {
 				// 编码后的路径做为文件名
-				fileName = URLUtil.encodeQuery(path, charset);
+				fileName = URLEncoder.encodeQuery(path, charset);
 			} else {
 				// issue#I4K0FS@Gitee
-				fileName = URLUtil.decode(fileName, charset);
+				fileName = URLEncoder.encodeQuery(fileName, charset);
 			}
 		}
 		return FileUtil.file(targetFileOrDir, fileName);
diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java b/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java
index e8eb311ba..6f8a49730 100755
--- a/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java
+++ b/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java
@@ -7,13 +7,13 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.io.StreamProgress;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.net.RFC3986;
+import cn.hutool.core.net.URLEncoder;
 import cn.hutool.core.net.url.UrlQuery;
+import cn.hutool.core.regex.ReUtil;
 import cn.hutool.core.text.StrBuilder;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.URLUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.http.cookie.GlobalCookieManager;
 import cn.hutool.http.server.SimpleServer;
 
@@ -433,7 +433,7 @@ public class HttpUtil {
 	 * @return url参数
 	 */
 	public static String toParams(Map paramMap) {
-		return toParams(paramMap, CharsetUtil.CHARSET_UTF_8);
+		return toParams(paramMap, CharsetUtil.UTF_8);
 	}
 
 	/**
@@ -560,13 +560,13 @@ public class HttpUtil {
 
 		// 结尾处理
 		if (null != name) {
-			builder.append(URLUtil.encodeQuery(name, charset)).append('=');
+			builder.append(URLEncoder.encodeQuery(name, charset)).append('=');
 		}
 		if (pos != i) {
 			if (null == name && pos > 0) {
 				builder.append('=');
 			}
-			builder.append(URLUtil.encodeQuery(paramPart.substring(pos, i), charset));
+			builder.append(URLEncoder.encodeQuery(paramPart.substring(pos, i), charset));
 		}
 
 		// 以&结尾则去除之
@@ -746,7 +746,7 @@ public class HttpUtil {
 		}
 
 		if (null == charset) {
-			charset = CharsetUtil.CHARSET_UTF_8;
+			charset = CharsetUtil.UTF_8;
 		}
 		String content = new String(contentBytes, charset);
 		if (isGetCharsetFromContent) {
@@ -757,9 +757,9 @@ public class HttpUtil {
 					charsetInContent = Charset.forName(charsetInContentStr);
 				} catch (Exception e) {
 					if (StrUtil.containsIgnoreCase(charsetInContentStr, "utf-8") || StrUtil.containsIgnoreCase(charsetInContentStr, "utf8")) {
-						charsetInContent = CharsetUtil.CHARSET_UTF_8;
+						charsetInContent = CharsetUtil.UTF_8;
 					} else if (StrUtil.containsIgnoreCase(charsetInContentStr, "gbk")) {
-						charsetInContent = CharsetUtil.CHARSET_GBK;
+						charsetInContent = CharsetUtil.GBK;
 					}
 					// ignore
 				}
@@ -781,7 +781,7 @@ public class HttpUtil {
 	 * @since 4.6.5
 	 */
 	public static String getMimeType(String filePath, String defaultValue) {
-		return ObjectUtil.defaultIfNull(getMimeType(filePath), defaultValue);
+		return ObjUtil.defaultIfNull(getMimeType(filePath), defaultValue);
 	}
 
 	/**
diff --git a/hutool-http/src/main/java/cn/hutool/http/MultipartOutputStream.java b/hutool-http/src/main/java/cn/hutool/http/MultipartOutputStream.java
index 53f905aca..24064df7f 100644
--- a/hutool-http/src/main/java/cn/hutool/http/MultipartOutputStream.java
+++ b/hutool-http/src/main/java/cn/hutool/http/MultipartOutputStream.java
@@ -6,7 +6,7 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.io.resource.MultiResource;
 import cn.hutool.core.io.resource.Resource;
 import cn.hutool.core.io.resource.StringResource;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/hutool-http/src/main/java/cn/hutool/http/body/FormUrlEncodedBody.java b/hutool-http/src/main/java/cn/hutool/http/body/FormUrlEncodedBody.java
index aa675b0a2..546c9b042 100644
--- a/hutool-http/src/main/java/cn/hutool/http/body/FormUrlEncodedBody.java
+++ b/hutool-http/src/main/java/cn/hutool/http/body/FormUrlEncodedBody.java
@@ -1,7 +1,7 @@
 package cn.hutool.http.body;
 
 import cn.hutool.core.net.url.UrlQuery;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.nio.charset.Charset;
 import java.util.Map;
diff --git a/hutool-http/src/main/java/cn/hutool/http/cookie/GlobalCookieManager.java b/hutool-http/src/main/java/cn/hutool/http/cookie/GlobalCookieManager.java
index e815e7263..77ff11990 100644
--- a/hutool-http/src/main/java/cn/hutool/http/cookie/GlobalCookieManager.java
+++ b/hutool-http/src/main/java/cn/hutool/http/cookie/GlobalCookieManager.java
@@ -1,7 +1,7 @@
 package cn.hutool.http.cookie;
 
 import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.util.URLUtil;
+import cn.hutool.core.net.URLUtil;
 import cn.hutool.http.HttpConnection;
 
 import java.io.IOException;
@@ -15,7 +15,7 @@ import java.util.Map;
 
 /**
  * 全局Cookie管理器，只针对Hutool请求有效
- * 
+ *
  * @author Looly
  * @since 4.5.15
  */
@@ -26,19 +26,19 @@ public class GlobalCookieManager {
 	static {
 		cookieManager = new CookieManager(new ThreadLocalCookieStore(), CookiePolicy.ACCEPT_ALL);
 	}
-	
+
 	/**
 	 * 自定义{@link CookieManager}
-	 * 
+	 *
 	 * @param customCookieManager 自定义的{@link CookieManager}
 	 */
 	public static void setCookieManager(CookieManager customCookieManager) {
 		cookieManager = customCookieManager;
 	}
-	
+
 	/**
 	 * 获取全局{@link CookieManager}
-	 * 
+	 *
 	 * @return {@link CookieManager}
 	 */
 	public static CookieManager getCookieManager() {
@@ -58,7 +58,7 @@ public class GlobalCookieManager {
 
 	/**
 	 * 将本地存储的Cookie信息附带到Http请求中，不覆盖用户定义好的Cookie
-	 * 
+	 *
 	 * @param conn {@link HttpConnection}
 	 */
 	public static void add(HttpConnection conn) {
@@ -81,7 +81,7 @@ public class GlobalCookieManager {
 
 	/**
 	 * 存储响应的Cookie信息到本地
-	 * 
+	 *
 	 * @param conn {@link HttpConnection}
 	 */
 	public static void store(HttpConnection conn) {
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/HttpServerBase.java b/hutool-http/src/main/java/cn/hutool/http/server/HttpServerBase.java
index ab0ba5920..669795718 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/HttpServerBase.java
+++ b/hutool-http/src/main/java/cn/hutool/http/server/HttpServerBase.java
@@ -15,7 +15,7 @@ import java.nio.charset.Charset;
  */
 public class HttpServerBase implements Closeable {
 
-	final static Charset DEFAULT_CHARSET = CharsetUtil.CHARSET_UTF_8;
+	final static Charset DEFAULT_CHARSET = CharsetUtil.UTF_8;
 
 	final HttpExchange httpExchange;
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/HttpServerRequest.java b/hutool-http/src/main/java/cn/hutool/http/server/HttpServerRequest.java
index 124ae2bfd..03a60a45e 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/HttpServerRequest.java
+++ b/hutool-http/src/main/java/cn/hutool/http/server/HttpServerRequest.java
@@ -10,7 +10,7 @@ import cn.hutool.core.net.multipart.MultipartFormData;
 import cn.hutool.core.net.multipart.UploadSetting;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.http.Header;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.http.Method;
@@ -145,7 +145,7 @@ public class HttpServerRequest extends HttpServerBase {
 	public String getHeader(String headerKey, Charset charset) {
 		final String header = getHeader(headerKey);
 		if (null != header) {
-			return CharsetUtil.convert(header, CharsetUtil.CHARSET_ISO_8859_1, charset);
+			return CharsetUtil.convert(header, CharsetUtil.ISO_8859_1, charset);
 		}
 		return null;
 	}
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/HttpServerResponse.java b/hutool-http/src/main/java/cn/hutool/http/server/HttpServerResponse.java
index bfc9f039d..772820e76 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/HttpServerResponse.java
+++ b/hutool-http/src/main/java/cn/hutool/http/server/HttpServerResponse.java
@@ -3,9 +3,9 @@ package cn.hutool.http.server;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.URLUtil;
+import cn.hutool.core.net.URLEncoder;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.http.ContentType;
 import cn.hutool.http.Header;
 import cn.hutool.http.HttpStatus;
@@ -255,7 +255,7 @@ public class HttpServerResponse extends HttpServerBase {
 	 * @return 响应数据流
 	 */
 	public PrintWriter getWriter() {
-		final Charset charset = ObjectUtil.defaultIfNull(this.charset, DEFAULT_CHARSET);
+		final Charset charset = ObjUtil.defaultIfNull(this.charset, DEFAULT_CHARSET);
 		return new PrintWriter(new OutputStreamWriter(getOut(), charset));
 	}
 
@@ -278,7 +278,7 @@ public class HttpServerResponse extends HttpServerBase {
 	 * @return this
 	 */
 	public HttpServerResponse write(String data) {
-		final Charset charset = ObjectUtil.defaultIfNull(this.charset, DEFAULT_CHARSET);
+		final Charset charset = ObjUtil.defaultIfNull(this.charset, DEFAULT_CHARSET);
 		return write(StrUtil.bytes(data, charset));
 	}
 
@@ -391,7 +391,7 @@ public class HttpServerResponse extends HttpServerBase {
 		if(StrUtil.isBlank(fileName)){
 			fileName = file.getName();
 		}
-		final String contentType = ObjectUtil.defaultIfNull(HttpUtil.getMimeType(fileName), "application/octet-stream");
+		final String contentType = ObjUtil.defaultIfNull(HttpUtil.getMimeType(fileName), "application/octet-stream");
 		BufferedInputStream in = null;
 		try {
 			in = FileUtil.getInputStream(file);
@@ -425,11 +425,11 @@ public class HttpServerResponse extends HttpServerBase {
 	 * @since 5.2.7
 	 */
 	public HttpServerResponse write(InputStream in, int length, String contentType, String fileName) {
-		final Charset charset = ObjectUtil.defaultIfNull(this.charset, DEFAULT_CHARSET);
+		final Charset charset = ObjUtil.defaultIfNull(this.charset, DEFAULT_CHARSET);
 
 		if (false == contentType.startsWith("text/")) {
 			// 非文本类型数据直接走下载
-			setHeader(Header.CONTENT_DISPOSITION, StrUtil.format("attachment;filename={}", URLUtil.encode(fileName, charset)));
+			setHeader(Header.CONTENT_DISPOSITION, StrUtil.format("attachment;filename={}", URLEncoder.encodeAll(fileName, charset)));
 		}
 		return write(in, length, contentType);
 	}
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/SimpleServer.java b/hutool-http/src/main/java/cn/hutool/http/server/SimpleServer.java
index 05dc1ed62..97fd2d632 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/SimpleServer.java
+++ b/hutool-http/src/main/java/cn/hutool/http/server/SimpleServer.java
@@ -3,7 +3,7 @@ package cn.hutool.http.server;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.thread.GlobalThreadPool;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.http.server.action.Action;
 import cn.hutool.http.server.action.RootAction;
 import cn.hutool.http.server.filter.HttpFilter;
diff --git a/hutool-http/src/main/java/cn/hutool/http/ssl/DefaultSSLInfo.java b/hutool-http/src/main/java/cn/hutool/http/ssl/DefaultSSLInfo.java
index a5b7a9708..fad532a73 100644
--- a/hutool-http/src/main/java/cn/hutool/http/ssl/DefaultSSLInfo.java
+++ b/hutool-http/src/main/java/cn/hutool/http/ssl/DefaultSSLInfo.java
@@ -1,6 +1,6 @@
 package cn.hutool.http.ssl;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import javax.net.ssl.SSLSocketFactory;
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentParser.java b/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentParser.java
index d0f2a7fc3..02413a1fe 100644
--- a/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentParser.java
+++ b/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentParser.java
@@ -1,6 +1,6 @@
 package cn.hutool.http.useragent;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * User-Agent解析器
diff --git a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java b/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java
index 35b155fff..825106ee9 100644
--- a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java
+++ b/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java
@@ -3,8 +3,8 @@ package cn.hutool.http.webservice;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.core.util.XmlUtil;
 import cn.hutool.http.HttpBase;
 import cn.hutool.http.HttpGlobalConfig;
@@ -356,7 +356,7 @@ public class SoapClient extends HttpBase {
 	 * @return this
 	 */
 	public SoapClient setMethod(String methodName) {
-		return setMethod(methodName, ObjectUtil.defaultIfNull(this.namespaceURI, XMLConstants.NULL_NS_URI));
+		return setMethod(methodName, ObjUtil.defaultIfNull(this.namespaceURI, XMLConstants.NULL_NS_URI));
 	}
 
 	/**
diff --git a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapRuntimeException.java b/hutool-http/src/main/java/cn/hutool/http/webservice/SoapRuntimeException.java
index fdb9e5325..c1287743b 100644
--- a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapRuntimeException.java
+++ b/hutool-http/src/main/java/cn/hutool/http/webservice/SoapRuntimeException.java
@@ -1,10 +1,10 @@
 package cn.hutool.http.webservice;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * SOAP异常
- * 
+ *
  * @author xiaoleilu
  */
 public class SoapRuntimeException extends RuntimeException {
diff --git a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapUtil.java b/hutool-http/src/main/java/cn/hutool/http/webservice/SoapUtil.java
index 6c3c20151..d90d70daf 100644
--- a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapUtil.java
+++ b/hutool-http/src/main/java/cn/hutool/http/webservice/SoapUtil.java
@@ -14,7 +14,7 @@ import cn.hutool.core.util.XmlUtil;
 
 /**
  * SOAP相关工具类
- * 
+ *
  * @author looly
  * @since 4.5.7
  */
@@ -22,7 +22,7 @@ public class SoapUtil {
 
 	/**
 	 * 创建SOAP客户端，默认使用soap1.1版本协议
-	 * 
+	 *
 	 * @param url WS的URL地址
 	 * @return {@link SoapClient}
 	 */
@@ -32,7 +32,7 @@ public class SoapUtil {
 
 	/**
 	 * 创建SOAP客户端
-	 * 
+	 *
 	 * @param url WS的URL地址
 	 * @param protocol 协议，见{@link SoapProtocol}
 	 * @return {@link SoapClient}
@@ -43,7 +43,7 @@ public class SoapUtil {
 
 	/**
 	 * 创建SOAP客户端
-	 * 
+	 *
 	 * @param url WS的URL地址
 	 * @param protocol 协议，见{@link SoapProtocol}
 	 * @param namespaceURI 方法上的命名空间URI
@@ -62,7 +62,7 @@ public class SoapUtil {
 	 * @return SOAP XML字符串
 	 */
 	public static String toString(SOAPMessage message, boolean pretty) {
-		return toString(message, pretty, CharsetUtil.CHARSET_UTF_8);
+		return toString(message, pretty, CharsetUtil.UTF_8);
 	}
 
 	/**
diff --git a/hutool-http/src/test/java/cn/hutool/http/ContentTypeTest.java b/hutool-http/src/test/java/cn/hutool/http/ContentTypeTest.java
index 1d03c44eb..f63aae398 100644
--- a/hutool-http/src/test/java/cn/hutool/http/ContentTypeTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/ContentTypeTest.java
@@ -13,7 +13,7 @@ public class ContentTypeTest {
 
 	@Test
 	public void testBuild() {
-		String result = ContentType.build(ContentType.JSON, CharsetUtil.CHARSET_UTF_8);
+		String result = ContentType.build(ContentType.JSON, CharsetUtil.UTF_8);
 		Assert.assertEquals("application/json;charset=UTF-8", result);
 	}
 }
diff --git a/hutool-http/src/test/java/cn/hutool/http/HttpRequestTest.java b/hutool-http/src/test/java/cn/hutool/http/HttpRequestTest.java
index 765218027..d648512e2 100644
--- a/hutool-http/src/test/java/cn/hutool/http/HttpRequestTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/HttpRequestTest.java
@@ -95,7 +95,7 @@ public class HttpRequestTest {
 		// 自定义构建HTTP GET请求，发送Http GET请求，针对HTTPS安全加密，可以自定义SSL
 		HttpRequest request = HttpRequest.get(url)
 				// 自定义返回编码
-				.charset(CharsetUtil.CHARSET_GBK)
+				.charset(CharsetUtil.GBK)
 				// 禁用缓存
 				.disableCache()
 				// 自定义SSL版本
diff --git a/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java b/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java
index 06629d514..8caee4373 100755
--- a/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java
@@ -20,7 +20,7 @@ public class HttpUtilTest {
 	@Ignore
 	public void postTest() {
 		String result = HttpUtil.createPost("api.uhaozu.com/goods/description/1120448506")
-				.charset(CharsetUtil.UTF_8)
+				.charset(CharsetUtil.NAME_UTF_8)
 				.execute().body();
 		Console.log(result);
 	}
@@ -40,7 +40,7 @@ public class HttpUtilTest {
 	@Test
 	@Ignore
 	public void getTest() {
-		String result1 = HttpUtil.get("http://photo.qzone.qq.com/fcgi-bin/fcg_list_album?uin=88888&outstyle=2", CharsetUtil.CHARSET_GBK);
+		String result1 = HttpUtil.get("http://photo.qzone.qq.com/fcgi-bin/fcg_list_album?uin=88888&outstyle=2", CharsetUtil.GBK);
 		Console.log(result1);
 	}
 
@@ -97,7 +97,7 @@ public class HttpUtilTest {
 	public void downloadStringTest() {
 		String url = "https://www.baidu.com";
 		// 从远程直接读取字符串，需要自定义编码，直接调用JDK方法
-		String content2 = HttpUtil.downloadString(url, CharsetUtil.UTF_8);
+		String content2 = HttpUtil.downloadString(url, CharsetUtil.NAME_UTF_8);
 		Console.log(content2);
 	}
 
@@ -121,7 +121,7 @@ public class HttpUtilTest {
 	@Test
 	public void decodeParamsTest() {
 		String paramsStr = "uuuu=0&a=b&c=%3F%23%40!%24%25%5E%26%3Ddsssss555555";
-		Map> map = HttpUtil.decodeParams(paramsStr, CharsetUtil.UTF_8);
+		Map> map = HttpUtil.decodeParams(paramsStr, CharsetUtil.NAME_UTF_8);
 		Assert.assertEquals("0", map.get("uuuu").get(0));
 		Assert.assertEquals("b", map.get("a").get(0));
 		Assert.assertEquals("?#@!$%^&=dsssss555555", map.get("c").get(0));
@@ -130,7 +130,7 @@ public class HttpUtilTest {
 	@Test
 	public void decodeParamMapTest() {
 		// 参数值存在分界标记等号时
-		Map paramMap = HttpUtil.decodeParamMap("https://www.xxx.com/api.action?aa=123&f_token=NzBkMjQxNDM1MDVlMDliZTk1OTU3ZDI1OTI0NTBiOWQ=", CharsetUtil.CHARSET_UTF_8);
+		Map paramMap = HttpUtil.decodeParamMap("https://www.xxx.com/api.action?aa=123&f_token=NzBkMjQxNDM1MDVlMDliZTk1OTU3ZDI1OTI0NTBiOWQ=", CharsetUtil.UTF_8);
 		Assert.assertEquals("123",paramMap.get("aa"));
 		Assert.assertEquals("NzBkMjQxNDM1MDVlMDliZTk1OTU3ZDI1OTI0NTBiOWQ=",paramMap.get("f_token"));
 	}
@@ -138,7 +138,7 @@ public class HttpUtilTest {
 	@Test
 	public void toParamsTest() {
 		String paramsStr = "uuuu=0&a=b&c=3Ddsssss555555";
-		Map> map = HttpUtil.decodeParams(paramsStr, CharsetUtil.UTF_8);
+		Map> map = HttpUtil.decodeParams(paramsStr, CharsetUtil.NAME_UTF_8);
 
 		String encodedParams = HttpUtil.toParams(map);
 		Assert.assertEquals(paramsStr, encodedParams);
@@ -148,52 +148,52 @@ public class HttpUtilTest {
 	public void encodeParamTest() {
 		// ?单独存在去除之，&单位位于末尾去除之
 		String paramsStr = "?a=b&c=d&";
-		String encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
+		String encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.UTF_8);
 		Assert.assertEquals("a=b&c=d", encode);
 
 		// url不参与转码
 		paramsStr = "http://www.abc.dd?a=b&c=d&";
-		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
+		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.UTF_8);
 		Assert.assertEquals("http://www.abc.dd?a=b&c=d", encode);
 
 		// b=b中的=被当作值的一部分，不做encode
 		paramsStr = "a=b=b&c=d&";
-		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
+		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.UTF_8);
 		Assert.assertEquals("a=b=b&c=d", encode);
 
 		// =d的情况被处理为key为空
 		paramsStr = "a=bbb&c=d&=d";
-		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
+		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.UTF_8);
 		Assert.assertEquals("a=bbb&c=d&=d", encode);
 
 		// d=的情况被处理为value为空
 		paramsStr = "a=bbb&c=d&d=";
-		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
+		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.UTF_8);
 		Assert.assertEquals("a=bbb&c=d&d=", encode);
 
 		// 多个&&被处理为单个，相当于空条件
 		paramsStr = "a=bbb&c=d&&&d=";
-		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
+		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.UTF_8);
 		Assert.assertEquals("a=bbb&c=d&d=", encode);
 
 		// &d&相当于只有键，无值得情况
 		paramsStr = "a=bbb&c=d&d&";
-		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
+		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.UTF_8);
 		Assert.assertEquals("a=bbb&c=d&d=", encode);
 
 		// 中文的键和值被编码
 		paramsStr = "a=bbb&c=你好&哈喽&";
-		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
+		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.UTF_8);
 		Assert.assertEquals("a=bbb&c=%E4%BD%A0%E5%A5%BD&%E5%93%88%E5%96%BD=", encode);
 
 		// URL原样输出
 		paramsStr = "https://www.hutool.cn/";
-		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
+		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.UTF_8);
 		Assert.assertEquals(paramsStr, encode);
 
 		// URL原样输出
 		paramsStr = "https://www.hutool.cn/?";
-		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
+		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.UTF_8);
 		Assert.assertEquals("https://www.hutool.cn/", encode);
 	}
 
@@ -201,41 +201,41 @@ public class HttpUtilTest {
 	public void decodeParamTest() {
 		// 开头的？被去除
 		String a = "?a=b&c=d&";
-		Map> map = HttpUtil.decodeParams(a, CharsetUtil.UTF_8);
+		Map> map = HttpUtil.decodeParams(a, CharsetUtil.NAME_UTF_8);
 		Assert.assertEquals("b", map.get("a").get(0));
 		Assert.assertEquals("d", map.get("c").get(0));
 
 		// =e被当作空为key，e为value
 		a = "?a=b&c=d&=e";
-		map = HttpUtil.decodeParams(a, CharsetUtil.UTF_8);
+		map = HttpUtil.decodeParams(a, CharsetUtil.NAME_UTF_8);
 		Assert.assertEquals("b", map.get("a").get(0));
 		Assert.assertEquals("d", map.get("c").get(0));
 		Assert.assertEquals("e", map.get("").get(0));
 
 		// 多余的&去除
 		a = "?a=b&c=d&=e&&&&";
-		map = HttpUtil.decodeParams(a, CharsetUtil.UTF_8);
+		map = HttpUtil.decodeParams(a, CharsetUtil.NAME_UTF_8);
 		Assert.assertEquals("b", map.get("a").get(0));
 		Assert.assertEquals("d", map.get("c").get(0));
 		Assert.assertEquals("e", map.get("").get(0));
 
 		// 值为空
 		a = "?a=b&c=d&e=";
-		map = HttpUtil.decodeParams(a, CharsetUtil.UTF_8);
+		map = HttpUtil.decodeParams(a, CharsetUtil.NAME_UTF_8);
 		Assert.assertEquals("b", map.get("a").get(0));
 		Assert.assertEquals("d", map.get("c").get(0));
 		Assert.assertEquals("", map.get("e").get(0));
 
 		// &=被作为键和值都为空
 		a = "a=b&c=d&=";
-		map = HttpUtil.decodeParams(a, CharsetUtil.UTF_8);
+		map = HttpUtil.decodeParams(a, CharsetUtil.NAME_UTF_8);
 		Assert.assertEquals("b", map.get("a").get(0));
 		Assert.assertEquals("d", map.get("c").get(0));
 		Assert.assertEquals("", map.get("").get(0));
 
 		// &e&这类单独的字符串被当作key
 		a = "a=b&c=d&e&";
-		map = HttpUtil.decodeParams(a, CharsetUtil.UTF_8);
+		map = HttpUtil.decodeParams(a, CharsetUtil.NAME_UTF_8);
 		Assert.assertEquals("b", map.get("a").get(0));
 		Assert.assertEquals("d", map.get("c").get(0));
 		Assert.assertNull(map.get("e").get(0));
@@ -243,7 +243,7 @@ public class HttpUtilTest {
 
 		// 被编码的键和值被还原
 		a = "a=bbb&c=%E4%BD%A0%E5%A5%BD&%E5%93%88%E5%96%BD=";
-		map = HttpUtil.decodeParams(a, CharsetUtil.UTF_8);
+		map = HttpUtil.decodeParams(a, CharsetUtil.NAME_UTF_8);
 		Assert.assertEquals("bbb", map.get("a").get(0));
 		Assert.assertEquals("你好", map.get("c").get(0));
 		Assert.assertEquals("", map.get("哈喽").get(0));
@@ -270,12 +270,12 @@ public class HttpUtilTest {
 		param.put("Timestamp", 123432453);
 		param.put("Version", "1.0");
 
-		String urlWithForm = HttpUtil.urlWithForm("http://api.hutool.cn/login?type=aaa", param, CharsetUtil.CHARSET_UTF_8, false);
+		String urlWithForm = HttpUtil.urlWithForm("http://api.hutool.cn/login?type=aaa", param, CharsetUtil.UTF_8, false);
 		Assert.assertEquals(
 				"http://api.hutool.cn/login?type=aaa&AccessKeyId=123&Action=DescribeDomainRecords&Format=date&DomainName=lesper.cn&SignatureMethod=POST&SignatureNonce=123&SignatureVersion=4.3.1&Timestamp=123432453&Version=1.0",
 				urlWithForm);
 
-		urlWithForm = HttpUtil.urlWithForm("http://api.hutool.cn/login?type=aaa", param, CharsetUtil.CHARSET_UTF_8, false);
+		urlWithForm = HttpUtil.urlWithForm("http://api.hutool.cn/login?type=aaa", param, CharsetUtil.UTF_8, false);
 		Assert.assertEquals(
 				"http://api.hutool.cn/login?type=aaa&AccessKeyId=123&Action=DescribeDomainRecords&Format=date&DomainName=lesper.cn&SignatureMethod=POST&SignatureNonce=123&SignatureVersion=4.3.1&Timestamp=123432453&Version=1.0",
 				urlWithForm);
@@ -298,13 +298,13 @@ public class HttpUtilTest {
 
 	@Test
 	public void normalizeParamsTest() {
-		String encodeResult = HttpUtil.normalizeParams("参数", CharsetUtil.CHARSET_UTF_8);
+		String encodeResult = HttpUtil.normalizeParams("参数", CharsetUtil.UTF_8);
 		Assert.assertEquals("%E5%8F%82%E6%95%B0", encodeResult);
 	}
 
 	@Test
 	public void normalizeBlankParamsTest() {
-		String encodeResult = HttpUtil.normalizeParams("", CharsetUtil.CHARSET_UTF_8);
+		String encodeResult = HttpUtil.normalizeParams("", CharsetUtil.UTF_8);
 		Assert.assertEquals("", encodeResult);
 	}
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/body/MultipartBodyTest.java b/hutool-http/src/test/java/cn/hutool/http/body/MultipartBodyTest.java
index 471b6813c..a923f5ff8 100644
--- a/hutool-http/src/test/java/cn/hutool/http/body/MultipartBodyTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/body/MultipartBodyTest.java
@@ -20,7 +20,7 @@ public class MultipartBodyTest {
 		form.put("pic3", new HttpResource(
 				new StringResource("pic3 content", "pic3.jpg"), "image/jpeg"));
 
-		final MultipartBody body = MultipartBody.create(form, CharsetUtil.CHARSET_UTF_8);
+		final MultipartBody body = MultipartBody.create(form, CharsetUtil.UTF_8);
 
 		Assert.assertNotNull(body.toString());
 //		Console.log(body);
diff --git a/hutool-http/src/test/java/cn/hutool/http/webservice/SoapClientTest.java b/hutool-http/src/test/java/cn/hutool/http/webservice/SoapClientTest.java
index 52b46791b..877e7e04a 100644
--- a/hutool-http/src/test/java/cn/hutool/http/webservice/SoapClientTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/webservice/SoapClientTest.java
@@ -21,7 +21,7 @@ public class SoapClientTest {
 	public void requestTest() {
 		SoapClient client = SoapClient.create("http://www.webxml.com.cn/WebServices/IpAddressSearchWebService.asmx")
 		.setMethod("web:getCountryCityByIp", "http://WebXml.com.cn/")
-		.setCharset(CharsetUtil.CHARSET_GBK)
+		.setCharset(CharsetUtil.GBK)
 		.setParam("theIpAddress", "218.21.240.106");
 
 		Console.log(client.getMsgStr(true));
diff --git a/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java b/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java
index 16e631356..4f757736b 100755
--- a/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java
+++ b/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java
@@ -9,8 +9,8 @@ import cn.hutool.core.map.CaseInsensitiveTreeMap;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.math.BigDecimal;
 import java.util.Collection;
@@ -37,7 +37,7 @@ public final class InternalJSONUtil {
 	 * @throws JSONException If o is a non-finite number.
 	 */
 	static Object testValidity(Object obj) throws JSONException {
-		if (false == ObjectUtil.isValidIfNumber(obj)) {
+		if (false == ObjUtil.isValidIfNumber(obj)) {
 			throw new JSONException("JSON does not allow non-finite numbers.");
 		}
 		return obj;
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSON.java b/hutool-json/src/main/java/cn/hutool/json/JSON.java
index 69f060eae..48653586a 100755
--- a/hutool-json/src/main/java/cn/hutool/json/JSON.java
+++ b/hutool-json/src/main/java/cn/hutool/json/JSON.java
@@ -1,7 +1,7 @@
 package cn.hutool.json;
 
 import cn.hutool.core.bean.BeanPath;
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 
 import java.io.Serializable;
 import java.io.StringWriter;
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONArray.java b/hutool-json/src/main/java/cn/hutool/json/JSONArray.java
index 802170618..a49c0128f 100755
--- a/hutool-json/src/main/java/cn/hutool/json/JSONArray.java
+++ b/hutool-json/src/main/java/cn/hutool/json/JSONArray.java
@@ -7,7 +7,7 @@ import cn.hutool.core.lang.mutable.Mutable;
 import cn.hutool.core.lang.mutable.MutableObj;
 import cn.hutool.core.lang.mutable.MutablePair;
 import cn.hutool.core.text.StrJoiner;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.json.serialize.JSONWriter;
 
 import java.io.StringWriter;
@@ -90,7 +90,7 @@ public class JSONArray implements JSON, JSONGetter, List, Rando
 	 */
 	public JSONArray(int initialCapacity, JSONConfig config) {
 		this.rawList = new ArrayList<>(initialCapacity);
-		this.config = ObjectUtil.defaultIfNull(config, JSONConfig::create);
+		this.config = ObjUtil.defaultIfNull(config, JSONConfig::create);
 	}
 
 	/**
@@ -557,7 +557,7 @@ public class JSONArray implements JSON, JSONGetter, List, Rando
 	@Override
 	public Object clone() throws CloneNotSupportedException {
 		final JSONArray clone = (JSONArray) super.clone();
-		clone.rawList = ObjectUtil.clone(this.rawList);
+		clone.rawList = ObjUtil.clone(this.rawList);
 		return clone;
 	}
 
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONConverter.java b/hutool-json/src/main/java/cn/hutool/json/JSONConverter.java
index 674ee98d1..044b656d4 100644
--- a/hutool-json/src/main/java/cn/hutool/json/JSONConverter.java
+++ b/hutool-json/src/main/java/cn/hutool/json/JSONConverter.java
@@ -7,9 +7,9 @@ import cn.hutool.core.convert.Converter;
 import cn.hutool.core.convert.ConverterRegistry;
 import cn.hutool.core.convert.impl.ArrayConverter;
 import cn.hutool.core.convert.impl.BeanConverter;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.reflect.ReflectUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.core.util.TypeUtil;
 import cn.hutool.json.serialize.GlobalSerializeMapping;
 import cn.hutool.json.serialize.JSONDeserializer;
@@ -135,7 +135,7 @@ public class JSONConverter implements Converter {
 				return null;
 			}
 
-			throw new ConvertException("Can not convert {} to type {}", value, ObjectUtil.defaultIfNull(TypeUtil.getClass(targetType), targetType));
+			throw new ConvertException("Can not convert {} to type {}", value, ObjUtil.defaultIfNull(TypeUtil.getClass(targetType), targetType));
 		}
 
 		return targetValue;
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONException.java b/hutool-json/src/main/java/cn/hutool/json/JSONException.java
index d2f4d035c..cc6550807 100644
--- a/hutool-json/src/main/java/cn/hutool/json/JSONException.java
+++ b/hutool-json/src/main/java/cn/hutool/json/JSONException.java
@@ -1,7 +1,7 @@
 package cn.hutool.json;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * JSON异常
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONGetter.java b/hutool-json/src/main/java/cn/hutool/json/JSONGetter.java
index 00e2aa507..67a4f903d 100644
--- a/hutool-json/src/main/java/cn/hutool/json/JSONGetter.java
+++ b/hutool-json/src/main/java/cn/hutool/json/JSONGetter.java
@@ -5,7 +5,7 @@ import cn.hutool.core.convert.ConvertException;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.getter.OptNullBasicTypeFromObjectGetter;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.time.LocalDateTime;
 import java.util.Date;
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONNull.java b/hutool-json/src/main/java/cn/hutool/json/JSONNull.java
index 452bc36e6..8758a28f7 100644
--- a/hutool-json/src/main/java/cn/hutool/json/JSONNull.java
+++ b/hutool-json/src/main/java/cn/hutool/json/JSONNull.java
@@ -1,6 +1,6 @@
 package cn.hutool.json;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONObject.java b/hutool-json/src/main/java/cn/hutool/json/JSONObject.java
index 6160847d9..5180224ae 100755
--- a/hutool-json/src/main/java/cn/hutool/json/JSONObject.java
+++ b/hutool-json/src/main/java/cn/hutool/json/JSONObject.java
@@ -6,7 +6,7 @@ import cn.hutool.core.lang.func.Filter;
 import cn.hutool.core.lang.mutable.MutablePair;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.map.MapWrapper;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.json.serialize.JSONWriter;
 
 import java.io.StringWriter;
@@ -67,8 +67,8 @@ public class JSONObject extends MapWrapper implements JSON, JSON
 	 * @since 4.1.19
 	 */
 	public JSONObject(int capacity, JSONConfig config) {
-		super(InternalJSONUtil.createRawMap(capacity, ObjectUtil.defaultIfNull(config, JSONConfig.create())));
-		this.config = ObjectUtil.defaultIfNull(config, JSONConfig.create());
+		super(InternalJSONUtil.createRawMap(capacity, ObjUtil.defaultIfNull(config, JSONConfig.create())));
+		this.config = ObjUtil.defaultIfNull(config, JSONConfig.create());
 	}
 
 	/**
@@ -458,7 +458,7 @@ public class JSONObject extends MapWrapper implements JSON, JSON
 		}
 
 		final boolean ignoreNullValue = this.config.isIgnoreNullValue();
-		if (ObjectUtil.isNull(value) && ignoreNullValue) {
+		if (ObjUtil.isNull(value) && ignoreNullValue) {
 			// 忽略值模式下如果值为空清除key
 			return this.remove(key);
 		} else if (checkDuplicate && containsKey(key)) {
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONStrFormatter.java b/hutool-json/src/main/java/cn/hutool/json/JSONStrFormatter.java
index 5181401be..a13899434 100644
--- a/hutool-json/src/main/java/cn/hutool/json/JSONStrFormatter.java
+++ b/hutool-json/src/main/java/cn/hutool/json/JSONStrFormatter.java
@@ -1,7 +1,7 @@
 package cn.hutool.json;
 
 import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * JSON字符串格式化工具，用于简单格式化JSON字符串
    
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONTokener.java b/hutool-json/src/main/java/cn/hutool/json/JSONTokener.java
index 08415273f..0077eeb5c 100755
--- a/hutool-json/src/main/java/cn/hutool/json/JSONTokener.java
+++ b/hutool-json/src/main/java/cn/hutool/json/JSONTokener.java
@@ -1,7 +1,7 @@
 package cn.hutool.json;
 
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java b/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java
index 95b34275d..35a5195e2 100755
--- a/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java
+++ b/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java
@@ -2,13 +2,13 @@ package cn.hutool.json;
 
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.file.FileReader;
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import cn.hutool.core.map.MapWrapper;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.core.util.TypeUtil;
 import cn.hutool.json.serialize.GlobalSerializeMapping;
 import cn.hutool.json.serialize.JSONArraySerializer;
@@ -555,7 +555,7 @@ public class JSONUtil {
 
 		if(null != defaultValue){
 			final Class type = (Class) defaultValue.getClass();
-			return ObjectUtil.defaultIfNull(json.getByPath(expression, type), defaultValue);
+			return ObjUtil.defaultIfNull(json.getByPath(expression, type), defaultValue);
 		}
 		return (T) json.getByPath(expression);
 	}
@@ -718,11 +718,11 @@ public class JSONUtil {
 			return jsonConfig.isIgnoreNullValue() ? null : JSONNull.NULL;
 		}
 		if (object instanceof JSON //
-				|| ObjectUtil.isNull(object) //
+				|| ObjUtil.isNull(object) //
 				|| object instanceof JSONString //
 				|| object instanceof CharSequence //
 				|| object instanceof Number //
-				|| ObjectUtil.isBasicType(object) //
+				|| ObjUtil.isBasicType(object) //
 		) {
 			return object;
 		}
diff --git a/hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java b/hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java
index c577bbd29..3f7165468 100755
--- a/hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java
+++ b/hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java
@@ -8,7 +8,7 @@ import cn.hutool.core.lang.func.Filter;
 import cn.hutool.core.lang.mutable.Mutable;
 import cn.hutool.core.lang.mutable.MutablePair;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.core.util.TypeUtil;
 import cn.hutool.json.serialize.GlobalSerializeMapping;
 import cn.hutool.json.serialize.JSONObjectSerializer;
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java b/hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java
index 6109b6c03..d50c00b27 100755
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java
@@ -7,7 +7,7 @@ import cn.hutool.core.exceptions.ValidateException;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.jwt.signers.AlgorithmUtil;
 import cn.hutool.json.jwt.signers.JWTSigner;
@@ -72,7 +72,7 @@ public class JWT implements RegisteredPayload {
 	public JWT() {
 		this.header = new JWTHeader();
 		this.payload = new JWTPayload();
-		this.charset = CharsetUtil.CHARSET_UTF_8;
+		this.charset = CharsetUtil.UTF_8;
 	}
 
 	/**
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTException.java b/hutool-json/src/main/java/cn/hutool/json/jwt/JWTException.java
index 44ccc85ce..9df1c5c11 100755
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTException.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/JWTException.java
@@ -1,7 +1,7 @@
 package cn.hutool.json.jwt;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * JWT异常
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTValidator.java b/hutool-json/src/main/java/cn/hutool/json/jwt/JWTValidator.java
index 3dabb96fc..1b493089b 100755
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTValidator.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/JWTValidator.java
@@ -2,7 +2,7 @@ package cn.hutool.json.jwt;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.exceptions.ValidateException;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.json.jwt.signers.JWTSigner;
 import cn.hutool.json.jwt.signers.NoneJWTSigner;
 
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/AlgorithmUtil.java b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/AlgorithmUtil.java
index b2d51111b..2855cea64 100755
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/AlgorithmUtil.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/AlgorithmUtil.java
@@ -1,7 +1,7 @@
 package cn.hutool.json.jwt.signers;
 
 import cn.hutool.core.map.BiMap;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.crypto.asymmetric.SignAlgorithm;
 import cn.hutool.crypto.digest.HmacAlgorithm;
 
@@ -42,7 +42,7 @@ public class AlgorithmUtil {
 	 * @return 算法名
 	 */
 	public static String getAlgorithm(String idOrAlgorithm){
-		return ObjectUtil.defaultIfNull(getAlgorithmById(idOrAlgorithm), idOrAlgorithm);
+		return ObjUtil.defaultIfNull(getAlgorithmById(idOrAlgorithm), idOrAlgorithm);
 	}
 
 	/**
@@ -51,7 +51,7 @@ public class AlgorithmUtil {
 	 * @return 算法ID
 	 */
 	public static String getId(String idOrAlgorithm){
-		return ObjectUtil.defaultIfNull(getIdByAlgorithm(idOrAlgorithm), idOrAlgorithm);
+		return ObjUtil.defaultIfNull(getIdByAlgorithm(idOrAlgorithm), idOrAlgorithm);
 	}
 
 	/**
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/AsymmetricJWTSigner.java b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/AsymmetricJWTSigner.java
index 8700b665c..49066e1e2 100755
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/AsymmetricJWTSigner.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/AsymmetricJWTSigner.java
@@ -2,7 +2,7 @@ package cn.hutool.json.jwt.signers;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.asymmetric.Sign;
 
 import java.nio.charset.Charset;
@@ -19,7 +19,7 @@ import java.security.PublicKey;
  */
 public class AsymmetricJWTSigner implements JWTSigner {
 
-	private Charset charset = CharsetUtil.CHARSET_UTF_8;
+	private Charset charset = CharsetUtil.UTF_8;
 	private final Sign sign;
 
 	/**
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/HMacJWTSigner.java b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/HMacJWTSigner.java
index e21ae7019..43fa5c7fb 100755
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/HMacJWTSigner.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/HMacJWTSigner.java
@@ -1,7 +1,7 @@
 package cn.hutool.json.jwt.signers;
 
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.crypto.digest.HMac;
 
 import java.nio.charset.Charset;
@@ -15,7 +15,7 @@ import java.security.Key;
  */
 public class HMacJWTSigner implements JWTSigner {
 
-	private Charset charset = CharsetUtil.CHARSET_UTF_8;
+	private Charset charset = CharsetUtil.UTF_8;
 	private final HMac hMac;
 
 	/**
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/NoneJWTSigner.java b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/NoneJWTSigner.java
index c9e89c62e..960a0ee87 100755
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/NoneJWTSigner.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/NoneJWTSigner.java
@@ -1,6 +1,6 @@
 package cn.hutool.json.jwt.signers;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 无需签名的JWT签名器
diff --git a/hutool-json/src/main/java/cn/hutool/json/serialize/JSONWriter.java b/hutool-json/src/main/java/cn/hutool/json/serialize/JSONWriter.java
index b38a5c7a9..d1e42fc95 100755
--- a/hutool-json/src/main/java/cn/hutool/json/serialize/JSONWriter.java
+++ b/hutool-json/src/main/java/cn/hutool/json/serialize/JSONWriter.java
@@ -8,7 +8,7 @@ import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.json.JSON;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONConfig;
diff --git a/hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLSerializer.java b/hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLSerializer.java
index 597da6adc..1794bf161 100755
--- a/hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLSerializer.java
+++ b/hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLSerializer.java
@@ -3,7 +3,7 @@ package cn.hutool.json.xml;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.text.escape.EscapeUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONException;
 import cn.hutool.json.JSONObject;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java
index 0246079ba..af5b0909c 100755
--- a/hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java
@@ -2,7 +2,7 @@ package cn.hutool.json;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import lombok.Data;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java
index d0f2b6315..04491402e 100755
--- a/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java
@@ -6,7 +6,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import lombok.Data;
 
 public class Issue488Test {
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssuesI4V14NTest.java b/hutool-json/src/test/java/cn/hutool/json/IssuesI4V14NTest.java
index ed7674671..e291793bb 100755
--- a/hutool-json/src/test/java/cn/hutool/json/IssuesI4V14NTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssuesI4V14NTest.java
@@ -1,6 +1,6 @@
 package cn.hutool.json;
 
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java
index d47c481d6..61a9d36ce 100755
--- a/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java
@@ -5,7 +5,7 @@ import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.convert.ConvertException;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.map.Dict;
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.json.test.bean.Exam;
 import cn.hutool.json.test.bean.JsonNode;
@@ -82,7 +82,7 @@ public class JSONArrayTest {
 
 	@Test
 	public void parseFileTest() {
-		JSONArray array = JSONUtil.readJSONArray(FileUtil.file("exam_test.json"), CharsetUtil.CHARSET_UTF_8);
+		JSONArray array = JSONUtil.readJSONArray(FileUtil.file("exam_test.json"), CharsetUtil.UTF_8);
 
 		JSONObject obj0 = array.getJSONObject(0);
 		Exam exam = JSONUtil.toBean(obj0, Exam.class);
@@ -107,7 +107,7 @@ public class JSONArrayTest {
 
 	@Test
 	public void toListTest() {
-		String jsonStr = FileUtil.readString("exam_test.json", CharsetUtil.CHARSET_UTF_8);
+		String jsonStr = FileUtil.readString("exam_test.json", CharsetUtil.UTF_8);
 		JSONArray array = JSONUtil.parseArray(jsonStr);
 
 		List list = array.toList(Exam.class);
@@ -152,7 +152,7 @@ public class JSONArrayTest {
 
 	@Test
 	public void toArrayTest() {
-		String jsonStr = FileUtil.readString("exam_test.json", CharsetUtil.CHARSET_UTF_8);
+		String jsonStr = FileUtil.readString("exam_test.json", CharsetUtil.UTF_8);
 		JSONArray array = JSONUtil.parseArray(jsonStr);
 
 		//noinspection SuspiciousToArrayCall
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java
index 55bf3bfd6..87e9e608c 100755
--- a/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java
@@ -10,8 +10,8 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.json.test.bean.JSONBean;
 import cn.hutool.json.test.bean.ResultDto;
 import cn.hutool.json.test.bean.Seq;
@@ -711,7 +711,7 @@ public class JSONObjectTest {
 				.set("b", "value2");
 
 		final String s = json1.toJSONString(0, (pair) -> {
-			pair.setValue(ObjectUtil.defaultIfNull(pair.getValue(), StrUtil.EMPTY));
+			pair.setValue(ObjUtil.defaultIfNull(pair.getValue(), StrUtil.EMPTY));
 			return true;
 		});
 		Assert.assertEquals("{\"a\":\"\",\"b\":\"value2\"}", s);
diff --git a/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java b/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java
index ac49d5818..cf119af64 100755
--- a/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java
@@ -6,7 +6,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.lang.reflect.TypeReference;
+import cn.hutool.core.reflect.TypeReference;
 import cn.hutool.json.JSONUtil;
 
 public class IssueIVMD5Test {
diff --git a/hutool-json/src/test/java/cn/hutool/json/jwt/JWTTest.java b/hutool-json/src/test/java/cn/hutool/json/jwt/JWTTest.java
index 4ab34e784..f64545e8a 100755
--- a/hutool-json/src/test/java/cn/hutool/json/jwt/JWTTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/jwt/JWTTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.json.jwt;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.json.jwt.signers.JWTSignerUtil;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/report/StepReport.java b/hutool-json/src/test/java/cn/hutool/json/test/bean/report/StepReport.java
index 7ddc57e28..06a7fec1d 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/report/StepReport.java
+++ b/hutool-json/src/test/java/cn/hutool/json/test/bean/report/StepReport.java
@@ -1,6 +1,6 @@
 package cn.hutool.json.test.bean.report;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 测试步骤报告
@@ -10,7 +10,7 @@ import cn.hutool.core.util.StrUtil;
  */
 public class StepReport {
 	private static int step_id = 0;
-	
+
 	private int stepId = getId();
 	/**
 	 * 步骤名称
@@ -40,7 +40,7 @@ public class StepReport {
 	 * 测试时间
 	 */
 	private String testTime;
-	
+
 	/**
 	 * 测试状态：true-成功 false-失败
 	 */
@@ -53,7 +53,7 @@ public class StepReport {
 	 * 截图路径：相对路径
 	 */
 	private String screenshot;
-	
+
 	private static synchronized int getId() {
 		return step_id++;
 	}
@@ -69,11 +69,11 @@ public class StepReport {
 	public void setResult(String result) {
 		this.result = result;
 	}
-	
+
 	public String getResult() {
 		return result;
 	}
-	
+
 	public String getStepName() {
 		return stepName;
 	}
@@ -85,7 +85,7 @@ public class StepReport {
 	public void setStepName() {
 		this.stepName = this.actionName + (StrUtil.isBlank(this.elementName) ? "" : " => " + this.elementName);
 	}
-	
+
 	public String getElementName() {
 		return elementName;
 	}
diff --git a/hutool-log/src/main/java/cn/hutool/log/AbstractLog.java b/hutool-log/src/main/java/cn/hutool/log/AbstractLog.java
index 95b4e2988..c145bf698 100644
--- a/hutool-log/src/main/java/cn/hutool/log/AbstractLog.java
+++ b/hutool-log/src/main/java/cn/hutool/log/AbstractLog.java
@@ -1,7 +1,7 @@
 package cn.hutool.log;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.level.Level;
 
 import java.io.Serializable;
@@ -9,15 +9,15 @@ import java.io.Serializable;
 /**
  * 抽象日志类
    
  * 实现了一些通用的接口
- * 
+ *
  * @author Looly
  *
  */
 public abstract class AbstractLog implements Log, Serializable{
-	
+
 	private static final long serialVersionUID = -3211115409504005616L;
 	private static final String FQCN = AbstractLog.class.getName();
-	
+
 	@Override
 	public boolean isEnabled(Level level) {
 		switch (level) {
@@ -35,12 +35,12 @@ public abstract class AbstractLog implements Log, Serializable{
 				throw new Error(StrUtil.format("Can not identify level: {}", level));
 		}
 	}
-	
+
 	@Override
 	public void trace(Throwable t) {
 		trace(t, ExceptionUtil.getSimpleMessage(t));
 	}
-	
+
 	@Override
 	public void trace(String format, Object... arguments) {
 		trace(null, format, arguments);
@@ -50,12 +50,12 @@ public abstract class AbstractLog implements Log, Serializable{
 	public void trace(Throwable t, String format, Object... arguments) {
 		trace(FQCN, t, format, arguments);
 	}
-	
+
 	@Override
 	public void debug(Throwable t) {
 		debug(t, ExceptionUtil.getSimpleMessage(t));
 	}
-	
+
 	@Override
 	public void debug(String format, Object... arguments) {
 		if(null != arguments && 1 == arguments.length && arguments[0] instanceof Throwable) {
@@ -70,12 +70,12 @@ public abstract class AbstractLog implements Log, Serializable{
 	public void debug(Throwable t, String format, Object... arguments) {
 		debug(FQCN, t, format, arguments);
 	}
-	
+
 	@Override
 	public void info(Throwable t) {
 		info(t, ExceptionUtil.getSimpleMessage(t));
 	}
-	
+
 	@Override
 	public void info(String format, Object... arguments) {
 		if(null != arguments && 1 == arguments.length && arguments[0] instanceof Throwable) {
@@ -90,12 +90,12 @@ public abstract class AbstractLog implements Log, Serializable{
 	public void info(Throwable t, String format, Object... arguments) {
 		info(FQCN, t, format, arguments);
 	}
-	
+
 	@Override
 	public void warn(Throwable t) {
 		warn(t, ExceptionUtil.getSimpleMessage(t));
 	}
-	
+
 	@Override
 	public void warn(String format, Object... arguments) {
 		if(null != arguments && 1 == arguments.length && arguments[0] instanceof Throwable) {
@@ -110,12 +110,12 @@ public abstract class AbstractLog implements Log, Serializable{
 	public void warn(Throwable t, String format, Object... arguments) {
 		warn(FQCN, t, format, arguments);
 	}
-	
+
 	@Override
 	public void error(Throwable t) {
 		this.error(t, ExceptionUtil.getSimpleMessage(t));
 	}
-	
+
 	@Override
 	public void error(String format, Object... arguments) {
 		if(null != arguments && 1 == arguments.length && arguments[0] instanceof Throwable) {
@@ -130,7 +130,7 @@ public abstract class AbstractLog implements Log, Serializable{
 	public void error(Throwable t, String format, Object... arguments) {
 		error(FQCN, t, format, arguments);
 	}
-	
+
 	@Override
 	public void log(Level level, String format, Object... arguments) {
 		if(null != arguments && 1 == arguments.length && arguments[0] instanceof Throwable) {
@@ -140,7 +140,7 @@ public abstract class AbstractLog implements Log, Serializable{
 			log(level, null, format, arguments);
 		}
 	}
-	
+
 	@Override
 	public void log(Level level, Throwable t, String format, Object... arguments) {
 		this.log(FQCN, level, t, format, arguments);
diff --git a/hutool-log/src/main/java/cn/hutool/log/StaticLog.java b/hutool-log/src/main/java/cn/hutool/log/StaticLog.java
index 6ac4b1418..8719d8614 100755
--- a/hutool-log/src/main/java/cn/hutool/log/StaticLog.java
+++ b/hutool-log/src/main/java/cn/hutool/log/StaticLog.java
@@ -1,7 +1,7 @@
 package cn.hutool.log;
 
 import cn.hutool.core.lang.caller.CallerUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.level.Level;
 
 /**
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/commons/ApacheCommonsLog.java b/hutool-log/src/main/java/cn/hutool/log/dialect/commons/ApacheCommonsLog.java
index 052d4b035..917f0a2ba 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/commons/ApacheCommonsLog.java
+++ b/hutool-log/src/main/java/cn/hutool/log/dialect/commons/ApacheCommonsLog.java
@@ -3,7 +3,7 @@ package cn.hutool.log.dialect.commons;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.AbstractLog;
 import cn.hutool.log.level.Level;
 
@@ -14,7 +14,7 @@ import cn.hutool.log.level.Level;
  */
 public class ApacheCommonsLog extends AbstractLog {
 	private static final long serialVersionUID = -6843151523380063975L;
-	
+
 	private final transient Log logger;
 	private final String name;
 
@@ -95,7 +95,7 @@ public class ApacheCommonsLog extends AbstractLog {
 	@Override
 	public void warn(Throwable t, String format, Object... arguments) {
 	}
-	
+
 	@Override
 	public void warn(String fqcn, Throwable t, String format, Object... arguments) {
 		// fqcn此处无效
@@ -116,9 +116,9 @@ public class ApacheCommonsLog extends AbstractLog {
 		if(isErrorEnabled()){
 			logger.warn(StrUtil.format(format, arguments), t);
 		}
-		
+
 	}
-	
+
 	// ------------------------------------------------------------------------- Log
 	@Override
 	public void log(String fqcn, Level level, Throwable t, String format, Object... arguments) {
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleColorLog.java b/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleColorLog.java
index 15a3f0762..45b0bf435 100755
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleColorLog.java
+++ b/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleColorLog.java
@@ -4,7 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.ansi.AnsiColor;
 import cn.hutool.core.lang.ansi.AnsiEncoder;
 import cn.hutool.core.util.ClassUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.level.Level;
 
 import java.util.function.Function;
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLog.java b/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLog.java
index a984853c7..49ed64459 100755
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLog.java
+++ b/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLog.java
@@ -4,7 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.map.Dict;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.AbstractLog;
 import cn.hutool.log.level.Level;
 
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/jboss/JbossLog.java b/hutool-log/src/main/java/cn/hutool/log/dialect/jboss/JbossLog.java
index 03dc5fa29..f0abb05f0 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/jboss/JbossLog.java
+++ b/hutool-log/src/main/java/cn/hutool/log/dialect/jboss/JbossLog.java
@@ -2,13 +2,13 @@ package cn.hutool.log.dialect.jboss;
 
 import org.jboss.logging.Logger;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.AbstractLog;
 import cn.hutool.log.level.Level;
 
 /**
  * Jboss-Logging log.
- * 
+ *
  * @author Looly
  *
  */
@@ -20,7 +20,7 @@ public class JbossLog extends AbstractLog {
 	// ------------------------------------------------------------------------- Constructor
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param logger {@link Logger}
 	 */
 	public JbossLog(Logger logger) {
@@ -29,7 +29,7 @@ public class JbossLog extends AbstractLog {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param clazz 日志打印所在类
 	 */
 	public JbossLog(Class clazz) {
@@ -38,7 +38,7 @@ public class JbossLog extends AbstractLog {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param name 日志打印所在类名
 	 */
 	public JbossLog(String name) {
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLog.java b/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLog.java
index 79d21e6de..5390d9be9 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLog.java
+++ b/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLog.java
@@ -4,18 +4,18 @@ import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.AbstractLog;
 
 /**
  * java.util.logging log.
- * 
+ *
  * @author Looly
  *
  */
 public class JdkLog extends AbstractLog {
 	private static final long serialVersionUID = -6843151523380063975L;
-	
+
 	private final transient Logger logger;
 
 	// ------------------------------------------------------------------------- Constructor
@@ -30,7 +30,7 @@ public class JdkLog extends AbstractLog {
 	public JdkLog(String name) {
 		this(Logger.getLogger(name));
 	}
-	
+
 	@Override
 	public String getName() {
 		return logger.getName();
@@ -90,7 +90,7 @@ public class JdkLog extends AbstractLog {
 	public void error(String fqcn, Throwable t, String format, Object... arguments) {
 		logIfEnabled(fqcn, Level.SEVERE, t, format, arguments);
 	}
-	
+
 	// ------------------------------------------------------------------------- Log
 	@Override
 	public void log(String fqcn, cn.hutool.log.level.Level level, Throwable t, String format, Object... arguments) {
@@ -120,7 +120,7 @@ public class JdkLog extends AbstractLog {
 	// ------------------------------------------------------------------------- Private method
 	/**
 	 * 打印对应等级的日志
-	 * 
+	 *
 	 * @param callerFQCN 调用者的完全限定类名(Fully Qualified Class Name)
 	 * @param level 等级
 	 * @param throwable 异常对象
@@ -136,7 +136,7 @@ public class JdkLog extends AbstractLog {
 			logger.log(record);
 		}
 	}
-	
+
 	/**
 	 * 传入调用日志类的信息
 	 * @param callerFQCN 调用者全限定类名
@@ -155,7 +155,7 @@ public class JdkLog extends AbstractLog {
 				break;
 			}
 		}
-		
+
 		if (found > -1) {
 			StackTraceElement ste = steArray[found+1];
 			record.setSourceClassName(ste.getClassName());
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/log4j/Log4jLog.java b/hutool-log/src/main/java/cn/hutool/log/dialect/log4j/Log4jLog.java
index 67d3278ab..80ff68008 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/log4j/Log4jLog.java
+++ b/hutool-log/src/main/java/cn/hutool/log/dialect/log4j/Log4jLog.java
@@ -3,12 +3,12 @@ package cn.hutool.log.dialect.log4j;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.AbstractLog;
 
 /**
  * Apache Log4J log.
    
- * 
+ *
  * @author Looly
  *
  */
@@ -77,7 +77,7 @@ public class Log4jLog extends AbstractLog {
 	public void warn(String fqcn, Throwable t, String format, Object... arguments) {
 		log(fqcn, cn.hutool.log.level.Level.WARN, t, format, arguments);
 	}
-	
+
 	// ------------------------------------------------------------------------- Error
 	@Override
 	public boolean isErrorEnabled() {
@@ -112,7 +112,7 @@ public class Log4jLog extends AbstractLog {
 			default:
 				throw new Error(StrUtil.format("Can not identify level: {}", level));
 		}
-		
+
 		if(logger.isEnabledFor(log4jLevel)) {
 			logger.log(fqcn, log4jLevel, StrUtil.format(format, arguments), t);
 		}
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/log4j2/Log4j2Log.java b/hutool-log/src/main/java/cn/hutool/log/dialect/log4j2/Log4j2Log.java
index 1fc0594f7..51f6fb870 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/log4j2/Log4j2Log.java
+++ b/hutool-log/src/main/java/cn/hutool/log/dialect/log4j2/Log4j2Log.java
@@ -5,18 +5,18 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.spi.AbstractLogger;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.AbstractLog;
 
 /**
  * Apache Log4J 2 log.
    
- * 
+ *
  * @author Looly
  *
  */
 public class Log4j2Log extends AbstractLog {
 	private static final long serialVersionUID = -6843151523380063975L;
-	
+
 	private final transient Logger logger;
 
 	// ------------------------------------------------------------------------- Constructor
@@ -91,7 +91,7 @@ public class Log4j2Log extends AbstractLog {
 	public void error(String fqcn, Throwable t, String format, Object... arguments) {
 		logIfEnabled(fqcn, Level.ERROR, t, format, arguments);
 	}
-	
+
 	// ------------------------------------------------------------------------- Log
 	@Override
 	public void log(String fqcn, cn.hutool.log.level.Level level, Throwable t, String format, Object... arguments) {
@@ -122,7 +122,7 @@ public class Log4j2Log extends AbstractLog {
 	/**
 	 * 打印日志
    
 	 * 此方法用于兼容底层日志实现，通过传入当前包装类名，以解决打印日志中行号错误问题
-	 * 
+	 *
 	 * @param fqcn 完全限定类名(Fully Qualified Class Name)，用于纠正定位错误行号
 	 * @param level 日志级别，使用org.apache.logging.log4j.Level中的常量
 	 * @param t 异常
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/logtube/LogTubeLog.java b/hutool-log/src/main/java/cn/hutool/log/dialect/logtube/LogTubeLog.java
index 62a9e89ef..bd05868d0 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/logtube/LogTubeLog.java
+++ b/hutool-log/src/main/java/cn/hutool/log/dialect/logtube/LogTubeLog.java
@@ -1,7 +1,7 @@
 package cn.hutool.log.dialect.logtube;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.AbstractLog;
 import cn.hutool.log.level.Level;
 import io.github.logtube.Logtube;
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/slf4j/Slf4jLog.java b/hutool-log/src/main/java/cn/hutool/log/dialect/slf4j/Slf4jLog.java
index 9b40e36e1..894ae052e 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/slf4j/Slf4jLog.java
+++ b/hutool-log/src/main/java/cn/hutool/log/dialect/slf4j/Slf4jLog.java
@@ -4,14 +4,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.spi.LocationAwareLogger;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.AbstractLog;
 import cn.hutool.log.level.Level;
 
 /**
  * SLF4J log.
    
  * 同样无缝支持 LogBack
- * 
+ *
  * @author Looly
  *
  */
@@ -154,7 +154,7 @@ public class Slf4jLog extends AbstractLog {
 	/**
 	 * 打印日志
    
 	 * 此方法用于兼容底层日志实现，通过传入当前包装类名，以解决打印日志中行号错误问题
-	 * 
+	 *
 	 * @param logger {@link LocationAwareLogger} 实现
 	 * @param fqcn 完全限定类名(Fully Qualified Class Name)，用于纠正定位错误行号
 	 * @param level_int 日志级别，使用LocationAwareLogger中的常量
@@ -170,7 +170,7 @@ public class Slf4jLog extends AbstractLog {
 
 	/**
 	 * 获取Slf4j Logger对象
-	 * 
+	 *
 	 * @param clazz 打印日志所在类，当为{@code null}时使用“null”表示
 	 * @return {@link Logger}
 	 */
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog.java b/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog.java
index 05527cc62..b87e5af33 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog.java
+++ b/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog.java
@@ -5,18 +5,18 @@ import org.pmw.tinylog.LogEntryForwarder;
 import org.pmw.tinylog.Logger;
 
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.AbstractLog;
 
 /**
  * tinylog log.
    
- * 
+ *
  * @author Looly
  *
  */
 public class TinyLog extends AbstractLog {
 	private static final long serialVersionUID = -4848042277045993735L;
-	
+
 	/** 堆栈增加层数，因为封装因此多了两层，此值用于正确获取当前类名 */
 	private static final int DEPTH = 4;
 
@@ -97,12 +97,12 @@ public class TinyLog extends AbstractLog {
 	public void log(String fqcn, cn.hutool.log.level.Level level, Throwable t, String format, Object... arguments) {
 		logIfEnabled(fqcn, toTinyLevel(level), t, format, arguments);
 	}
-	
+
 	@Override
 	public boolean isEnabled(cn.hutool.log.level.Level level) {
 		return this.level <= toTinyLevel(level).ordinal();
 	}
-	
+
 	/**
 	 * 在对应日志级别打开情况下打印日志
 	 * @param fqcn 完全限定类名(Fully Qualified Class Name)，用于定位日志位置
@@ -118,10 +118,10 @@ public class TinyLog extends AbstractLog {
 		}
 		LogEntryForwarder.forward(DEPTH, level, t, StrUtil.toString(format), arguments);
 	}
-	
+
 	/**
 	 * 将Hutool的Level等级转换为Tinylog的Level等级
-	 * 
+	 *
 	 * @param level Hutool的Level等级
 	 * @return Tinylog的Level
 	 * @since 4.0.3
@@ -155,7 +155,7 @@ public class TinyLog extends AbstractLog {
 
 	/**
 	 * 如果最后一个参数为异常参数，则获取之，否则返回null
-	 * 
+	 *
 	 * @param arguments 参数
 	 * @return 最后一个异常参数
 	 * @since 4.0.3
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog2.java b/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog2.java
index cebbfb021..f78db6089 100755
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog2.java
+++ b/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog2.java
@@ -1,7 +1,7 @@
 package cn.hutool.log.dialect.tinylog;
 
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.AbstractLog;
 import org.tinylog.Level;
 import org.tinylog.configuration.Configuration;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvBaseReader.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvBaseReader.java
index 6026d0440..ee584a24d 100755
--- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvBaseReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvBaseReader.java
@@ -5,7 +5,7 @@ import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 
 import java.io.File;
 import java.io.Reader;
@@ -30,7 +30,7 @@ public class CsvBaseReader implements Serializable {
 	/**
 	 * 默认编码
 	 */
-	protected static final Charset DEFAULT_CHARSET = CharsetUtil.CHARSET_UTF_8;
+	protected static final Charset DEFAULT_CHARSET = CharsetUtil.UTF_8;
 
 	private final CsvReadConfig config;
 
@@ -49,7 +49,7 @@ public class CsvBaseReader implements Serializable {
 	 * @param config 配置项
 	 */
 	public CsvBaseReader(CsvReadConfig config) {
-		this.config = ObjectUtil.defaultIfNull(config, CsvReadConfig::defaultConfig);
+		this.config = ObjUtil.defaultIfNull(config, CsvReadConfig::defaultConfig);
 	}
 	//--------------------------------------------------------------------------------------------- Constructor end
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvParser.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvParser.java
index b701106d4..e76068cd6 100755
--- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvParser.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvParser.java
@@ -6,8 +6,8 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.text.StrBuilder;
 import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -80,7 +80,7 @@ public final class CsvParser extends ComputeIter implements Closeable, S
 	 */
 	public CsvParser(final Reader reader, CsvReadConfig config) {
 		this.reader = Objects.requireNonNull(reader, "reader must not be null");
-		this.config = ObjectUtil.defaultIfNull(config, CsvReadConfig::defaultConfig);
+		this.config = ObjUtil.defaultIfNull(config, CsvReadConfig::defaultConfig);
 	}
 
 	/**
@@ -175,7 +175,7 @@ public final class CsvParser extends ComputeIter implements Closeable, S
 			String field = currentFields.get(i);
 			if (MapUtil.isNotEmpty(this.config.headerAlias)) {
 				// 自定义别名
-				field = ObjectUtil.defaultIfNull(this.config.headerAlias.get(field), field);
+				field = ObjUtil.defaultIfNull(this.config.headerAlias.get(field), field);
 			}
 			if (StrUtil.isNotEmpty(field) && false == localHeaderMap.containsKey(field)) {
 				localHeaderMap.put(field, i);
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java
index 093514c72..9c14cf7cd 100755
--- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java
@@ -12,7 +12,7 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 
 import java.io.BufferedWriter;
 import java.io.Closeable;
@@ -68,7 +68,7 @@ public final class CsvWriter implements Closeable, Flushable, Serializable {
 	 * @param file File CSV文件
 	 */
 	public CsvWriter(File file) {
-		this(file, CharsetUtil.CHARSET_UTF_8);
+		this(file, CharsetUtil.UTF_8);
 	}
 
 	/**
@@ -154,7 +154,7 @@ public final class CsvWriter implements Closeable, Flushable, Serializable {
 	 */
 	public CsvWriter(Writer writer, CsvWriteConfig config) {
 		this.writer = (writer instanceof BufferedWriter) ? writer : new BufferedWriter(writer);
-		this.config = ObjectUtil.defaultIfNull(config, CsvWriteConfig::defaultConfig);
+		this.config = ObjUtil.defaultIfNull(config, CsvWriteConfig::defaultConfig);
 	}
 	// --------------------------------------------------------------------------------------------------- Constructor end
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelDateUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelDateUtil.java
index 33fcfabaa..1461950f7 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelDateUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelDateUtil.java
@@ -1,7 +1,7 @@
 package cn.hutool.poi.excel;
 
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.apache.poi.ss.formula.ConditionalFormattingEvaluator;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.ExcelNumberFormat;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelPicUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelPicUtil.java
index c91d0fcfa..dc904d937 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelPicUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelPicUtil.java
@@ -2,7 +2,7 @@ package cn.hutool.poi.excel;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
 import org.apache.poi.hssf.usermodel.HSSFPicture;
 import org.apache.poi.hssf.usermodel.HSSFPictureData;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java
index ba32c6109..5df989976 100755
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java
@@ -3,9 +3,9 @@ package cn.hutool.poi.excel;
 import cn.hutool.core.exceptions.DependencyException;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.poi.PoiChecker;
 import cn.hutool.poi.excel.cell.CellLocation;
 import cn.hutool.poi.excel.sax.ExcelSaxReader;
@@ -150,7 +150,7 @@ public class ExcelUtil {
 		try {
 			return new ExcelReader(bookFilePath, sheetIndex);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -166,7 +166,7 @@ public class ExcelUtil {
 		try {
 			return new ExcelReader(bookFilePath, sheetName);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -181,7 +181,7 @@ public class ExcelUtil {
 		try {
 			return new ExcelReader(bookFile, sheetIndex);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -196,7 +196,7 @@ public class ExcelUtil {
 		try {
 			return new ExcelReader(bookFile, sheetName);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -223,7 +223,7 @@ public class ExcelUtil {
 		try {
 			return new ExcelReader(bookStream, sheetIndex);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -239,7 +239,7 @@ public class ExcelUtil {
 		try {
 			return new ExcelReader(bookStream, sheetName);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -257,7 +257,7 @@ public class ExcelUtil {
 		try {
 			return new ExcelWriter();
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -274,7 +274,7 @@ public class ExcelUtil {
 		try {
 			return new ExcelWriter(isXlsx);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -288,7 +288,7 @@ public class ExcelUtil {
 		try {
 			return new ExcelWriter(destFilePath);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -303,7 +303,7 @@ public class ExcelUtil {
 		try {
 			return new ExcelWriter((File) null, sheetName);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -317,7 +317,7 @@ public class ExcelUtil {
 		try {
 			return new ExcelWriter(destFile);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -332,7 +332,7 @@ public class ExcelUtil {
 		try {
 			return new ExcelWriter(destFilePath, sheetName);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -347,7 +347,7 @@ public class ExcelUtil {
 		try {
 			return new ExcelWriter(destFile, sheetName);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -365,7 +365,7 @@ public class ExcelUtil {
 		try {
 			return new BigExcelWriter();
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -382,7 +382,7 @@ public class ExcelUtil {
 		try {
 			return new BigExcelWriter(rowAccessWindowSize);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -396,7 +396,7 @@ public class ExcelUtil {
 		try {
 			return new BigExcelWriter(destFilePath);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -410,7 +410,7 @@ public class ExcelUtil {
 		try {
 			return new BigExcelWriter(destFile);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -425,7 +425,7 @@ public class ExcelUtil {
 		try {
 			return new BigExcelWriter(destFilePath, sheetName);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
@@ -440,7 +440,7 @@ public class ExcelUtil {
 		try {
 			return new BigExcelWriter(destFile, sheetName);
 		} catch (NoClassDefFoundError e) {
-			throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
+			throw new DependencyException(ObjUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
 		}
 	}
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java
index cd93ae0f3..7027ea2e6 100755
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java
@@ -7,14 +7,14 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.lang.id.IdUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.map.TableMap;
 import cn.hutool.core.map.multi.RowKeyTable;
 import cn.hutool.core.map.multi.Table;
+import cn.hutool.core.net.URLEncoder;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.lang.id.IdUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.URLUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.poi.excel.cell.CellLocation;
 import cn.hutool.poi.excel.cell.CellUtil;
 import cn.hutool.poi.excel.style.Align;
@@ -366,7 +366,7 @@ public class ExcelWriter extends ExcelBase {
 	 */
 	public String getDisposition(String fileName, Charset charset) {
 		if (null == charset) {
-			charset = CharsetUtil.CHARSET_UTF_8;
+			charset = CharsetUtil.UTF_8;
 		}
 
 		if (StrUtil.isBlank(fileName)) {
@@ -374,7 +374,7 @@ public class ExcelWriter extends ExcelBase {
 			fileName = IdUtil.fastSimpleUUID();
 		}
 
-		fileName = StrUtil.addSuffixIfNot(URLUtil.encodeAll(fileName, charset), isXlsx() ? ".xlsx" : ".xls");
+		fileName = StrUtil.addSuffixIfNot(URLEncoder.encodeAll(fileName, charset), isXlsx() ? ".xlsx" : ".xls");
 		return StrUtil.format("attachment; filename=\"{}\"", fileName);
 	}
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java
index d9ebe75c2..88e331a6a 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java
@@ -1,7 +1,7 @@
 package cn.hutool.poi.excel;
 
 import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.poi.excel.cell.CellEditor;
 import cn.hutool.poi.excel.cell.CellUtil;
 import org.apache.poi.ss.usermodel.Cell;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/WorkbookUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/WorkbookUtil.java
index f42fb1c29..b88e4e665 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/WorkbookUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/WorkbookUtil.java
@@ -4,7 +4,7 @@ package cn.hutool.poi.excel;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.poi.exceptions.POIException;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java
index f4747bae3..c21a73edc 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java
@@ -1,7 +1,7 @@
 package cn.hutool.poi.excel.cell;
 
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.StyleSet;
 import cn.hutool.poi.excel.cell.setters.CellSetterFactory;
@@ -364,7 +364,7 @@ public class CellUtil {
 		if (null == cell) {
 			return null;
 		}
-		return ObjectUtil.defaultIfNull(
+		return ObjUtil.defaultIfNull(
 				getCellIfMergedRegion(cell.getSheet(), cell.getColumnIndex(), cell.getRowIndex()),
 				cell);
 	}
@@ -380,7 +380,7 @@ public class CellUtil {
 	 * @since 5.1.5
 	 */
 	public static Cell getMergedRegionCell(Sheet sheet, int x, int y) {
-		return ObjectUtil.defaultIfNull(
+		return ObjUtil.defaultIfNull(
 				getCellIfMergedRegion(sheet, x, y),
 				() -> SheetUtil.getCell(sheet, y, x));
 	}
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java
index d6475f7d6..9316c6be4 100755
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java
@@ -1,7 +1,7 @@
 package cn.hutool.poi.excel.cell.setters;
 
 import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.regex.Pattern;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/NullCellSetter.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/NullCellSetter.java
index 182fbc78f..82699c383 100755
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/NullCellSetter.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/NullCellSetter.java
@@ -1,6 +1,6 @@
 package cn.hutool.poi.excel.cell.setters;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.poi.excel.cell.CellSetter;
 import org.apache.poi.ss.usermodel.Cell;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/ErrorCellValue.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/ErrorCellValue.java
index b4bd570df..80ce6a567 100755
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/ErrorCellValue.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/ErrorCellValue.java
@@ -1,6 +1,6 @@
 package cn.hutool.poi.excel.cell.values;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.poi.excel.cell.CellValue;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.FormulaError;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/NumericCellValue.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/NumericCellValue.java
index bf160730e..4cf52003d 100755
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/NumericCellValue.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/NumericCellValue.java
@@ -1,7 +1,7 @@
 package cn.hutool.poi.excel.cell.values;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.poi.excel.ExcelDateUtil;
 import cn.hutool.poi.excel.cell.CellValue;
 import java.util.Date;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/editors/TrimEditor.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/editors/TrimEditor.java
index eec83be0c..1ea0bd204 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/editors/TrimEditor.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/editors/TrimEditor.java
@@ -2,7 +2,7 @@ package cn.hutool.poi.excel.editors;
 
 import org.apache.poi.ss.usermodel.Cell;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.poi.excel.cell.CellEditor;
 
 /**
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/AbstractSheetReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/AbstractSheetReader.java
index 6a19331c9..b6bdc4855 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/AbstractSheetReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/AbstractSheetReader.java
@@ -1,7 +1,7 @@
 package cn.hutool.poi.excel.reader;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.RowUtil;
 import cn.hutool.poi.excel.cell.CellEditor;
@@ -130,7 +130,7 @@ public abstract class AbstractSheetReader implements SheetReader {
 
 		final String header = headerObj.toString();
 		if(null != this.headerAlias){
-			return ObjectUtil.defaultIfNull(this.headerAlias.get(header), header);
+			return ObjUtil.defaultIfNull(this.headerAlias.get(header), header);
 		}
 		return header;
 	}
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/MapSheetReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/MapSheetReader.java
index 0f832597d..30c590ad8 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/MapSheetReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/MapSheetReader.java
@@ -3,7 +3,7 @@ package cn.hutool.poi.excel.reader;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.IterUtil;
 import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.apache.poi.ss.usermodel.Sheet;
 
 import java.util.ArrayList;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java
index 0f1f3d184..22d371714 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java
@@ -2,8 +2,8 @@ package cn.hutool.poi.excel.sax;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.poi.excel.sax.handler.RowHandler;
 import cn.hutool.poi.exceptions.POIException;
 import org.apache.poi.hssf.eventusermodel.EventWorkbookBuilder.SheetRecordCollectingListener;
@@ -325,7 +325,7 @@ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader {
 				final int sheetIndex = Integer.parseInt(idOrRidOrSheetName);
 				rid = ridReader.getRidBySheetIdBase0(sheetIndex);
 				// 如果查找不到对应index，则认为用户传入的直接是rid
-				return ObjectUtil.defaultIfNull(rid, sheetIndex);
+				return ObjUtil.defaultIfNull(rid, sheetIndex);
 			} catch (NumberFormatException ignore) {
 				// 非数字，说明非index，且没有对应名称，抛出异常
 			}
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/ExcelSaxUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/ExcelSaxUtil.java
index ff12045ef..71fa0b09a 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/ExcelSaxUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/ExcelSaxUtil.java
@@ -5,7 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.exceptions.DependencyException;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.poi.excel.ExcelDateUtil;
 import cn.hutool.poi.excel.sax.handler.RowHandler;
 import cn.hutool.poi.exceptions.POIException;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetDataSaxHandler.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetDataSaxHandler.java
index 5d61bde85..98cc2e875 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetDataSaxHandler.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetDataSaxHandler.java
@@ -1,8 +1,8 @@
 package cn.hutool.poi.excel.sax;
 
 import cn.hutool.core.text.StrBuilder;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.poi.excel.cell.FormulaCellValue;
 import cn.hutool.poi.excel.sax.handler.RowHandler;
 import org.apache.poi.ss.usermodel.BuiltinFormats;
@@ -292,7 +292,7 @@ public class SheetDataSaxHandler extends DefaultHandler {
 				this.xssfCellStyle = stylesTable.getStyleAt(Integer.parseInt(xfIndexStr));
 				// 单元格存储格式的索引，对应style.xml中的numFmts元素的子元素索引
 				final int numFmtIndex = xssfCellStyle.getDataFormat();
-				this.numFmtString = ObjectUtil.defaultIfNull(
+				this.numFmtString = ObjUtil.defaultIfNull(
 						xssfCellStyle.getDataFormatString(),
 						() -> BuiltinFormats.getBuiltinFormat(numFmtIndex));
 				if (CellDataType.NUMBER == this.cellDataType && ExcelSaxUtil.isDateFormat(numFmtIndex, numFmtString)) {
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java
index 9cfc772b4..bf71f1018 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java
@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.poi.exceptions.POIException;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.xssf.eventusermodel.XSSFReader;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/style/StyleUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/style/StyleUtil.java
index 2a98534ec..3f689f7d2 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/style/StyleUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/style/StyleUtil.java
@@ -1,6 +1,6 @@
 package cn.hutool.poi.excel.style;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/exceptions/POIException.java b/hutool-poi/src/main/java/cn/hutool/poi/exceptions/POIException.java
index 95ec8ad67..ef82b8b9b 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/exceptions/POIException.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/exceptions/POIException.java
@@ -1,7 +1,7 @@
 package cn.hutool.poi.exceptions;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * POI异常
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvParserTest.java b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvParserTest.java
index 4fb3857c4..05c38790e 100755
--- a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvParserTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvParserTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.poi.csv;
 
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvReaderTest.java b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvReaderTest.java
index f8e3e5e30..29fd5074b 100755
--- a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvReaderTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvReaderTest.java
@@ -19,7 +19,7 @@ public class CsvReaderTest {
 	@Test
 	public void readTest() {
 		CsvReader reader = new CsvReader();
-		CsvData data = reader.read(ResourceUtil.getReader("test.csv", CharsetUtil.CHARSET_UTF_8));
+		CsvData data = reader.read(ResourceUtil.getReader("test.csv", CharsetUtil.UTF_8));
 		Assert.assertEquals("sss,sss", data.getRow(0).get(0));
 		Assert.assertEquals(1, data.getRow(0).getOriginalLineNumber());
 		Assert.assertEquals("性别", data.getRow(0).get(2));
@@ -129,7 +129,7 @@ public class CsvReaderTest {
 	@Test
 	public void lineNoTest() {
 		CsvReader reader = new CsvReader();
-		CsvData data = reader.read(ResourceUtil.getReader("test_lines.csv", CharsetUtil.CHARSET_UTF_8));
+		CsvData data = reader.read(ResourceUtil.getReader("test_lines.csv", CharsetUtil.UTF_8));
 		Assert.assertEquals(1, data.getRow(0).getOriginalLineNumber());
 		Assert.assertEquals("a,b,c,d", CollUtil.join(data.getRow(0), ","));
 
@@ -146,7 +146,7 @@ public class CsvReaderTest {
 	public void lineLimitTest() {
 		// 从原始第2行开始读取
 		CsvReader reader = new CsvReader(CsvReadConfig.defaultConfig().setBeginLineNo(2));
-		CsvData data = reader.read(ResourceUtil.getReader("test_lines.csv", CharsetUtil.CHARSET_UTF_8));
+		CsvData data = reader.read(ResourceUtil.getReader("test_lines.csv", CharsetUtil.UTF_8));
 
 		Assert.assertEquals(2, data.getRow(0).getOriginalLineNumber());
 		Assert.assertEquals("1,2,3,4", CollUtil.join(data.getRow(0), ","));
@@ -164,7 +164,7 @@ public class CsvReaderTest {
 	public void lineLimitWithHeaderTest() {
 		// 从原始第2行开始读取
 		CsvReader reader = new CsvReader(CsvReadConfig.defaultConfig().setBeginLineNo(2).setContainsHeader(true));
-		CsvData data = reader.read(ResourceUtil.getReader("test_lines.csv", CharsetUtil.CHARSET_UTF_8));
+		CsvData data = reader.read(ResourceUtil.getReader("test_lines.csv", CharsetUtil.UTF_8));
 
 		Assert.assertEquals(4, data.getRow(0).getOriginalLineNumber());
 		Assert.assertEquals("q,w,e,r,我是一段\n带换行的内容",
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java
index cfae4b775..49d3d2261 100755
--- a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java
@@ -92,7 +92,7 @@ public class CsvUtilTest {
 	@Ignore
 	public void writeTest() {
 		String path = FileUtil.isWindows() ? "d:/test/testWrite.csv" : "~/test/testWrite.csv";
-		CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_UTF_8);
+		CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.UTF_8);
 		writer.write(
 				new String[] {"a1", "b1", "c1", "123345346456745756756785656"},
 				new String[] {"a2", "b2", "c2"},
@@ -112,7 +112,7 @@ public class CsvUtilTest {
 		}
 
 		String path = FileUtil.isWindows() ? "d:/test/testWriteBeans.csv" : "~/test/testWriteBeans.csv";
-		CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_UTF_8);
+		CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.UTF_8);
 		List students = new ArrayList<>();
 		Student student1 = new Student();
 		student1.setId(1);
@@ -162,7 +162,7 @@ public class CsvUtilTest {
 		resultList.add(list);
 
 		String path = FileUtil.isWindows() ? "d:/test/csvWrapTest.csv" : "~/test/csvWrapTest.csv";
-		final CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_UTF_8);
+		final CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.UTF_8);
 		writer.write(resultList);
 	}
 
@@ -201,7 +201,7 @@ public class CsvUtilTest {
 
 		CsvData csvData = new CsvData(header, row);
 		String path = FileUtil.isWindows() ? "d:/test/csvWriteDataTest.csv" : "~/test/csvWriteDataTest.csv";
-		final CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_UTF_8);
+		final CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.UTF_8);
 		writer.write(csvData);
 	}
 }
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvWriterTest.java b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvWriterTest.java
index e879faecc..72e953b8a 100755
--- a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvWriterTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvWriterTest.java
@@ -21,7 +21,7 @@ public class CsvWriterTest {
 
 		final CsvWriter writer = CsvUtil.getWriter(
 				FileUtil.file("d:/test/csvAliasTest.csv"),
-				CharsetUtil.CHARSET_GBK, false, csvWriteConfig);
+				CharsetUtil.GBK, false, csvWriteConfig);
 
 		writer.writeHeaderLine("name", "gender", "address");
 		writer.writeLine("张三", "男", "XX市XX区");
@@ -33,7 +33,7 @@ public class CsvWriterTest {
 	@Ignore
 	public void issue2255Test(){
 		String fileName = "D:/test/" + new Random().nextInt(100) + "-a.csv";
-		CsvWriter writer = CsvUtil.getWriter(fileName, CharsetUtil.CHARSET_UTF_8);
+		CsvWriter writer = CsvUtil.getWriter(fileName, CharsetUtil.UTF_8);
 		List list = new ArrayList<>();
 		for (int i = 0; i < 10000; i++) {
 			list.add(i+"");
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java
index 2f4d31d7c..dfc2d3b16 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java
@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.poi.excel.style.StyleUtil;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.FillPatternType;
@@ -22,11 +22,11 @@ import java.util.Map;
 
 /**
  * 写出Excel单元测试
- * 
+ *
  * @author looly
  */
 public class BigExcelWriteTest {
-	
+
 	@Test
 	@Ignore
 	public void writeTest2() {
@@ -48,9 +48,9 @@ public class BigExcelWriteTest {
 		List> rows = CollUtil.newArrayList(row1, row2, row3, row4, row5);
 		for(int i=0; i < 400000; i++) {
 			//超大列表写出测试
-			rows.add(ObjectUtil.clone(row1));
+			rows.add(ObjUtil.clone(row1));
 		}
-		
+
 		String filePath = "e:/bigWriteTest.xlsx";
 		FileUtil.del(filePath);
 		// 通过工具类创建writer
@@ -66,7 +66,7 @@ public class BigExcelWriteTest {
 		// 关闭writer，释放内存
 		writer.close();
 	}
-	
+
 	@Test
 	@Ignore
 	public void mergeTest() {
@@ -89,10 +89,10 @@ public class BigExcelWriteTest {
 		writer.merge(row1.size() - 1, "测试标题");
 		// 一次性写出内容，使用默认样式
 		writer.write(rows);
-		
+
 		// 合并单元格后的标题行，使用默认标题样式
 		writer.merge(7, 10, 4, 10, "测试Merge", false);
-		
+
 		// 关闭writer，释放内存
 		writer.close();
 	}
@@ -120,14 +120,14 @@ public class BigExcelWriteTest {
 		String path = "e:/bigWriteMapTest.xlsx";
 		FileUtil.del(path);
 		BigExcelWriter writer = ExcelUtil.getBigWriter(path);
-		
+
 		//设置内容字体
 		Font font = writer.createFont();
 		font.setBold(true);
-		font.setColor(Font.COLOR_RED); 
-		font.setItalic(true); 
+		font.setColor(Font.COLOR_RED);
+		font.setItalic(true);
 		writer.getStyleSet().setFont(font, true);
-		
+
 		// 合并单元格后的标题行，使用默认标题样式
 		writer.merge(row1.size() - 1, "一班成绩单");
 		// 一次性写出内容，使用默认样式
@@ -135,7 +135,7 @@ public class BigExcelWriteTest {
 		// 关闭writer，释放内存
 		writer.close();
 	}
-	
+
 	@Test
 	@Ignore
 	public void writeMapTest2() {
@@ -145,12 +145,12 @@ public class BigExcelWriteTest {
 		row1.put("成绩", 88.32);
 		row1.put("是否合格", true);
 		row1.put("考试日期", DateUtil.date());
-		
+
 		// 通过工具类创建writer
 		String path = "e:/bigWriteMapTest2.xlsx";
 		FileUtil.del(path);
 		BigExcelWriter writer = ExcelUtil.getBigWriter(path);
-		
+
 		// 一次性写出内容，使用默认样式
 		writer.writeRow(row1, true);
 		// 关闭writer，释放内存
@@ -192,7 +192,7 @@ public class BigExcelWriteTest {
 		// 关闭writer，释放内存
 		writer.close();
 	}
-	
+
 	@Test
 	@Ignore
 	public void writeCellValueTest() {
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReadTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReadTest.java
index bb528e197..c55af9f86 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReadTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReadTest.java
@@ -3,7 +3,7 @@ package cn.hutool.poi.excel;
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.poi.excel.cell.CellHandler;
 import lombok.Data;
 import org.junit.Assert;
@@ -206,7 +206,7 @@ public class ExcelReadTest {
 	@Test
 	public void nullValueEditTest(){
 		final ExcelReader reader = ExcelUtil.getReader("null_cell_test.xlsx");
-		reader.setCellEditor((cell, value)-> ObjectUtil.defaultIfNull(value, "#"));
+		reader.setCellEditor((cell, value)-> ObjUtil.defaultIfNull(value, "#"));
 		final List> read = reader.read();
 
 		// 对于任意一个单元格有值的情况下，之前的单元格值按照null处理
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java
index a4f9d13c3..f769ed719 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java
@@ -5,7 +5,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.Console;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.poi.excel.cell.FormulaCellValue;
 import cn.hutool.poi.excel.sax.Excel03SaxReader;
 import cn.hutool.poi.excel.sax.handler.RowHandler;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java
index dd9e80704..d1e243161 100755
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java
@@ -8,7 +8,7 @@ import cn.hutool.core.lang.Console;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.lang.id.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.poi.excel.cell.setters.EscapeStrCellSetter;
 import cn.hutool.poi.excel.style.StyleUtil;
 import org.apache.poi.common.usermodel.HyperlinkType;
@@ -144,7 +144,7 @@ public class ExcelWriteTest {
 		List> rows = CollUtil.newArrayList(row1, row2, row3, row4, row5);
 		for (int i = 0; i < 400; i++) {
 			// 超大列表写出测试
-			rows.add(ObjectUtil.clone(row1));
+			rows.add(ObjUtil.clone(row1));
 		}
 
 		String filePath = "d:/test/writeTest.xlsx";
@@ -882,7 +882,7 @@ public class ExcelWriteTest {
 	@Test
 	public void getDispositionTest(){
 		ExcelWriter writer = ExcelUtil.getWriter(true);
-		final String disposition = writer.getDisposition("测试A12.xlsx", CharsetUtil.CHARSET_UTF_8);
+		final String disposition = writer.getDisposition("测试A12.xlsx", CharsetUtil.UTF_8);
 		Assert.assertEquals("attachment; filename=\"%E6%B5%8B%E8%AF%95A12.xlsx\"", disposition);
 	}
 }
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/AbsSetting.java b/hutool-setting/src/main/java/cn/hutool/setting/AbsSetting.java
index 729367ea6..c24bb4938 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/AbsSetting.java
+++ b/hutool-setting/src/main/java/cn/hutool/setting/AbsSetting.java
@@ -5,9 +5,9 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.bean.copier.ValueProvider;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.getter.OptNullBasicTypeFromStringGetter;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.reflect.ReflectUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
 
@@ -47,7 +47,7 @@ public abstract class AbsSetting implements OptNullBasicTypeFromStringGetter
  * 此对象方法线程安全
- * 
+ *
  * @author looly
  * @since 4.0.11
  */
@@ -30,7 +30,7 @@ public class GroupedMap extends LinkedHashMap
  * 无分组的集合和`[]`分组集合会合并成员，重名的分组也会合并成员
    
  * 分组配置文件如下：
- * 
+ *
  * 
      * [group1]
  * aaa
  * bbb
  * ccc
- * 
+ *
  * [group2]
  * aaa
  * ccc
  * ddd
  * 
    
- * 
+ *
  * @author Looly
  * @since 3.1.0
  */
@@ -58,7 +58,7 @@ public class GroupedSet extends HashMap> {
 	/**
 	 * 基本构造
    
 	 * 需自定义初始化配置文件
-	 * 
+	 *
 	 * @param charset 字符集
 	 */
 	public GroupedSet(Charset charset) {
@@ -67,7 +67,7 @@ public class GroupedSet extends HashMap> {
 
 	/**
 	 * 构造，使用相对于Class文件根目录的相对路径
-	 * 
+	 *
 	 * @param pathBaseClassLoader 相对路径（相对于当前项目的classes路径）
 	 * @param charset 字符集
 	 */
@@ -85,7 +85,7 @@ public class GroupedSet extends HashMap> {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param configFile 配置文件对象
 	 * @param charset 字符集
 	 */
@@ -99,7 +99,7 @@ public class GroupedSet extends HashMap> {
 
 	/**
 	 * 构造，相对于classes读取文件
-	 * 
+	 *
 	 * @param path 相对路径
 	 * @param clazz 基准类
 	 * @param charset 字符集
@@ -114,7 +114,7 @@ public class GroupedSet extends HashMap> {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param url 设定文件的URL
 	 * @param charset 字符集
 	 */
@@ -127,17 +127,17 @@ public class GroupedSet extends HashMap> {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param pathBaseClassLoader 相对路径（相对于当前项目的classes路径）
 	 */
 	public GroupedSet(String pathBaseClassLoader) {
-		this(pathBaseClassLoader, CharsetUtil.CHARSET_UTF_8);
+		this(pathBaseClassLoader, CharsetUtil.UTF_8);
 	}
 
 	/*--------------------------公有方法 start-------------------------------*/
 	/**
 	 * 初始化设定文件
-	 * 
+	 *
 	 * @param groupedSetUrl 设定文件的URL
 	 * @param charset 字符集
 	 * @return 成功初始化与否
@@ -154,7 +154,7 @@ public class GroupedSet extends HashMap> {
 
 	/**
 	 * 加载设置文件
-	 * 
+	 *
 	 * @param groupedSetUrl 配置文件URL
 	 * @return 加载是否成功
 	 */
@@ -185,7 +185,7 @@ public class GroupedSet extends HashMap> {
 
 	/**
 	 * 加载设置文件。 此方法不会关闭流对象
-	 * 
+	 *
 	 * @param settingStream 文件流
 	 * @return 加载成功与否
 	 * @throws IOException IO异常
@@ -256,7 +256,7 @@ public class GroupedSet extends HashMap> {
 
 	/**
 	 * 获得对应分组的所有值
-	 * 
+	 *
 	 * @param group 分组名
 	 * @return 分组的值集合
 	 */
@@ -270,7 +270,7 @@ public class GroupedSet extends HashMap> {
 	/**
 	 * 是否在给定分组的集合中包含指定值
    
 	 * 如果给定分组对应集合不存在，则返回false
-	 * 
+	 *
 	 * @param group 分组名
 	 * @param value 测试的值
 	 * @param otherValues 其他值
@@ -278,7 +278,7 @@ public class GroupedSet extends HashMap> {
 	 */
 	public boolean contains(String group, String value, String... otherValues) {
 		if (ArrayUtil.isNotEmpty(otherValues)) {
-			// 需要测试多个值的情况		
+			// 需要测试多个值的情况
 			final List valueList = ListUtil.toList(otherValues);
 			valueList.add(value);
 			return contains(group, valueList);
@@ -296,7 +296,7 @@ public class GroupedSet extends HashMap> {
 	/**
 	 * 是否在给定分组的集合中全部包含指定值集合
    
 	 * 如果给定分组对应集合不存在，则返回false
-	 * 
+	 *
 	 * @param group 分组名
 	 * @param values 测试的值集合
 	 * @return 是否包含
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/Setting.java b/hutool-setting/src/main/java/cn/hutool/setting/Setting.java
index 8cdd797d5..c5fa37108 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/Setting.java
+++ b/hutool-setting/src/main/java/cn/hutool/setting/Setting.java
@@ -15,7 +15,7 @@ import cn.hutool.core.io.watch.WatchUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.StaticLog;
 import cn.hutool.setting.dialect.Props;
 
@@ -51,7 +51,7 @@ public class Setting extends AbsSetting implements Map {
 	/**
 	 * 默认字符集
 	 */
-	public static final Charset DEFAULT_CHARSET = CharsetUtil.CHARSET_UTF_8;
+	public static final Charset DEFAULT_CHARSET = CharsetUtil.UTF_8;
 	/**
 	 * 默认配置文件扩展名
 	 */
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java b/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java
index f010c415d..00a8cdf22 100755
--- a/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java
+++ b/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java
@@ -7,7 +7,7 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.core.util.SystemPropsUtil;
 import cn.hutool.log.Log;
 
@@ -52,7 +52,7 @@ public class SettingLoader {
 	 * @param groupedMap GroupedMap
 	 */
 	public SettingLoader(GroupedMap groupedMap) {
-		this(groupedMap, CharsetUtil.CHARSET_UTF_8, false);
+		this(groupedMap, CharsetUtil.UTF_8, false);
 	}
 
 	/**
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/SettingRuntimeException.java b/hutool-setting/src/main/java/cn/hutool/setting/SettingRuntimeException.java
index 29d295431..147c74445 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/SettingRuntimeException.java
+++ b/hutool-setting/src/main/java/cn/hutool/setting/SettingRuntimeException.java
@@ -1,6 +1,6 @@
 package cn.hutool.setting;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 设置异常
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/SettingUtil.java b/hutool-setting/src/main/java/cn/hutool/setting/SettingUtil.java
index 5b31d8198..732305117 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/SettingUtil.java
+++ b/hutool-setting/src/main/java/cn/hutool/setting/SettingUtil.java
@@ -2,7 +2,7 @@ package cn.hutool.setting;
 
 import cn.hutool.core.io.file.FileNameUtil;
 import cn.hutool.core.io.resource.NoResourceException;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java b/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java
index 6db9b9237..b716cd083 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java
+++ b/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java
@@ -18,8 +18,8 @@ import cn.hutool.core.io.watch.WatchUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.reflect.ReflectUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.StaticLog;
 
 import java.io.BufferedReader;
@@ -69,7 +69,7 @@ public final class Props extends Properties implements BasicTypeGetter,
 	 * properties文件编码
    
 	 * issue#1701，此属性不能被序列化，故忽略序列化
 	 */
-	private transient Charset charset = CharsetUtil.CHARSET_ISO_8859_1;
+	private transient Charset charset = CharsetUtil.ISO_8859_1;
 	// ----------------------------------------------------------------------- 私有属性 end
 
 	/**
@@ -118,7 +118,7 @@ public final class Props extends Properties implements BasicTypeGetter,
 	 * @param path 配置文件路径，相对于ClassPath，或者使用绝对路径
 	 */
 	public Props(String path) {
-		this(path, CharsetUtil.CHARSET_ISO_8859_1);
+		this(path, CharsetUtil.ISO_8859_1);
 	}
 
 	/**
@@ -183,7 +183,7 @@ public final class Props extends Properties implements BasicTypeGetter,
 	 * @param clazz 基准类
 	 */
 	public Props(String path, Class clazz) {
-		this(path, clazz, CharsetUtil.ISO_8859_1);
+		this(path, clazz, CharsetUtil.NAME_ISO_8859_1);
 	}
 
 	/**
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/dialect/PropsUtil.java b/hutool-setting/src/main/java/cn/hutool/setting/dialect/PropsUtil.java
index a54f8a9d6..949fcc5c5 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/dialect/PropsUtil.java
+++ b/hutool-setting/src/main/java/cn/hutool/setting/dialect/PropsUtil.java
@@ -2,7 +2,7 @@ package cn.hutool.setting.dialect;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.resource.NoResourceException;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/profile/Profile.java b/hutool-setting/src/main/java/cn/hutool/setting/profile/Profile.java
index 70af757c6..8d831d1e4 100755
--- a/hutool-setting/src/main/java/cn/hutool/setting/profile/Profile.java
+++ b/hutool-setting/src/main/java/cn/hutool/setting/profile/Profile.java
@@ -1,7 +1,7 @@
 package cn.hutool.setting.profile;
 
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.setting.Setting;
 
 import java.io.Serializable;
diff --git a/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java b/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java
index 0656f9ae9..04886e426 100755
--- a/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java
+++ b/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java
@@ -31,6 +31,6 @@ public class YamlUtilTest {
 
 		YamlUtil.dump(
 				dict
-				, FileUtil.getWriter("d:/test/dump.yaml", CharsetUtil.CHARSET_UTF_8, false));
+				, FileUtil.getWriter("d:/test/dump.yaml", CharsetUtil.UTF_8, false));
 	}
 }
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/SocketRuntimeException.java b/hutool-socket/src/main/java/cn/hutool/socket/SocketRuntimeException.java
index 813fa20b1..6e9674ed6 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/SocketRuntimeException.java
+++ b/hutool-socket/src/main/java/cn/hutool/socket/SocketRuntimeException.java
@@ -1,7 +1,7 @@
 package cn.hutool.socket;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * Socket异常
diff --git a/hutool-socket/src/test/java/cn/hutool/socket/aio/AioClientTest.java b/hutool-socket/src/test/java/cn/hutool/socket/aio/AioClientTest.java
index da8d9947d..e400d20ec 100755
--- a/hutool-socket/src/test/java/cn/hutool/socket/aio/AioClientTest.java
+++ b/hutool-socket/src/test/java/cn/hutool/socket/aio/AioClientTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.socket.aio;
 
 import cn.hutool.core.lang.Console;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
diff --git a/hutool-socket/src/test/java/cn/hutool/socket/aio/AioServerTest.java b/hutool-socket/src/test/java/cn/hutool/socket/aio/AioServerTest.java
index 06c43472f..5db40a1a2 100755
--- a/hutool-socket/src/test/java/cn/hutool/socket/aio/AioServerTest.java
+++ b/hutool-socket/src/test/java/cn/hutool/socket/aio/AioServerTest.java
@@ -3,7 +3,7 @@ package cn.hutool.socket.aio;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.BufferUtil;
 import cn.hutool.core.lang.Console;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import cn.hutool.log.StaticLog;
 
 import java.nio.ByteBuffer;
diff --git a/hutool-socket/src/test/java/cn/hutool/socket/nio/NioClientTest.java b/hutool-socket/src/test/java/cn/hutool/socket/nio/NioClientTest.java
index a136a15c6..6d5753fd9 100755
--- a/hutool-socket/src/test/java/cn/hutool/socket/nio/NioClientTest.java
+++ b/hutool-socket/src/test/java/cn/hutool/socket/nio/NioClientTest.java
@@ -2,7 +2,7 @@ package cn.hutool.socket.nio;
 
 import cn.hutool.core.io.BufferUtil;
 import cn.hutool.core.lang.Console;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 import lombok.SneakyThrows;
 
 import java.nio.ByteBuffer;
diff --git a/hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java b/hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java
index 3a6e5d82f..5bc56cd3c 100755
--- a/hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java
+++ b/hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java
@@ -4,7 +4,7 @@ import cn.hutool.core.io.BufferUtil;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.Console;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/DesktopUtil.java b/hutool-swing/src/main/java/cn/hutool/swing/DesktopUtil.java
index f65ac940f..d6e7881e9 100755
--- a/hutool-swing/src/main/java/cn/hutool/swing/DesktopUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/DesktopUtil.java
@@ -1,7 +1,7 @@
 package cn.hutool.swing;
 
 import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.util.URLUtil;
+import cn.hutool.core.net.URLUtil;
 
 import java.awt.Desktop;
 import java.io.File;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/AbstractCaptcha.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/AbstractCaptcha.java
index 436b70d08..0cf8de56f 100755
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/AbstractCaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/AbstractCaptcha.java
@@ -7,7 +7,7 @@ import cn.hutool.swing.img.ImgUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.URLUtil;
+import cn.hutool.core.net.URLUtil;
 
 import java.awt.AlphaComposite;
 import java.awt.Color;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/CircleCaptcha.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/CircleCaptcha.java
index 0ef03a62c..7e4f23007 100755
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/CircleCaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/CircleCaptcha.java
@@ -2,7 +2,7 @@ package cn.hutool.swing.captcha;
 
 import cn.hutool.swing.img.GraphicsUtil;
 import cn.hutool.swing.img.ImgUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.RandomUtil;
 
 import java.awt.Color;
@@ -57,7 +57,7 @@ public class CircleCaptcha extends AbstractCaptcha {
 	@Override
 	public Image createImage(String code) {
 		final BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-		final Graphics2D g = ImgUtil.createGraphics(image, ObjectUtil.defaultIfNull(this.background, Color.WHITE));
+		final Graphics2D g = ImgUtil.createGraphics(image, ObjUtil.defaultIfNull(this.background, Color.WHITE));
 
 		// 随机画干扰圈圈
 		drawInterfere(g);
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/GifCaptcha.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/GifCaptcha.java
index b46feb208..11473ec86 100755
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/GifCaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/GifCaptcha.java
@@ -2,7 +2,7 @@ package cn.hutool.swing.captcha;
 
 
 import cn.hutool.swing.img.gif.AnimatedGifEncoder;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.RandomUtil;
 
 import java.awt.AlphaComposite;
@@ -148,7 +148,7 @@ public class GifCaptcha extends AbstractCaptcha {
 		//或得图形上下文
 		Graphics2D g2d = image.createGraphics();
 		//利用指定颜色填充背景
-		g2d.setColor(ObjectUtil.defaultIfNull(this.background, Color.WHITE));
+		g2d.setColor(ObjUtil.defaultIfNull(this.background, Color.WHITE));
 		g2d.fillRect(0, 0, width, height);
 		AlphaComposite ac;
 		// 字符的y坐标
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/LineCaptcha.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/LineCaptcha.java
index ed31a87eb..6e826d323 100755
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/LineCaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/LineCaptcha.java
@@ -1,6 +1,6 @@
 package cn.hutool.swing.captcha;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.swing.img.GraphicsUtil;
 import cn.hutool.swing.img.ImgUtil;
@@ -49,7 +49,7 @@ public class LineCaptcha extends AbstractCaptcha {
 	public Image createImage(String code) {
 		// 图像buffer
 		final BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-		final Graphics2D g = GraphicsUtil.createGraphics(image, ObjectUtil.defaultIfNull(this.background, Color.WHITE));
+		final Graphics2D g = GraphicsUtil.createGraphics(image, ObjUtil.defaultIfNull(this.background, Color.WHITE));
 
 		// 干扰线
 		drawInterfere(g);
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/ShearCaptcha.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/ShearCaptcha.java
index 8304a841c..e66daaabf 100755
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/ShearCaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/ShearCaptcha.java
@@ -2,7 +2,7 @@ package cn.hutool.swing.captcha;
 
 import cn.hutool.swing.img.GraphicsUtil;
 import cn.hutool.swing.img.ImgUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.RandomUtil;
 
 import java.awt.Color;
@@ -57,13 +57,13 @@ public class ShearCaptcha extends AbstractCaptcha {
 	@Override
 	public Image createImage(String code) {
 		final BufferedImage image = new BufferedImage(this.width, this.height, BufferedImage.TYPE_INT_RGB);
-		final Graphics2D g = GraphicsUtil.createGraphics(image, ObjectUtil.defaultIfNull(this.background, Color.WHITE));
+		final Graphics2D g = GraphicsUtil.createGraphics(image, ObjUtil.defaultIfNull(this.background, Color.WHITE));
 
 		// 画字符串
 		drawString(g, code);
 
 		// 扭曲
-		shear(g, this.width, this.height, ObjectUtil.defaultIfNull(this.background, Color.WHITE));
+		shear(g, this.width, this.height, ObjUtil.defaultIfNull(this.background, Color.WHITE));
 		// 画干扰线
 		drawInterfere(g, 0, RandomUtil.randomInt(this.height) + 1, this.width, RandomUtil.randomInt(this.height) + 1, this.interfereCount, ImgUtil.randomColor());
 
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/MathGenerator.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/MathGenerator.java
index b8cef9f0e..ba26aff17 100755
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/MathGenerator.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/MathGenerator.java
@@ -3,7 +3,7 @@ package cn.hutool.swing.captcha.generator;
 import cn.hutool.core.math.Calculator;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 数字计算验证码生成器
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/RandomGenerator.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/RandomGenerator.java
index 6fa92eda0..c7e6cfbd8 100755
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/RandomGenerator.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/RandomGenerator.java
@@ -1,7 +1,7 @@
 package cn.hutool.swing.captcha.generator;
 
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.StrUtil;
 
 /**
  * 随机字符验证码生成器
    
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardMonitor.java b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardMonitor.java
index 040fecfcb..c772fbd8c 100755
--- a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardMonitor.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardMonitor.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.swing.clipboard;
 
 import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.ClipboardOwner;
@@ -134,7 +134,7 @@ public enum ClipboardMonitor implements ClipboardOwner, Runnable, Closeable {
 		Transferable transferable = null;
 		for (ClipboardListener listener : listenerSet) {
 			try {
-				transferable = listener.onChange(clipboard, ObjectUtil.defaultIfNull(transferable, newContents));
+				transferable = listener.onChange(clipboard, ObjUtil.defaultIfNull(transferable, newContents));
 			} catch (Throwable e) {
 				// 忽略事件处理异常，保证所有监听正常执行
 			}
@@ -142,7 +142,7 @@ public enum ClipboardMonitor implements ClipboardOwner, Runnable, Closeable {
 
 		if (isRunning) {
 			// 继续监听
-			clipboard.setContents(ObjectUtil.defaultIfNull(transferable, ObjectUtil.defaultIfNull(newContents, contents)), this);
+			clipboard.setContents(ObjUtil.defaultIfNull(transferable, ObjUtil.defaultIfNull(newContents, contents)), this);
 		}
 	}
 
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/BackgroundRemoval.java b/hutool-swing/src/main/java/cn/hutool/swing/img/BackgroundRemoval.java
index d77a30c37..e828ee252 100755
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/BackgroundRemoval.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/BackgroundRemoval.java
@@ -2,8 +2,7 @@ package cn.hutool.swing.img;
 
 import cn.hutool.core.io.FileTypeUtil;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.swing.img.ImgUtil;
+import cn.hutool.core.text.StrUtil;
 
 import javax.imageio.ImageIO;
 import javax.swing.ImageIcon;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/GraphicsUtil.java b/hutool-swing/src/main/java/cn/hutool/swing/img/GraphicsUtil.java
index dcb12c0d6..6e1473a01 100755
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/GraphicsUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/GraphicsUtil.java
@@ -1,6 +1,6 @@
 package cn.hutool.swing.img;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 
 import java.awt.AlphaComposite;
 import java.awt.Color;
@@ -172,7 +172,7 @@ public class GraphicsUtil {
 		}
 
 		g.setFont(font);
-		g.setColor(ObjectUtil.defaultIfNull(color, Color.BLACK));
+		g.setColor(ObjUtil.defaultIfNull(color, Color.BLACK));
 		g.drawString(str, point.x, point.y);
 
 		return g;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/Img.java b/hutool-swing/src/main/java/cn/hutool/swing/img/Img.java
index 920974c3a..bce9a0bb1 100755
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/Img.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/Img.java
@@ -6,8 +6,8 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.io.resource.Resource;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.text.StrUtil;
 
 import javax.imageio.ImageIO;
 import javax.imageio.stream.ImageInputStream;
@@ -658,7 +658,7 @@ public class Img implements Serializable {
 		int height = image.getHeight(null);
 		Graphics2D g = image.createGraphics();
 
-		g.setColor(ObjectUtil.defaultIfNull(color, Color.BLACK));
+		g.setColor(ObjUtil.defaultIfNull(color, Color.BLACK));
 		if (null != stroke) {
 			g.setStroke(stroke);
 		}
@@ -784,7 +784,7 @@ public class Img implements Serializable {
 	 * @return 有效的源图片
 	 */
 	private Image getValidSrcImg() {
-		return ObjectUtil.defaultIfNull(this.targetImage, this.srcImage);
+		return ObjUtil.defaultIfNull(this.targetImage, this.srcImage);
 	}
 
 	/**
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/ImgUtil.java b/hutool-swing/src/main/java/cn/hutool/swing/img/ImgUtil.java
index 3253b017e..41c736d2a 100755
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/ImgUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/ImgUtil.java
@@ -9,10 +9,10 @@ import cn.hutool.core.io.resource.Resource;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.URLUtil;
+import cn.hutool.core.text.StrUtil;
+import cn.hutool.core.net.URLUtil;
 
 import javax.imageio.IIOImage;
 import javax.imageio.ImageIO;
@@ -1399,7 +1399,7 @@ public class ImgUtil {
 			g.setColor(backgroundColor);
 			g.fillRect(0, 0, width, height);
 		}
-		g.setColor(ObjectUtil.defaultIfNull(fontColor, Color.BLACK));
+		g.setColor(ObjUtil.defaultIfNull(fontColor, Color.BLACK));
 		g.setFont(font);// 设置画笔字体
 		g.drawString(str, 0, font.getSize());// 画出字符串
 		g.dispose();
diff --git a/hutool-swing/src/test/java/cn/hutool/swing/img/ImgTest.java b/hutool-swing/src/test/java/cn/hutool/swing/img/ImgTest.java
index d443a00ca..45b53e800 100755
--- a/hutool-swing/src/test/java/cn/hutool/swing/img/ImgTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/swing/img/ImgTest.java
@@ -2,7 +2,7 @@ package cn.hutool.swing.img;
 
 import cn.hutool.core.io.FileTypeUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.URLUtil;
+import cn.hutool.core.net.URLUtil;
 import org.junit.Ignore;
 import org.junit.Test;