fid Idcard Code

CHANGELOG.md

@@ -10,6 +10,7 @@
 * 【core】        新增Convert.toMap方法（issue#I12ISI@Gitee）
 * 【aop 】        增加返回值获取支持，优化逻辑和接口（pr#561@Github）
 * 【aop 】        改进HtmlUtil.removeHtmlAttr（issue#556@Github）
+* 【crypto】      增加SM3和SM4类
 
 ### Bug修复
 * 【extra】       修复Mail中sslEnable无效问题（pr#74@Gitee）

README.md

@@ -6,33 +6,34 @@
 </p>
 <p align="center">
 	<a target="_blank" href="https://search.maven.org/search?q=g:%22cn.hutool%22%20AND%20a:%22hutool-all%22">
-		<img src="https://img.shields.io/maven-central/v/cn.hutool/hutool-all.svg?label=Maven%20Central" ></img>
+        <img src="https://img.shields.io/maven-central/v/cn.hutool/hutool-all.svg?label=Maven%20Central" />
 	</a>
 	<a target="_blank" href="http://license.coscl.org.cn/MulanPSL/">
-		<img src="https://img.shields.io/:license-MulanPSL-blue.svg" ></img>
+        <img src="https://img.shields.io/:license-MulanPSL-blue.svg" />
 	</a>
 	<a target="_blank" href="https://www.oracle.com/technetwork/java/javase/downloads/index.html">
-		<img src="https://img.shields.io/badge/JDK-1.7+-green.svg" ></img>
+		<img src="https://img.shields.io/badge/JDK-1.7+-green.svg" />
 	</a>
 	<a target="_blank" href="https://travis-ci.org/looly/hutool">
-		<img src="https://travis-ci.org/looly/hutool.svg?branch=v4-master" ></img>
+		<img src="https://travis-ci.org/looly/hutool.svg?branch=v4-master" />
 	</a>
-	<a href="https://www.codacy.com/app/looly/hutool?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=looly/hutool&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/3e1b8a70248c46579b7b0d01d60c6377"/>
+	<a href="https://www.codacy.com/app/looly/hutool?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=looly/hutool&amp;utm_campaign=Badge_Grade">
+		<img src="https://api.codacy.com/project/badge/Grade/3e1b8a70248c46579b7b0d01d60c6377"/>
 	</a>
 	<a href="https://codecov.io/gh/looly/hutool">
 		<img src="https://codecov.io/gh/looly/hutool/branch/v4-master/graph/badge.svg" />
 	</a>
 	<a target="_blank" href="https://gitter.im/hutool/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge">
-		<img src="https://badges.gitter.im/hutool/Lobby.svg" ></img>
+		<img src="https://badges.gitter.im/hutool/Lobby.svg" />
 	</a>
 	<a target="_blank" href="https://gitee.com/loolly/hutool/stargazers">
-		<img src='https://gitee.com/loolly/hutool/badge/star.svg?theme=dark' alt='gitee star'></img>
+		<img src="https://gitee.com/loolly/hutool/badge/star.svg?theme=dark" alt='gitee star'/>
 	</a>
 	<a target="_blank" href='https://github.com/looly/hutool'>
-		<img src="https://img.shields.io/github/stars/looly/hutool.svg?style=social" alt="github star"></img>
+		<img src="https://img.shields.io/github/stars/looly/hutool.svg?style=social" alt="github star"/>
 	</a>
 	<a target="_blank" href='https://app.netlify.com/sites/hutool/deploys'>
-		<img src="https://api.netlify.com/api/v1/badges/7e0824f9-5f9a-4df0-89dd-b2fccfbeccb1/deploy-status" alt="netlify"></img>
+		<img src="https://api.netlify.com/api/v1/badges/7e0824f9-5f9a-4df0-89dd-b2fccfbeccb1/deploy-status" alt="netlify"/>
 	</a>
 </p>
 <p align="center">

hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java

@@ -1,35 +1,20 @@
 package cn.hutool.core.io;
 
-import java.io.BufferedInputStream;
+import cn.hutool.core.collection.CollUtil;
-import java.io.BufferedOutputStream;
+import cn.hutool.core.io.file.FileReader;
-import java.io.BufferedReader;
+import cn.hutool.core.io.file.*;
-import java.io.BufferedWriter;
+import cn.hutool.core.io.file.FileWriter;
-import java.io.File;
+import cn.hutool.core.io.file.FileReader.ReaderHandler;
-import java.io.FileFilter;
+import cn.hutool.core.io.resource.ResourceUtil;
-import java.io.FileInputStream;
+import cn.hutool.core.lang.Assert;
-import java.io.FileNotFoundException;
+import cn.hutool.core.util.*;
-import java.io.FileOutputStream;
+
-import java.io.IOException;
+import java.io.*;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.RandomAccessFile;
-import java.io.Reader;
 import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.Charset;
-import java.nio.file.CopyOption;
+import java.nio.file.*;
-import java.nio.file.DirectoryStream;
-import java.nio.file.FileVisitOption;
-import java.nio.file.FileVisitResult;
-import java.nio.file.FileVisitor;
-import java.nio.file.Files;
-import java.nio.file.LinkOption;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.text.DecimalFormat;
 import java.util.*;
