fix code

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;

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;

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;
 

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;

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;
 
 /**
  * 压缩解压异常语言异常

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;

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;

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;
 

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;

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;

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;

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;
 
 /**
  * 表达式语言异常

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;

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;
 

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);
 	}
 
 	/**

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异常

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<MimeMessage> {
 	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);
 		}

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;

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;
 
 /**
  * 邮件异常

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;

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;
 

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;
 
 /**
  * 模板异常

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;
 
 /**

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;

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;

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;

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异常

hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java

@@ -429,7 +429,7 @@ public class QrCodeUtil {
 	 */
 	private static Map<DecodeHintType, Object> buildHints(boolean isTryHarder, boolean isPureBarcode) {
 		final HashMap<DecodeHintType, Object> hints = new HashMap<>();
-		hints.put(DecodeHintType.CHARACTER_SET, CharsetUtil.UTF_8);
+		hints.put(DecodeHintType.CHARACTER_SET, CharsetUtil.NAME_UTF_8);
 
 		// 优化精度
 		if (isTryHarder) {

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 */

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);
 	}

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);
 	}

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;

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;

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异常

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;

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));

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;

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));
 	}
 
 	/**

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;
 

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;

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;

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);
 	}
 
 	/**

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;
 
 /**
  * 模板异常

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;

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));

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;
 

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;

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;

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;

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

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} 的字符串实现形式<br>
  * 用于直接获取字符串模板
- * 
+ *
  * @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);

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;

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;
 	}
 }

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;
 

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;
 
 /**
  * 分词异常

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;

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分词抽象封装<br>
  * 项目地址：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) {

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分词引擎实现<br>
  * 项目地址：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)));
 	}
-	
+
 }

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分词引擎实现<br>
  * 项目地址：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)));
 	}
-	
+
 }

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分词引擎实现<br>
  * 项目地址：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) {

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分词引擎实现<br>
  * 项目地址：https://gitee.com/lionsoul/jcseg
- * 
+ *
  * @author looly
  *
  */
@@ -38,7 +38,7 @@ public class JcsegEngine implements TokenizerEngine {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param segment {@link ISegment}
 	 */
 	public JcsegEngine(ISegment segment) {

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分词引擎实现<br>
  * 项目地址：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) {

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分词引擎实现<br>
  * 项目地址：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) {

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工具包分词实现<br>
  * 项目地址：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) {

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分词引擎实现<br>
  * 项目地址：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)));

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;

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;
 

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;

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;

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

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;

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;

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"));