Merge remote-tracking branch 'origin/v5-dev' into v5-dev

# Conflicts: # hutool-core/src/main/java/cn/hutool/core/util/RadixUtil.java
2025-07-21 15:09:48 +08:00 · 2021-07-02 09:36:02 +08:00
parent d3c925ca0b e7a5295460
commit c03f62b4db
4 changed files with 45 additions and 40 deletions
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/SmUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/SmUtil.java
@@ -188,9 +188,9 @@ public class SmUtil {
 	 * </pre>
 	 *
 	 * @param key 密钥
-	 * @return {@link SymmetricCrypto}
+	 * @return {@link SM4}
 	 */
-	public static SymmetricCrypto sm4(byte[] key) {
+	public static SM4 sm4(byte[] key) {
 		return new SM4(key);
 	}