mirror of
https://gitee.com/dromara/hutool.git
synced 2025-04-05 17:37:59 +08:00
fid Idcard Code
This commit is contained in:
Looly
parent
32955b9c8c
commit
daf85caf9e
@ -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）
|
||||
|
||||
19
README.md
19
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&utm_medium=referral&utm_content=looly/hutool&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&utm_medium=referral&utm_content=looly/hutool&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">
|
||||
|
||||
@ -1,35 +1,20 @@
|
||||
package cn.hutool.core.io;
|
||||
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.BufferedOutputStream;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.File;
|
||||
import java.io.FileFilter;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.io.PrintWriter;
|
||||
import java.io.RandomAccessFile;
|
||||
import java.io.Reader;
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.io.file.FileReader;
|
||||
import cn.hutool.core.io.file.*;
|
||||
import cn.hutool.core.io.file.FileWriter;
|
||||
import cn.hutool.core.io.file.FileReader.ReaderHandler;
|
||||
import cn.hutool.core.io.resource.ResourceUtil;
|
||||
import cn.hutool.core.lang.Assert;
|
||||
import cn.hutool.core.util.*;
|
||||
|
||||
import java.io.*;
|
||||
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.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.*;
|
||||
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;
|
||||
|
||||
@ -1,41 +1,53 @@
|
||||
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
|
||||
*
|
||||
*
|
||||
* <p>
|
||||
* 本工具并没有对行政区划代码做校验，如有需求，请参阅（2018年10月）：
|
||||
* http://www.mca.gov.cn/article/sj/xzqh/2018/201804-12/20181011221630.html
|
||||
* </p>
|
||||
*
|
||||
*
|
||||
* @author Looly
|
||||
* @since 3.0.4
|
||||
*/
|
||||
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 Map<String, Integer> twFirstCode = new HashMap<String, Integer>();
|
||||
/** 香港身份首字母对应数字 */
|
||||
private static Map<String, Integer> hkFirstCode = new HashMap<String, Integer>();
|
||||
/**
|
||||
* 每位加权因子
|
||||
*/
|
||||
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<>();
|
||||
/**
|
||||
* 台湾身份首字母对应数字
|
||||
*/
|
||||
private static Map<String, Integer> twFirstCode = new HashMap<>();
|
||||
/**
|
||||
* 香港身份首字母对应数字
|
||||
*/
|
||||
private static Map<String, Integer> hkFirstCode = new HashMap<>();
|
||||
|
||||
static {
|
||||
cityCodes.put("11", "北京");
|
||||
@ -116,7 +128,7 @@ public class IdcardUtil {
|
||||
|
||||
/**
|
||||
* 将15位身份证号码转换为18位
|
||||
*
|
||||
*
|
||||
* @param idCard 15位身份编码
|
||||
* @return 18位身份编码
|
||||
*/
|
||||
@ -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);
|
||||
@ -147,7 +159,7 @@ public class IdcardUtil {
|
||||
|
||||
/**
|
||||
* 是否有效身份证号
|
||||
*
|
||||
*
|
||||
* @param idCard 身份证号，支持18位、15位和港澳台的10位
|
||||
* @return 是否有效
|
||||
*/
|
||||
@ -155,25 +167,20 @@ public class IdcardUtil {
|
||||
idCard = idCard.trim();
|
||||
int length = idCard.length();
|
||||
switch (length) {
|
||||
case 18:// 18位身份证
|
||||
return isvalidCard18(idCard);
|
||||
case 15:// 15位身份证
|
||||
return isvalidCard15(idCard);
|
||||
case 10: {// 10位身份证，港澳台地区
|
||||
String[] cardval = isValidCard10(idCard);
|
||||
if (null != cardval && cardval[2].equals("true")) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
case 18:// 18位身份证
|
||||
return isvalidCard18(idCard);
|
||||
case 15:// 15位身份证
|
||||
return isvalidCard15(idCard);
|
||||
case 10: {// 10位身份证，港澳台地区
|
||||
String[] cardval = isValidCard10(idCard);
|
||||
return null != cardval && cardval[2].equals("true");
|
||||
}
|
||||
}
|
||||
default:
|
||||
return false;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* <p>
|
||||
* 判断18位身份证的合法性
|
||||
* </p>
|
||||
@ -200,7 +207,7 @@ public class IdcardUtil {
|
||||
* <li>余数只可能有0 1 2 3 4 5 6 7 8 9 10这11个数字。其分别对应的最后一位身份证的号码为1 0 X 9 8 7 6 5 4 3 2</li>
|
||||
* <li>通过上面得知如果余数是2，就会在身份证的第18位数字上出现罗马数字的Ⅹ。如果余数是10，身份证的最后一位号码就是2</li>
|
||||
* </ol>
|
||||
*
|
||||
*
|
||||
* @param idCard 待验证的身份证
|
||||
* @return 是否有效的18位身份证
|
||||
*/
|
||||
@ -208,9 +215,9 @@ public class IdcardUtil {
|
||||
if (CHINA_ID_MAX_LENGTH != idCard.length()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
//校验生日
|
||||
if(false == Validator.isBirthday(idCard.substring(6, 14))) {
|
||||
if (false == Validator.isBirthday(idCard.substring(6, 14))) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -221,16 +228,14 @@ public class IdcardUtil {
|
||||
if (Validator.isNumber(code17)) {
|
||||
// 获取校验位
|
||||
char val = getCheckCode18(code17);
|
||||
if (val == code18) {
|
||||
return true;
|
||||
}
|
||||
return val == code18;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证15位身份编码是否合法
|
||||
*
|
||||
*
|
||||
* @param idCard 身份编码
|
||||
* @return 是否合法
|
||||
*/
|
||||
@ -246,30 +251,27 @@ public class IdcardUtil {
|
||||
}
|
||||
|
||||
//校验生日（两位年份，补充为19XX）
|
||||
if(false == Validator.isBirthday("19" + idCard.substring(6, 12))) {
|
||||
return false;
|
||||
}
|
||||
return false != Validator.isBirthday("19" + idCard.substring(6, 12));
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证10位身份编码是否合法
|
||||
*
|
||||
*
|
||||
* @param idCard 身份编码
|
||||
* @return 身份证信息数组
|
||||
* <p>
|
||||
* [0] - 台湾、澳门、香港 [1] - 性别(男M,女F,未知N) [2] - 是否合法(合法true,不合法false) 若不是身份证件号码则返回null
|
||||
* </p>
|
||||
* <p>
|
||||
* [0] - 台湾、澳门、香港 [1] - 性别(男M,女F,未知N) [2] - 是否合法(合法true,不合法false) 若不是身份证件号码则返回null
|
||||
* </p>
|
||||
*/
|
||||
public static String[] isValidCard10(String idCard) {
|
||||
if(StrUtil.isBlank(idCard)) {
|
||||
if (StrUtil.isBlank(idCard)) {
|
||||
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]\\)?$")) { // 香港
|
||||
@ -301,29 +303,29 @@ public class IdcardUtil {
|
||||
|
||||
/**
|
||||
* 验证台湾身份证号码
|
||||
*
|
||||
*
|
||||
* @param idCard 身份证号码
|
||||
* @return 验证码是否符合
|
||||
*/
|
||||
public static boolean isValidTWCard(String idCard) {
|
||||
if(StrUtil.isEmpty(idCard)) {
|
||||
if (StrUtil.isEmpty(idCard)) {
|
||||
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) {
|
||||
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);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -334,23 +336,28 @@ public class IdcardUtil {
|
||||
* <p>
|
||||
* 将身份证号码全部转换为数字，分别对应乘9-1相加的总和，整除11则证件号码有效
|
||||
* </p>
|
||||
*
|
||||
*
|
||||
* @param idCard 身份证号码
|
||||
* @return 验证码是否符合
|
||||
*/
|
||||
public static boolean isValidHKCard(String idCard) {
|
||||
String card = idCard.replaceAll("[\\(|\\)]", "");
|
||||
Integer sum = 0;
|
||||
String card = idCard.replaceAll("[()]", "");
|
||||
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,14 +365,14 @@ 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;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据身份编号获取生日，只支持15或18位身份证号码
|
||||
*
|
||||
*
|
||||
* @param idCard 身份编号
|
||||
* @return 生日(yyyyMMdd)
|
||||
* @see #getBirth(String)
|
||||
@ -376,12 +383,12 @@ public class IdcardUtil {
|
||||
|
||||
/**
|
||||
* 根据身份编号获取生日，只支持15或18位身份证号码
|
||||
*
|
||||
*
|
||||
* @param idCard 身份编号
|
||||
* @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) {
|
||||
@ -392,7 +399,7 @@ public class IdcardUtil {
|
||||
|
||||
/**
|
||||
* 从身份证号码中获取生日日期，只支持15或18位身份证号码
|
||||
*
|
||||
*
|
||||
* @param idCard 身份证号码
|
||||
* @return 日期
|
||||
*/
|
||||
@ -403,7 +410,7 @@ public class IdcardUtil {
|
||||
|
||||
/**
|
||||
* 根据身份编号获取年龄，只支持15或18位身份证号码
|
||||
*
|
||||
*
|
||||
* @param idCard 身份编号
|
||||
* @return 年龄
|
||||
*/
|
||||
@ -413,8 +420,8 @@ public class IdcardUtil {
|
||||
|
||||
/**
|
||||
* 根据身份编号获取指定日期当时的年龄年龄，只支持15或18位身份证号码
|
||||
*
|
||||
* @param idCard 身份编号
|
||||
*
|
||||
* @param idCard 身份编号
|
||||
* @param dateToCompare 以此日期为界，计算年龄。
|
||||
* @return 年龄
|
||||
*/
|
||||
@ -425,12 +432,12 @@ public class IdcardUtil {
|
||||
|
||||
/**
|
||||
* 根据身份编号获取生日年，只支持15或18位身份证号码
|
||||
*
|
||||
*
|
||||
* @param idCard 身份编号
|
||||
* @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) {
|
||||
@ -441,12 +448,12 @@ public class IdcardUtil {
|
||||
|
||||
/**
|
||||
* 根据身份编号获取生日月，只支持15或18位身份证号码
|
||||
*
|
||||
*
|
||||
* @param idCard 身份编号
|
||||
* @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) {
|
||||
@ -457,12 +464,12 @@ public class IdcardUtil {
|
||||
|
||||
/**
|
||||
* 根据身份编号获取生日天，只支持15或18位身份证号码
|
||||
*
|
||||
*
|
||||
* @param idCard 身份编号
|
||||
* @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) {
|
||||
@ -473,33 +480,27 @@ public class IdcardUtil {
|
||||
|
||||
/**
|
||||
* 根据身份编号获取性别，只支持15或18位身份证号码
|
||||
*
|
||||
*
|
||||
* @param idCard 身份编号
|
||||
* @return 性别(1: 男，0: 女)
|
||||
* @return 性别(1 : 男 ， 0 : 女)
|
||||
*/
|
||||
public static int getGenderByIdCard(String idCard) {
|
||||
Assert.notBlank(idCard);
|
||||
final int len = idCard.length();
|
||||
if(len < CHINA_ID_MIN_LENGTH) {
|
||||
if (len < CHINA_ID_MIN_LENGTH) {
|
||||
throw new IllegalArgumentException("ID Card length must be 15 or 18");
|
||||
}
|
||||
|
||||
|
||||
if (len == CHINA_ID_MIN_LENGTH) {
|
||||
idCard = convert15To18(idCard);
|
||||
}
|
||||
char sCardChar = idCard.charAt(16);
|
||||
int gender = -1;
|
||||
if (Integer.parseInt(String.valueOf(sCardChar)) % 2 != 0) {
|
||||
gender = 1;
|
||||
} else {
|
||||
gender = 0;
|
||||
}
|
||||
return gender;
|
||||
return (sCardChar % 2 != 0) ? 1 : 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据身份编号获取户籍省份，只支持15或18位身份证号码
|
||||
*
|
||||
*
|
||||
* @param idCard 身份编码
|
||||
* @return 省级编码。
|
||||
*/
|
||||
@ -514,22 +515,23 @@ public class IdcardUtil {
|
||||
|
||||
/**
|
||||
* 隐藏指定位置的几个身份证号数字为“*”
|
||||
*
|
||||
* @param idCard 身份证号
|
||||
*
|
||||
* @param idCard 身份证号
|
||||
* @param startInclude 开始位置（包含）
|
||||
* @param endExclude 结束位置（不包含）
|
||||
* @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位身份证校验码
|
||||
*
|
||||
*
|
||||
* @param code17 18位身份证号中的前17位
|
||||
* @return 第18位
|
||||
*/
|
||||
@ -540,44 +542,44 @@ public class IdcardUtil {
|
||||
|
||||
/**
|
||||
* 将power和值与11取模获得余数进行校验码判断
|
||||
*
|
||||
* @param iSum
|
||||
*
|
||||
* @param iSum 加权和
|
||||
* @return 校验位
|
||||
*/
|
||||
private static char getCheckCode18(int iSum) {
|
||||
switch (iSum % 11) {
|
||||
case 10:
|
||||
return '2';
|
||||
case 9:
|
||||
return '3';
|
||||
case 8:
|
||||
return '4';
|
||||
case 7:
|
||||
return '5';
|
||||
case 6:
|
||||
return '6';
|
||||
case 5:
|
||||
return '7';
|
||||
case 4:
|
||||
return '8';
|
||||
case 3:
|
||||
return '9';
|
||||
case 2:
|
||||
return 'x';
|
||||
case 1:
|
||||
return '0';
|
||||
case 0:
|
||||
return '1';
|
||||
default:
|
||||
return StrUtil.C_SPACE;
|
||||
case 10:
|
||||
return '2';
|
||||
case 9:
|
||||
return '3';
|
||||
case 8:
|
||||
return '4';
|
||||
case 7:
|
||||
return '5';
|
||||
case 6:
|
||||
return '6';
|
||||
case 5:
|
||||
return '7';
|
||||
case 4:
|
||||
return '8';
|
||||
case 3:
|
||||
return '9';
|
||||
case 2:
|
||||
return 'x';
|
||||
case 1:
|
||||
return '0';
|
||||
case 0:
|
||||
return '1';
|
||||
default:
|
||||
return StrUtil.C_SPACE;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 将身份证的每位和对应位的加权因子相乘之后，再得到和值
|
||||
*
|
||||
* @param iArr
|
||||
* @return 身份证编码。
|
||||
*
|
||||
* @param iArr 身份证号码的数组
|
||||
* @return 身份证编码
|
||||
*/
|
||||
private static int getPowerSum(char[] iArr) {
|
||||
int iSum = 0;
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,10 +1,14 @@
|
||||
package cn.hutool.crypto;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.math.BigInteger;
|
||||
|
||||
import cn.hutool.core.io.IORuntimeException;
|
||||
import cn.hutool.crypto.asymmetric.SM2;
|
||||
import cn.hutool.crypto.digest.HMac;
|
||||
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 cn.hutool.crypto.asymmetric.SM2;
|
||||
import cn.hutool.crypto.digest.Digester;
|
||||
import cn.hutool.crypto.digest.HMac;
|
||||
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;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.math.BigInteger;
|
||||
|
||||
/**
|
||||
* 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() {
|
||||
return new Digester(SM3);
|
||||
public static SM3 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() {
|
||||
return new SymmetricCrypto(SM4);
|
||||
public static SM4 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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -15,17 +15,24 @@ 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>
|
||||
* 私钥和公钥可以单独传入一个，如此则只能使用此钥匙来做加密或者解密
|
||||
*
|
||||
* @param algorithm 算法
|
||||
*
|
||||
* @param algorithm 算法
|
||||
* @param privateKey 私钥
|
||||
* @param publicKey 公钥
|
||||
* @param publicKey 公钥
|
||||
* @since 3.1.1
|
||||
*/
|
||||
public AbstractAsymmetricCrypto(String algorithm, PrivateKey privateKey, PublicKey publicKey) {
|
||||
@ -34,10 +41,11 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
// ------------------------------------------------------------------ Constructor end
|
||||
|
||||
// --------------------------------------------------------------------------------- Encrypt
|
||||
|
||||
/**
|
||||
* 加密
|
||||
*
|
||||
* @param data 被加密的bytes
|
||||
*
|
||||
* @param data 被加密的bytes
|
||||
* @param keyType 私钥或公钥 {@link KeyType}
|
||||
* @return 加密后的bytes
|
||||
*/
|
||||
@ -45,8 +53,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 编码为Hex字符串
|
||||
*
|
||||
* @param data 被加密的bytes
|
||||
*
|
||||
* @param data 被加密的bytes
|
||||
* @param keyType 私钥或公钥 {@link KeyType}
|
||||
* @return Hex字符串
|
||||
*/
|
||||
@ -56,8 +64,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 编码为Base64字符串
|
||||
*
|
||||
* @param data 被加密的bytes
|
||||
*
|
||||
* @param data 被加密的bytes
|
||||
* @param keyType 私钥或公钥 {@link KeyType}
|
||||
* @return Base64字符串
|
||||
* @since 4.0.1
|
||||
@ -68,8 +76,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 加密
|
||||
*
|
||||
* @param data 被加密的字符串
|
||||
*
|
||||
* @param data 被加密的字符串
|
||||
* @param charset 编码
|
||||
* @param keyType 私钥或公钥 {@link KeyType}
|
||||
* @return 加密后的bytes
|
||||
@ -80,8 +88,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 加密
|
||||
*
|
||||
* @param data 被加密的字符串
|
||||
*
|
||||
* @param data 被加密的字符串
|
||||
* @param charset 编码
|
||||
* @param keyType 私钥或公钥 {@link KeyType}
|
||||
* @return 加密后的bytes
|
||||
@ -92,8 +100,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 加密，使用UTF-8编码
|
||||
*
|
||||
* @param data 被加密的字符串
|
||||
*
|
||||
* @param data 被加密的字符串
|
||||
* @param keyType 私钥或公钥 {@link KeyType}
|
||||
* @return 加密后的bytes
|
||||
*/
|
||||
@ -103,8 +111,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 编码为Hex字符串
|
||||
*
|
||||
* @param data 被加密的字符串
|
||||
*
|
||||
* @param data 被加密的字符串
|
||||
* @param keyType 私钥或公钥 {@link KeyType}
|
||||
* @return Hex字符串
|
||||
* @since 4.0.1
|
||||
@ -115,8 +123,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 编码为Hex字符串
|
||||
*
|
||||
* @param data 被加密的bytes
|
||||
*
|
||||
* @param data 被加密的bytes
|
||||
* @param charset 编码
|
||||
* @param keyType 私钥或公钥 {@link KeyType}
|
||||
* @return Hex字符串
|
||||
@ -128,8 +136,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 编码为Base64字符串，使用UTF-8编码
|
||||
*
|
||||
* @param data 被加密的字符串
|
||||
*
|
||||
* @param data 被加密的字符串
|
||||
* @param keyType 私钥或公钥 {@link KeyType}
|
||||
* @return Base64字符串
|
||||
* @since 4.0.1
|
||||
@ -140,8 +148,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 编码为Base64字符串
|
||||
*
|
||||
* @param data 被加密的字符串
|
||||
*
|
||||
* @param data 被加密的字符串
|
||||
* @param keyType 私钥或公钥 {@link KeyType}
|
||||
* @return Base64字符串
|
||||
* @since 4.0.1
|
||||
@ -152,8 +160,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 加密
|
||||
*
|
||||
* @param data 被加密的数据流
|
||||
*
|
||||
* @param data 被加密的数据流
|
||||
* @param keyType 私钥或公钥 {@link KeyType}
|
||||
* @return 加密后的bytes
|
||||
* @throws IORuntimeException IO异常
|
||||
@ -164,8 +172,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 编码为Hex字符串
|
||||
*
|
||||
* @param data 被加密的数据流
|
||||
*
|
||||
* @param data 被加密的数据流
|
||||
* @param keyType 私钥或公钥 {@link KeyType}
|
||||
* @return Hex字符串
|
||||
* @since 4.0.1
|
||||
@ -176,8 +184,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 编码为Base64字符串
|
||||
*
|
||||
* @param data 被加密的数据流
|
||||
*
|
||||
* @param data 被加密的数据流
|
||||
* @param keyType 私钥或公钥 {@link KeyType}
|
||||
* @return Base64字符串
|
||||
* @since 4.0.1
|
||||
@ -188,8 +196,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 分组加密
|
||||
*
|
||||
* @param data 数据
|
||||
*
|
||||
* @param data 数据
|
||||
* @param keyType 密钥类型
|
||||
* @return 加密后的密文
|
||||
* @throws CryptoException 加密异常
|
||||
@ -201,8 +209,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 分组加密
|
||||
*
|
||||
* @param data 数据
|
||||
*
|
||||
* @param data 数据
|
||||
* @param keyType 密钥类型
|
||||
* @param charset 加密前编码
|
||||
* @return 加密后的密文
|
||||
@ -214,10 +222,11 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------------------- Decrypt
|
||||
|
||||
/**
|
||||
* 解密
|
||||
*
|
||||
* @param bytes 被解密的bytes
|
||||
*
|
||||
* @param bytes 被解密的bytes
|
||||
* @param keyType 私钥或公钥 {@link KeyType}
|
||||
* @return 解密后的bytes
|
||||
*/
|
||||
@ -225,8 +234,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 解密
|
||||
*
|
||||
* @param data 被解密的bytes
|
||||
*
|
||||
* @param data 被解密的bytes
|
||||
* @param keyType 私钥或公钥 {@link KeyType}
|
||||
* @return 解密后的bytes
|
||||
* @throws IORuntimeException IO异常
|
||||
@ -237,8 +246,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 从Hex或Base64字符串解密，编码为UTF-8格式
|
||||
*
|
||||
* @param data Hex（16进制）或Base64字符串
|
||||
*
|
||||
* @param data Hex（16进制）或Base64字符串
|
||||
* @param keyType 私钥或公钥 {@link KeyType}
|
||||
* @return 解密后的bytes
|
||||
* @since 4.5.2
|
||||
@ -249,8 +258,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 解密为字符串，密文需为Hex（16进制）或Base64字符串
|
||||
*
|
||||
* @param data 数据，Hex（16进制）或Base64字符串
|
||||
*
|
||||
* @param data 数据，Hex（16进制）或Base64字符串
|
||||
* @param keyType 密钥类型
|
||||
* @param charset 加密前编码
|
||||
* @return 解密后的密文
|
||||
@ -262,8 +271,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 解密为字符串，密文需为Hex（16进制）或Base64字符串
|
||||
*
|
||||
* @param data 数据，Hex（16进制）或Base64字符串
|
||||
*
|
||||
* @param data 数据，Hex（16进制）或Base64字符串
|
||||
* @param keyType 密钥类型
|
||||
* @return 解密后的密文
|
||||
* @since 4.5.2
|
||||
@ -274,8 +283,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 解密BCD
|
||||
*
|
||||
* @param data 数据
|
||||
*
|
||||
* @param data 数据
|
||||
* @param keyType 密钥类型
|
||||
* @return 解密后的密文
|
||||
* @since 4.1.0
|
||||
@ -286,8 +295,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 分组解密
|
||||
*
|
||||
* @param data 数据
|
||||
*
|
||||
* @param data 数据
|
||||
* @param keyType 密钥类型
|
||||
* @param charset 加密前编码
|
||||
* @return 解密后的密文
|
||||
@ -300,8 +309,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 解密为字符串，密文需为BCD格式
|
||||
*
|
||||
* @param data 数据，BCD格式
|
||||
*
|
||||
* @param data 数据，BCD格式
|
||||
* @param keyType 密钥类型
|
||||
* @param charset 加密前编码
|
||||
* @return 解密后的密文
|
||||
@ -313,8 +322,8 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
|
||||
|
||||
/**
|
||||
* 解密为字符串，密文需为BCD格式，编码为UTF-8格式
|
||||
*
|
||||
* @param data 数据，BCD格式
|
||||
*
|
||||
* @param data 数据，BCD格式
|
||||
* @param keyType 密钥类型
|
||||
* @return 解密后的密文
|
||||
* @since 4.5.2
|
||||
|
||||
@ -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;
|
||||
/** 盐值 */
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ public enum HmacAlgorithm {
|
||||
|
||||
private String value;
|
||||
|
||||
private HmacAlgorithm(String value) {
|
||||
HmacAlgorithm(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
|
||||
@ -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实例
|
||||
|
||||
63
hutool-crypto/src/main/java/cn/hutool/crypto/digest/SM3.java
Normal file
63
hutool-crypto/src/main/java/cn/hutool/crypto/digest/SM3.java
Normal file
@ -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;
|
||||
}
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -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(this.key);
|
||||
this.sbox = initSBox(StrUtil.utf8Bytes(key));
|
||||
} finally {
|
||||
writeLock.unlock();
|
||||
}
|
||||
|
||||
166
hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SM4.java
Normal file
166
hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SM4.java
Normal file
@ -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
|
||||
}
|
||||
@ -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
|
||||
|
||||
/**
|
||||
|
||||
@ -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 cn.hutool.crypto.SmUtil;
|
||||
import cn.hutool.crypto.digest.HMac;
|
||||
import cn.hutool.crypto.symmetric.SymmetricCrypto;
|
||||
import javax.crypto.SecretKey;
|
||||
|
||||
/**
|
||||
* SM单元测试
|
||||
@ -25,17 +32,34 @@ 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);
|
||||
Assert.assertEquals(content, decryptStr);
|
||||
|
||||
@ -18,7 +18,7 @@ public class EnvSettingInfo {
|
||||
|
||||
private String reportFolder = "/report";
|
||||
private String screenshotFolder = "/screenshot";;
|
||||
|
||||
|
||||
private String elementFolder = "/config/element/";
|
||||
private String suiteFolder = "/config/suite/";
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user