merge conflict

2025-07-21 15:09:48 +08:00 · 2021-06-09 16:26:07 +08:00
parent b3a191bf90 227a740fab
commit 35e7c8a09d
241 changed files with 1907 additions and 1284 deletions
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java
@@ -247,7 +247,7 @@ public class SymmetricCrypto implements Serializable {
 	}

 	/**
-	 * 加密，针对大数据量，结束后不关闭流
+	 * 加密，针对大数据量，可选结束后是否关闭流
 	 *
 	 * @param data 被加密的字符串
 	 * @param out 输出流，可以是文件或网络位置