@@ -38,26 +23,6 @@ import java.util.regex.Pattern;
 import java.util.zip.CRC32;
 import java.util.zip.Checksum;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.file.FileCopier;
-import cn.hutool.core.io.file.FileMode;
-import cn.hutool.core.io.file.FileReader;
-import cn.hutool.core.io.file.FileReader.ReaderHandler;
-import cn.hutool.core.io.file.FileWriter;
-import cn.hutool.core.io.file.LineSeparator;
-import cn.hutool.core.io.file.Tailer;
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ClassUtil;
-import cn.hutool.core.util.ReUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.URLUtil;
-import cn.hutool.core.util.ZipUtil;
-
 /**
  * 文件工具类
  *
@@ -1583,7 +1548,7 @@ public class FileUtil {
 		// 去除file:前缀
 		pathToUse = StrUtil.removePrefixIgnoreCase(pathToUse, URLUtil.FILE_URL_PREFIX);
 		// 统一使用斜杠
-		pathToUse = pathToUse.replaceAll("[/\\\\]{1,}", StrUtil.SLASH).trim();
+		pathToUse = pathToUse.replaceAll("[/\\\\]{2,}", StrUtil.SLASH).trim();
 		//兼容Windows下的共享目录路径（原始路径如果以\\开头，则保留这种路径）
 		if(path.startsWith("\\\\")){
 			pathToUse = "\\" + pathToUse;

hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java

@@ -1,15 +1,15 @@
 package cn.hutool.core.util;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.Validator;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 身份证相关工具类<br>
  * see https://www.oschina.net/code/snippet_1611_2881
@@ -24,18 +24,30 @@ import cn.hutool.core.lang.Validator;
  */
 public class IdcardUtil {
 
-	/** 中国公民身份证号码最小长度。 */
+	/**
+	 * 中国公民身份证号码最小长度。
+	 */
 	private static final int CHINA_ID_MIN_LENGTH = 15;
-	/** 中国公民身份证号码最大长度。 */
+	/**
+	 * 中国公民身份证号码最大长度。
+	 */
 	private static final int CHINA_ID_MAX_LENGTH = 18;
-	/** 每位加权因子 */
+	/**
-	private static final int power[] = { 7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2 };
+	 * 每位加权因子
-	/** 省市代码表 */
+	 */
-	private static Map<String, String> cityCodes = new HashMap<String, String>();
+	private static final int[] power = {7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2};
-	/** 台湾身份首字母对应数字 */
+	/**
-	private static Map<String, Integer> twFirstCode = new HashMap<String, Integer>();
+	 * 省市代码表
-	/** 香港身份首字母对应数字 */
+	 */
-	private static Map<String, Integer> hkFirstCode = new HashMap<String, Integer>();
+	private static Map<String, String> cityCodes = new HashMap<>();
+	/**
+	 * 台湾身份首字母对应数字
+	 */
+	private static Map<String, Integer> twFirstCode = new HashMap<>();
+	/**
+	 * 香港身份首字母对应数字
+	 */
+	private static Map<String, Integer> hkFirstCode = new HashMap<>();
 
 	static {
 		cityCodes.put("11", "北京");
@@ -135,7 +147,7 @@ public class IdcardUtil {
 				// 2000年之后不存在15位身份证号，此处用于修复此问题的判断
 				sYear -= 100;
 			}
-			idCard18 = StrUtil.builder().append(idCard.substring(0, 6)).append(sYear).append(idCard.substring(8));
+			idCard18 = StrUtil.builder().append(idCard, 0, 6).append(sYear).append(idCard.substring(8));
 			// 获取校验位
 			char sVal = getCheckCode18(idCard18.toString());
 			idCard18.append(sVal);
@@ -161,11 +173,7 @@ public class IdcardUtil {
 				return isvalidCard15(idCard);
 			case 10: {// 10位身份证，港澳台地区
 				String[] cardval = isValidCard10(idCard);
-			if (null != cardval && cardval[2].equals("true")) {
+				return null != cardval && cardval[2].equals("true");
-				return true;
-			} else {
-				return false;
-			}
 			}
 			default:
 				return false;
@@ -173,7 +181,6 @@ public class IdcardUtil {
 	}
 
 	/**
-	 * 
 	 * <p>
 	 * 判断18位身份证的合法性
 	 * </p>
@@ -221,9 +228,7 @@ public class IdcardUtil {
 		if (Validator.isNumber(code17)) {
 			// 获取校验位
 			char val = getCheckCode18(code17);
-			if (val == code18) {
+			return val == code18;
-				return true;
-			}
 		}
 		return false;
 	}
@@ -246,13 +251,10 @@ public class IdcardUtil {
 			}
 
 			//校验生日（两位年份，补充为19XX）
-			if(false == Validator.isBirthday("19" + idCard.substring(6, 12))) {
+			return false != Validator.isBirthday("19" + idCard.substring(6, 12));
-				return false;
-			}
 		} else {
 			return false;
 		}
-		return true;
 	}
 
 	/**
@@ -269,7 +271,7 @@ public class IdcardUtil {
 			return null;
 		}
 		String[] info = new String[3];
-		String card = idCard.replaceAll("[\\(|\\)]", "");
+		String card = idCard.replaceAll("[()]", "");
 		if (card.length() != 8 && card.length() != 9 && idCard.length() != 10) {
 			return null;
 		}
@@ -286,7 +288,7 @@ public class IdcardUtil {
 				return info;
 			}
 			info[2] = isValidTWCard(idCard) ? "true" : "false";
-		} else if (idCard.matches("^[1|5|7][0-9]{6}\\(?[0-9A-Z]\\)?$")) { // 澳门
+		} else if (idCard.matches("^[157][0-9]{6}\\(?[0-9A-Z]\\)?$")) { // 澳门
 			info[0] = "澳门";
 			info[1] = "N";
 		} else if (idCard.matches("^[A-Z]{1,2}[0-9]{6}\\(?[0-9A]\\)?$")) { // 香港
@@ -310,20 +312,20 @@ public class IdcardUtil {
 			return false;
 		}
 		String start = idCard.substring(0, 1);
-		String mid = idCard.substring(1, 9);
-		String end = idCard.substring(9, 10);
 		Integer iStart = twFirstCode.get(start);
 		if (null == iStart) {
 			return false;
 		}
+		String mid = idCard.substring(1, 9);
+		String end = idCard.substring(9, 10);
 		int sum = iStart / 10 + (iStart % 10) * 9;
 		final char[] chars = mid.toCharArray();
-		Integer iflag = 8;
+		int iflag = 8;
 		for (char c : chars) {
 			sum += Integer.valueOf(String.valueOf(c)) * iflag;
 			iflag--;
 		}
-		return (sum % 10 == 0 ? 0 : (10 - sum % 10)) == Integer.valueOf(end) ? true : false;
+		return (sum % 10 == 0 ? 0 : (10 - sum % 10)) == Integer.valueOf(end);
 	}
 
 	/**
@@ -339,18 +341,23 @@ public class IdcardUtil {
 	 * @return 验证码是否符合
 	 */
 	public static boolean isValidHKCard(String idCard) {
-		String card = idCard.replaceAll("[\\(|\\)]", "");
+		String card = idCard.replaceAll("[()]", "");
-		Integer sum = 0;
+		int sum;
 		if (card.length() == 9) {
-			sum = (Integer.valueOf(card.substring(0, 1).toUpperCase().toCharArray()[0]) - 55) * 9 + (Integer.valueOf(card.substring(1, 2).toUpperCase().toCharArray()[0]) - 55) * 8;
+			sum = (Character.toUpperCase(card.charAt(0)) - 55) * 9 + (Character.toUpperCase(card.charAt(1)) - 55) * 8;
 			card = card.substring(1, 9);
 		} else {
-			sum = 522 + (Integer.valueOf(card.substring(0, 1).toUpperCase().toCharArray()[0]) - 55) * 8;
+			sum = 522 + (Character.toUpperCase(card.charAt(0)) - 55) * 8;
+		}
+		String start = idCard.substring(0, 1);
+		Integer iStart = hkFirstCode.get(start);
+		if (null == iStart) {
+			return false;
 		}
 		String mid = card.substring(1, 7);
 		String end = card.substring(7, 8);
 		char[] chars = mid.toCharArray();
-		Integer iflag = 7;
+		int iflag = 7;
 		for (char c : chars) {
 			sum = sum + Integer.valueOf(String.valueOf(c)) * iflag;
 			iflag--;
@@ -358,9 +365,9 @@ public class IdcardUtil {
 		if ("A".equals(end.toUpperCase())) {
 			sum += 10;
 		} else {
-			sum += Integer.valueOf(end);
+			sum += Integer.parseInt(end);
 		}
-		return (sum % 11 == 0) ? true : false;
+		return sum % 11 == 0;
 	}
 
 	/**
@@ -381,7 +388,7 @@ public class IdcardUtil {
 	 * @return 生日(yyyyMMdd)
 	 */
 	public static String getBirth(String idCard) {
-		final Integer len = idCard.length();
+		final int len = idCard.length();
 		if (len < CHINA_ID_MIN_LENGTH) {
 			return null;
 		} else if (len == CHINA_ID_MIN_LENGTH) {
@@ -430,7 +437,7 @@ public class IdcardUtil {
 	 * @return 生日(yyyy)
 	 */
 	public static Short getYearByIdCard(String idCard) {
-		Integer len = idCard.length();
+		final int len = idCard.length();
 		if (len < CHINA_ID_MIN_LENGTH) {
 			return null;
 		} else if (len == CHINA_ID_MIN_LENGTH) {
@@ -446,7 +453,7 @@ public class IdcardUtil {
 	 * @return 生日(MM)
 	 */
 	public static Short getMonthByIdCard(String idCard) {
-		Integer len = idCard.length();
+		final int len = idCard.length();
 		if (len < CHINA_ID_MIN_LENGTH) {
 			return null;
 		} else if (len == CHINA_ID_MIN_LENGTH) {
@@ -462,7 +469,7 @@ public class IdcardUtil {
 	 * @return 生日(dd)
 	 */
 	public static Short getDayByIdCard(String idCard) {
-		Integer len = idCard.length();
+		final int len = idCard.length();
 		if (len < CHINA_ID_MIN_LENGTH) {
 			return null;
 		} else if (len == CHINA_ID_MIN_LENGTH) {
@@ -488,13 +495,7 @@ public class IdcardUtil {
 			idCard = convert15To18(idCard);
 		}
 		char sCardChar = idCard.charAt(16);
-		int gender = -1;
+		return (sCardChar % 2 != 0) ? 1 : 0;
-		if (Integer.parseInt(String.valueOf(sCardChar)) % 2 != 0) {
-			gender = 1;
-		} else {
-			gender = 0;
-		}
-		return gender;
 	}
 
 	/**
@@ -519,14 +520,15 @@ public class IdcardUtil {
 	 * @param startInclude 开始位置（包含）
 	 * @param endExclude   结束位置（不包含）
 	 * @return 隐藏后的身份证号码
-	 * @since 3.2.2
 	 * @see StrUtil#hide(CharSequence, int, int)
+	 * @since 3.2.2
 	 */
 	public static String hide(String idCard, int startInclude, int endExclude) {
 		return StrUtil.hide(idCard, startInclude, endExclude);
 	}
 
 	// ----------------------------------------------------------------------------------- Private method start
+
 	/**
 	 * 获得18位身份证校验码
 	 *
@@ -541,7 +543,7 @@ public class IdcardUtil {
 	/**
 	 * 将power和值与11取模获得余数进行校验码判断
 	 *
-	 * @param iSum
+	 * @param iSum 加权和
 	 * @return 校验位
 	 */
 	private static char getCheckCode18(int iSum) {
@@ -576,8 +578,8 @@ public class IdcardUtil {
 	/**
 	 * 将身份证的每位和对应位的加权因子相乘之后，再得到和值
 	 *
-	 * @param iArr
+	 * @param iArr 身份证号码的数组
-	 * @return 身份证编码。
+	 * @return 身份证编码
 	 */
 	private static int getPowerSum(char[] iArr) {
 		int iSum = 0;

hutool-core/src/test/java/cn/hutool/core/util/IdcardUtilTest.java

@@ -1,5 +1,6 @@
 package cn.hutool.core.util;
 
+import cn.hutool.core.lang.Console;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -66,4 +67,10 @@ public class IdcardUtilTest {
 		Assert.assertEquals(province2, "内蒙古");
 	}
 
+	@Test
+	public void getGenderByIdCardTest() {
+		int gender = IdcardUtil.getGenderByIdCard(ID_18);
+		Assert.assertEquals(1, gender);
+	}
+
 }

hutool-crypto/src/main/java/cn/hutool/crypto/SmUtil.java

@@ -1,10 +1,14 @@
 package cn.hutool.crypto;
 
-import java.io.File;
+import cn.hutool.core.io.IORuntimeException;
-import java.io.IOException;
+import cn.hutool.crypto.asymmetric.SM2;
-import java.io.InputStream;
+import cn.hutool.crypto.digest.HMac;
-import java.math.BigInteger;
+import cn.hutool.crypto.digest.HmacAlgorithm;
-
+import cn.hutool.crypto.digest.SM3;
+import cn.hutool.crypto.digest.mac.BCHMacEngine;
+import cn.hutool.crypto.digest.mac.MacEngine;
+import cn.hutool.crypto.symmetric.SM4;
+import cn.hutool.crypto.symmetric.SymmetricCrypto;
 import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1Integer;
 import org.bouncycastle.asn1.ASN1Sequence;
@@ -14,14 +18,10 @@ import org.bouncycastle.crypto.params.ECDomainParameters;
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.encoders.Hex;
 
-import cn.hutool.core.io.IORuntimeException;
+import java.io.File;
-import cn.hutool.crypto.asymmetric.SM2;
+import java.io.IOException;
-import cn.hutool.crypto.digest.Digester;
+import java.io.InputStream;
-import cn.hutool.crypto.digest.HMac;
+import java.math.BigInteger;
-import cn.hutool.crypto.digest.HmacAlgorithm;
-import cn.hutool.crypto.digest.mac.BCHMacEngine;
-import cn.hutool.crypto.digest.mac.MacEngine;
-import cn.hutool.crypto.symmetric.SymmetricCrypto;
 
 /**
  * SM国密算法工具类<br>
@@ -34,9 +34,6 @@ public class SmUtil {
 
 	private final static int RS_LEN = 32;
 
-	private static String SM3 = "SM3";
-	private static String SM4 = "SM4";
-
 	/**
 	 * 创建SM2算法对象<br>
 	 * 生成新的私钥公钥对
@@ -79,10 +76,10 @@ public class SmUtil {
 	 * SM3加密：sm3().digest(data)<br>
 	 * SM3加密并转为16进制字符串：sm3().digestHex(data)<br>
 	 * 
-	 * @return {@link Digester}
+	 * @return {@link SM3}
 	 */
-	public static Digester sm3() {
+	public static SM3 sm3() {
-		return new Digester(SM3);
+		return new SM3();
 	}
 
 	/**
@@ -92,7 +89,7 @@ public class SmUtil {
 	 * @return SM3字符串
 	 */
 	public static String sm3(String data) {
-		return new Digester(SM3).digestHex(data);
+		return sm3().digestHex(data);
 	}
 
 	/**
@@ -102,7 +99,7 @@ public class SmUtil {
 	 * @return SM3字符串
 	 */
 	public static String sm3(InputStream data) {
-		return new Digester(SM3).digestHex(data);
+		return sm3().digestHex(data);
 	}
 
 	/**
@@ -112,7 +109,7 @@ public class SmUtil {
 	 * @return SM3字符串
 	 */
 	public static String sm3(File dataFile) {
-		return new Digester(SM3).digestHex(dataFile);
+		return sm3().digestHex(dataFile);
 	}
 
 	/**
@@ -126,8 +123,8 @@ public class SmUtil {
 	 * 
 	 * @return {@link SymmetricCrypto}
 	 */
-	public static SymmetricCrypto sm4() {
+	public static SM4 sm4() {
-		return new SymmetricCrypto(SM4);
+		return new SM4();
 	}
 
 	/**
@@ -143,7 +140,7 @@ public class SmUtil {
 	 * @return {@link SymmetricCrypto}
 	 */
 	public static SymmetricCrypto sm4(byte[] key) {
-		return new SymmetricCrypto(SM4, key);
+		return new SM4(key);
 	}
 
 	/**

hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AbstractAsymmetricCrypto.java

@@ -15,11 +15,18 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.CryptoException;
 import cn.hutool.crypto.SecureUtil;
 
+/**
+ * 抽象的非对称加密对象，包装了加密和解密为Hex和Base64的封装
+ *
+ * @param <T> 返回自身类型
+ * @author Looly
+ */
 public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypto<T>> extends BaseAsymmetric<T> {
 	// ------------------------------------------------------------------ Constructor start
+
 	/**
 	 * 构造
-	 * 
+	 * <p>
 	 * 私钥和公钥同时为空时生成一对新的私钥和公钥<br>
 	 * 私钥和公钥可以单独传入一个，如此则只能使用此钥匙来做加密或者解密
 	 *
@@ -34,6 +41,7 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
 	// ------------------------------------------------------------------ Constructor end
 
 	// --------------------------------------------------------------------------------- Encrypt
+
 	/**
 	 * 加密
 	 *
@@ -214,6 +222,7 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
 	}
 
 	// --------------------------------------------------------------------------------- Decrypt
+
 	/**
 	 * 解密
 	 *

hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java

@@ -3,6 +3,7 @@ package cn.hutool.crypto.digest;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.Serializable;
 import java.nio.charset.Charset;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -25,7 +26,8 @@ import cn.hutool.crypto.SecureUtil;
  * @author Looly
  *
  */
-public class Digester {
+public class Digester implements Serializable {
+	private static final long serialVersionUID = 1L;
 
 	private MessageDigest digest;
 	/** 盐值 */

hutool-crypto/src/main/java/cn/hutool/crypto/digest/HMac.java

@@ -3,6 +3,7 @@ package cn.hutool.crypto.digest;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
+import java.io.Serializable;
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
@@ -26,7 +27,8 @@ import cn.hutool.crypto.digest.mac.MacEngineFactory;
  * @author Looly
  *
  */
-public class HMac {
+public class HMac implements Serializable {
+	private static final long serialVersionUID = 1L;
 	
 	private MacEngine engine;
 	

hutool-crypto/src/main/java/cn/hutool/crypto/digest/HmacAlgorithm.java

@@ -17,7 +17,7 @@ public enum HmacAlgorithm {
 
 	private String value;
 
-	private HmacAlgorithm(String value) {
+	HmacAlgorithm(String value) {
 		this.value = value;
 	}
 

hutool-crypto/src/main/java/cn/hutool/crypto/digest/MD5.java

@@ -11,6 +11,7 @@ import java.nio.charset.Charset;
  * @since 4.4.3
  */
 public class MD5 extends Digester {
+	private static final long serialVersionUID = 1L;
 	
 	/**
 	 * 创建MD5实例

hutool-crypto/src/main/java/cn/hutool/crypto/digest/SM3.java

@@ -0,0 +1,63 @@
+package cn.hutool.crypto.digest;
+
+/**
+ * SM3算法
+ *
+ * @author looly
+ * @since 4.6.8
+ */
+public class SM3 extends Digester {
+	private static final long serialVersionUID = 1L;
+
+	public static final String ALGORITHM_NAME = "SM3";
+
+	/**
+	 * 创建SM3实例
+	 *
+	 * @return SM3
+	 * @since 4.6.0
+	 */
+	public static SM3 create() {
+		return new SM3();
+	}
+
+	/**
+	 * 构造
+	 */
+	public SM3() {
+		super(ALGORITHM_NAME);
+	}
+
+	/**
+	 * 构造
+	 *
+	 * @param salt 盐值
+	 */
+	public SM3(byte[] salt) {
+		this(salt, 0, 1);
+	}
+
+	/**
+	 * 构造
+	 *
+	 * @param salt        盐值
+	 * @param digestCount 摘要次数，当此值小于等于1,默认为1。
+	 */
+	public SM3(byte[] salt, int digestCount) {
+		this(salt, 0, digestCount);
+	}
+
+	/**
+	 * 构造
+	 *
+	 * @param salt         盐值
+	 * @param saltPosition 加盐位置，既将盐值字符串放置在数据的index数，默认0
+	 * @param digestCount  摘要次数，当此值小于等于1,默认为1。
+	 */
+	public SM3(byte[] salt, int saltPosition, int digestCount) {
+		this();
+		this.salt = salt;
+		this.saltPosition = saltPosition;
+		this.digestCount = digestCount;
+	}
+}

hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/AES.java

@@ -29,6 +29,7 @@ import cn.hutool.crypto.SecureUtil;
  * @since 3.0.8
  */
 public class AES extends SymmetricCrypto {
+	private static final long serialVersionUID = 1L;
 
 	//------------------------------------------------------------------------- Constrctor start
 
@@ -178,28 +179,4 @@ public class AES extends SymmetricCrypto {
 		super(StrUtil.format("AES/{}/{}", mode, padding), key, iv);
 	}
 	//------------------------------------------------------------------------- Constrctor end
-
-	/**
-	 * 设置偏移向量
-	 *
-	 * @param iv {@link IvParameterSpec}偏移向量
-	 * @return 自身
-	 */
-	public AES setIv(IvParameterSpec iv) {
-		super.setParams(iv);
-		return this;
-	}
-
-	/**
-	 * 设置偏移向量
-	 *
-	 * @param iv 偏移向量，加盐
-	 * @return 自身
-	 * @since 3.3.0
-	 */
-	public AES setIv(byte[] iv) {
-		setIv(new IvParameterSpec(iv));
-		return this;
-	}
-
 }

hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/DES.java

@@ -17,6 +17,7 @@ import cn.hutool.crypto.SecureUtil;
  * @since 3.0.8
  */
 public class DES extends SymmetricCrypto {
+	private static final long serialVersionUID = 1L;
 
 	// ------------------------------------------------------------------------- Constrctor start
 	/**
@@ -150,28 +151,4 @@ public class DES extends SymmetricCrypto {
 		super(StrUtil.format("DES/{}/{}", mode, padding), key, iv);
 	}
 	// ------------------------------------------------------------------------- Constrctor end
-
-	/**
-	 * 设置偏移向量
-	 * 
-	 * @param iv {@link IvParameterSpec}偏移向量
-	 * @return 自身
-	 */
-	public DES setIv(IvParameterSpec iv) {
-		super.setParams(iv);
-		return this;
-	}
-
-	/**
-	 * 设置偏移向量
-	 * 
-	 * @param iv 偏移向量，加盐
-	 * @return 自身
-	 * @since 3.3.0
-	 */
-	public DES setIv(byte[] iv) {
-		setIv(new IvParameterSpec(iv));
-		return this;
-	}
-
 }

hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/DESede.java

@@ -18,6 +18,7 @@ import cn.hutool.crypto.SecureUtil;
  * @since 3.3.0
  */
 public class DESede extends SymmetricCrypto {
+	private static final long serialVersionUID = 1L;
 
 	// ------------------------------------------------------------------------- Constructor start
 	/**
@@ -151,28 +152,4 @@ public class DESede extends SymmetricCrypto {
 		super(StrUtil.format("{}/{}/{}", SymmetricAlgorithm.DESede.getValue(), mode, padding), key, iv);
 	}
 	// ------------------------------------------------------------------------- Constructor end
-
-	/**
-	 * 设置偏移向量
-	 * 
-	 * @param iv {@link IvParameterSpec}偏移向量
-	 * @return 自身
-	 */
-	public DESede setIv(IvParameterSpec iv) {
-		super.setParams(iv);
-		return this;
-	}
-
-	/**
-	 * 设置偏移向量
-	 * 
-	 * @param iv 偏移向量，加盐
-	 * @return 自身
-	 * @since 3.3.0
-	 */
-	public DESede setIv(byte[] iv) {
-		setIv(new IvParameterSpec(iv));
-		return this;
-	}
-
 }

hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java

@@ -1,5 +1,6 @@
 package cn.hutool.crypto.symmetric;
 
+import java.io.Serializable;
 import java.nio.charset.Charset;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
@@ -17,14 +18,13 @@ import cn.hutool.crypto.CryptoException;
  *
  * @author Iurii Sergiichuk，Looly
  */
-public class RC4 {
+public class RC4 implements Serializable {
+	private static final long serialVersionUID = 1L;
 
 	private static final int SBOX_LENGTH = 256;
 	/** 密钥最小长度 */
 	private static final int KEY_MIN_LENGTH = 5;
 
-	/** Key array */
-	private byte[] key;
 	/** Sbox */
 	private int[] sbox;
 	
@@ -34,7 +34,7 @@ public class RC4 {
 	 * 构造
 	 * 
 	 * @param key 密钥
-	 * @throws CryptoException
+	 * @throws CryptoException key长度小于5或者大于255抛出此异常
 	 */
 	public RC4(String key) throws CryptoException {
 		setKey(key);
@@ -175,8 +175,7 @@ public class RC4 {
 		final WriteLock writeLock = this.lock.writeLock();
 		writeLock.lock();
 		try {
-			this.key = StrUtil.utf8Bytes(key);
+			this.sbox = initSBox(StrUtil.utf8Bytes(key));
-			this.sbox = initSBox(this.key);
 		} finally {
 			writeLock.unlock();
 		}

hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SM4.java

@@ -0,0 +1,166 @@
+package cn.hutool.crypto.symmetric;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.Mode;
+import cn.hutool.crypto.Padding;
+import cn.hutool.crypto.SecureUtil;
+
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+
+/**
+ * SM4实现
+ *
+ * @author Looly
+ * @since 4.6.8
+ */
+public class SM4 extends SymmetricCrypto{
+	private static final long serialVersionUID = 1L;
+
+	public static final String ALGORITHM_NAME = "SM4";
+
+	//------------------------------------------------------------------------- Constrctor start
+	/**
+	 * 构造，使用随机密钥
+	 */
+	public SM4() {
+		super(ALGORITHM_NAME);
+	}
+
+	/**
+	 * 构造
+	 *
+	 * @param key 密钥
+	 */
+	public SM4(byte[] key) {
+		super(ALGORITHM_NAME, key);
+	}
+
+	/**
+	 * 构造，使用随机密钥
+	 *
+	 * @param mode    模式{@link Mode}
+	 * @param padding {@link Padding}补码方式
+	 */
+	public SM4(Mode mode, Padding padding) {
+		this(mode.name(), padding.name());
+	}
+
+	/**
+	 * 构造
+	 *
+	 * @param mode    模式{@link Mode}
+	 * @param padding {@link Padding}补码方式
+	 * @param key     密钥，支持三种密钥长度：128、192、256位
+	 */
+	public SM4(Mode mode, Padding padding, byte[] key) {
+		this(mode, padding, key, null);
+	}
+
+	/**
+	 * 构造
+	 *
+	 * @param mode    模式{@link Mode}
+	 * @param padding {@link Padding}补码方式
+	 * @param key     密钥，支持三种密钥长度：128、192、256位
+	 * @param iv      偏移向量，加盐
+	 */
+	public SM4(Mode mode, Padding padding, byte[] key, byte[] iv) {
+		this(mode.name(), padding.name(), key, iv);
+	}
+
+	/**
+	 * 构造
+	 *
+	 * @param mode    模式{@link Mode}
+	 * @param padding {@link Padding}补码方式
+	 * @param key     密钥，支持三种密钥长度：128、192、256位
+	 */
+	public SM4(Mode mode, Padding padding, SecretKey key) {
+		this(mode, padding, key, (IvParameterSpec) null);
+	}
+
+	/**
+	 * 构造
+	 *
+	 * @param mode    模式{@link Mode}
+	 * @param padding {@link Padding}补码方式
+	 * @param key     密钥，支持三种密钥长度：128、192、256位
+	 * @param iv      偏移向量，加盐
+	 */
+	public SM4(Mode mode, Padding padding, SecretKey key, byte[] iv) {
+		this(mode, padding, key, ArrayUtil.isEmpty(iv) ? ((IvParameterSpec) null) : new IvParameterSpec(iv));
+	}
+
+	/**
+	 * 构造
+	 *
+	 * @param mode    模式{@link Mode}
+	 * @param padding {@link Padding}补码方式
+	 * @param key     密钥，支持三种密钥长度：128、192、256位
+	 * @param iv      偏移向量，加盐
+	 */
+	public SM4(Mode mode, Padding padding, SecretKey key, IvParameterSpec iv) {
+		this(mode.name(), padding.name(), key, iv);
+	}
+
+	/**
+	 * 构造
+	 *
+	 * @param mode    模式
+	 * @param padding 补码方式
+	 */
+	public SM4(String mode, String padding) {
+		this(mode, padding, (byte[]) null);
+	}
+
+	/**
+	 * 构造
+	 *
+	 * @param mode    模式
+	 * @param padding 补码方式
+	 * @param key     密钥，支持三种密钥长度：128、192、256位
+	 */
+	public SM4(String mode, String padding, byte[] key) {
+		this(mode, padding, key, null);
+	}
+
+	/**
+	 * 构造
+	 *
+	 * @param mode    模式
+	 * @param padding 补码方式
+	 * @param key     密钥，支持三种密钥长度：128、192、256位
+	 * @param iv      加盐
+	 */
+	public SM4(String mode, String padding, byte[] key, byte[] iv) {
+		this(mode, padding,//
+				SecureUtil.generateKey(ALGORITHM_NAME, key),//
+				ArrayUtil.isEmpty(iv) ? ((IvParameterSpec) null) : new IvParameterSpec(iv));
+	}
+
+	/**
+	 * 构造
+	 *
+	 * @param mode    模式
+	 * @param padding 补码方式
+	 * @param key     密钥，支持三种密钥长度：128、192、256位
+	 */
+	public SM4(String mode, String padding, SecretKey key) {
+		this(mode, padding, key, null);
+	}
+
+	/**
+	 * 构造
+	 *
+	 * @param mode    模式
+	 * @param padding 补码方式
+	 * @param key     密钥，支持三种密钥长度：128、192、256位
+	 * @param iv      加盐
+	 */
+	public SM4(String mode, String padding, SecretKey key, IvParameterSpec iv) {
+		super(StrUtil.format("SM4/{}/{}", mode, padding), key, iv);
+	}
+	//------------------------------------------------------------------------- Constrctor end
+}

hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java

@@ -12,8 +12,10 @@ import cn.hutool.crypto.SecureUtil;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.PBEParameterSpec;
 import java.io.InputStream;
+import java.io.Serializable;
 import java.nio.charset.Charset;
 import java.security.spec.AlgorithmParameterSpec;
 import java.util.concurrent.locks.Lock;
@@ -27,7 +29,8 @@ import java.util.concurrent.locks.ReentrantLock;
  *
  * @author Looly
  */
-public class SymmetricCrypto {
+public class SymmetricCrypto implements Serializable {
+	private static final long serialVersionUID = 1L;
 
 	/**
 	 * SecretKey 负责保存对称密钥
@@ -131,7 +134,7 @@ public class SymmetricCrypto {
 	 *
 	 * @param algorithm 算法
 	 * @param key       密钥，如果为<code>null</code>自动生成一个key
-	 * @return {@link SymmetricCrypto}
+	 * @return {@link SymmetricCrypto}的子对象，既子对象自身
 	 */
 	public SymmetricCrypto init(String algorithm, SecretKey key) {
 		Assert.notBlank(algorithm, "'algorithm' must be not blank !");
@@ -163,6 +166,28 @@ public class SymmetricCrypto {
 		return this;
 	}
 
+	/**
+	 * 设置偏移向量
+	 *
+	 * @param iv {@link IvParameterSpec}偏移向量
+	 * @return 自身
+	 */
+	public SymmetricCrypto setIv(IvParameterSpec iv) {
+		setParams(iv);
+		return this;
+	}
+
+	/**
+	 * 设置偏移向量
+	 *
+	 * @param iv 偏移向量，加盐
+	 * @return 自身
+	 */
+	public SymmetricCrypto setIv(byte[] iv) {
+		setIv(new IvParameterSpec(iv));
+		return this;
+	}
+
 	// --------------------------------------------------------------------------------- Encrypt
 
 	/**

hutool-crypto/src/test/java/cn/hutool/crypto/test/SmTest.java

@@ -1,12 +1,19 @@
 package cn.hutool.crypto.test;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.TimeInterval;
+import cn.hutool.core.lang.Console;
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.crypto.KeyUtil;
+import cn.hutool.crypto.Mode;
+import cn.hutool.crypto.Padding;
+import cn.hutool.crypto.SmUtil;
+import cn.hutool.crypto.digest.HMac;
+import cn.hutool.crypto.symmetric.SM4;
 import org.junit.Assert;
 import org.junit.Test;
 
-import cn.hutool.core.util.CharsetUtil;
+import javax.crypto.SecretKey;
-import cn.hutool.crypto.SmUtil;
-import cn.hutool.crypto.digest.HMac;
-import cn.hutool.crypto.symmetric.SymmetricCrypto;
 
 /**
  * SM单元测试
@@ -25,16 +32,33 @@ public class SmTest {
 	@Test
 	public void sm4Test() {
 		String content = "test中文";
-		SymmetricCrypto sm4 = SmUtil.sm4();
+		SM4 sm4 = SmUtil.sm4();
+
+		String encryptHex = sm4.encryptHex(content);
+		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
+
+		Assert.assertEquals(content, decryptStr);
+	}
+
+	@Test
+	public void sm4ECBPKCS5PaddingTest2() {
+		String content = "test中文";
+		SM4 sm4 = new SM4(Mode.ECB, Padding.PKCS5Padding);
+		Assert.assertEquals("SM4/ECB/PKCS5Padding", sm4.getCipher().getAlgorithm());
 
 		String encryptHex = sm4.encryptHex(content);
 		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
 		Assert.assertEquals(content, decryptStr);
 	}
+
 	@Test
-	public void sm4Test2() {
+	public void sm4TestWithCustomKeyTest() {
 		String content = "test中文";
-		SymmetricCrypto sm4 = new SymmetricCrypto("SM4/ECB/PKCS5Padding");
+
+		SecretKey key = KeyUtil.generateKey(SM4.ALGORITHM_NAME);
+
+		SM4 sm4 = new SM4(Mode.ECB, Padding.PKCS5Padding, key);
+		Assert.assertEquals("SM4/ECB/PKCS5Padding", sm4.getCipher().getAlgorithm());
 
 		String encryptHex = sm4.encryptHex(content);
 		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);