ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2022-05-05 14:07:20 +08:00
parent 3ca429af58
commit 41bd03fa25
2 changed files with 26 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestUtil.java
View File

@ -33,7 +33,7 @@ public class DigestUtil {
* @param charset 编码
* @return MD5摘要
*/
public static byte[] md5(final String data, final String charset) {
public static byte[] md5(final String data, final Charset charset) {
return new MD5().digest(data, charset);
}
@ -44,7 +44,7 @@ public class DigestUtil {
* @return MD5摘要
*/
public static byte[] md5(final String data) {
return md5(data, CharsetUtil.NAME_UTF_8);
return md5(data, CharsetUtil.UTF_8);
}
/**
@ -77,17 +77,6 @@ public class DigestUtil {
return new MD5().digestHex(data);
}
/**
* 计算32位MD5摘要值，并转为16进制字符串
*
* @param data 被摘要数据
* @param charset 编码
* @return MD5摘要的16进制表示
*/
public static String md5Hex(final String data, final String charset) {
return new MD5().digestHex(data, charset);
}
/**
* 计算32位MD5摘要值，并转为16进制字符串
*
@ -107,7 +96,7 @@ public class DigestUtil {
* @return MD5摘要的16进制表示
*/
public static String md5Hex(final String data) {
return md5Hex(data, CharsetUtil.NAME_UTF_8);
return md5Hex(data, CharsetUtil.UTF_8);
}
/**
@ -218,7 +207,7 @@ public class DigestUtil {
* @param charset 编码
* @return SHA-1摘要
*/
public static byte[] sha1(final String data, final String charset) {
public static byte[] sha1(final String data, final Charset charset) {
return new Digester(DigestAlgorithm.SHA1).digest(data, charset);
}
@ -229,7 +218,7 @@ public class DigestUtil {
* @return MD5摘要
*/
public static byte[] sha1(final String data) {
return sha1(data, CharsetUtil.NAME_UTF_8);
return sha1(data, CharsetUtil.UTF_8);
}
/**
@ -269,7 +258,7 @@ public class DigestUtil {
* @param charset 编码
* @return SHA-1摘要的16进制表示
*/
public static String sha1Hex(final String data, final String charset) {
public static String sha1Hex(final String data, final Charset charset) {
return new Digester(DigestAlgorithm.SHA1).digestHex(data, charset);
}
@ -280,7 +269,7 @@ public class DigestUtil {
* @return SHA-1摘要的16进制表示
*/
public static String sha1Hex(final String data) {
return sha1Hex(data, CharsetUtil.NAME_UTF_8);
return sha1Hex(data, CharsetUtil.UTF_8);
}
/**
@ -316,18 +305,6 @@ public class DigestUtil {
return new Digester(DigestAlgorithm.SHA256).digest(data);
}
/**
* 计算SHA-256摘要值
*
* @param data 被摘要数据
* @param charset 编码
* @return SHA-256摘要
* @since 3.0.8
*/
public static byte[] sha256(final String data, final String charset) {
return new Digester(DigestAlgorithm.SHA256).digest(data, charset);
}
/**
* 计算sha256摘要值，使用UTF-8编码
*
@ -336,7 +313,18 @@ public class DigestUtil {
* @since 3.0.8
*/
public static byte[] sha256(final String data) {
return sha256(data, CharsetUtil.NAME_UTF_8);
return sha256(data, CharsetUtil.UTF_8);
}
/**
* 计算SHA-256摘要值
*
* @param data 被摘要数据
* @param charset 编码
* @return SHA-256摘要
*/
public static byte[] sha256(final String data, final Charset charset) {
return new Digester(DigestAlgorithm.SHA256).digest(data, charset);
}
/**
@ -380,7 +368,7 @@ public class DigestUtil {
* @return SHA-256摘要的16进制表示
* @since 3.0.8
*/
public static String sha256Hex(final String data, final String charset) {
public static String sha256Hex(final String data, final Charset charset) {
return new Digester(DigestAlgorithm.SHA256).digestHex(data, charset);
}
@ -392,7 +380,7 @@ public class DigestUtil {
* @since 3.0.8
*/
public static String sha256Hex(final String data) {
return sha256Hex(data, CharsetUtil.NAME_UTF_8);
return sha256Hex(data, CharsetUtil.UTF_8);
}
/**
@ -437,7 +425,7 @@ public class DigestUtil {
* @return SHA-512摘要
* @since 3.0.8
*/
public static byte[] sha512(final String data, final String charset) {
public static byte[] sha512(final String data, final Charset charset) {
return new Digester(DigestAlgorithm.SHA512).digest(data, charset);
}
@ -448,7 +436,7 @@ public class DigestUtil {
* @return MD5摘要
*/
public static byte[] sha512(final String data) {
return sha512(data, CharsetUtil.NAME_UTF_8);
return sha512(data, CharsetUtil.UTF_8);
}
/**
@ -488,7 +476,7 @@ public class DigestUtil {
* @param charset 编码
* @return SHA-512摘要的16进制表示
*/
public static String sha512Hex(final String data, final String charset) {
public static String sha512Hex(final String data, final Charset charset) {
return new Digester(DigestAlgorithm.SHA512).digestHex(data, charset);
}
@ -499,7 +487,7 @@ public class DigestUtil {
* @return SHA-512摘要的16进制表示
*/
public static String sha512Hex(final String data) {
return sha512Hex(data, CharsetUtil.NAME_UTF_8);
return sha512Hex(data, CharsetUtil.UTF_8);
}
/**

23
hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java
View File

@ -159,16 +159,6 @@ public class Digester implements Serializable {
}
// ------------------------------------------------------------------------------------------- Digest
/**
* 生成文件摘要
*
* @param data 被摘要数据
* @param charsetName 编码
* @return 摘要
*/
public byte[] digest(final String data, final String charsetName) {
return digest(data, CharsetUtil.charset(charsetName));
}
/**
* 生成文件摘要
@ -192,17 +182,6 @@ public class Digester implements Serializable {
return digest(data, CharsetUtil.UTF_8);
}
/**
* 生成文件摘要，并转为16进制字符串
*
* @param data 被摘要数据
* @param charsetName 编码
* @return 摘要
*/
public String digestHex(final String data, final String charsetName) {
return digestHex(data, CharsetUtil.charset(charsetName));
}
/**
* 生成文件摘要，并转为16进制字符串
*
@ -222,7 +201,7 @@ public class Digester implements Serializable {
* @return 摘要
*/
public String digestHex(final String data) {
return digestHex(data, CharsetUtil.NAME_UTF_8);
return digestHex(data, CharsetUtil.UTF_8);
}
/**