From 34d646bd88b9a4b20d26af3503788d955078bbe3 Mon Sep 17 00:00:00 2001 From: zz <358714485@qq.com> Date: Sun, 17 May 2020 18:50:15 +0800 Subject: [PATCH] fix annotation in StrUtil and SymmetricCrypto --- hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java | 4 ++-- .../main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java index f7f8abc4a..3bcb3bc7f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java @@ -2953,7 +2953,7 @@ public class StrUtil { * StrUtil.padAfter("123", 2, '0');//"23" * * - * @param str 字符串,如果为null,按照空串处理 + * @param str 字符串,如果为null,直接返回null * @param minLength 最小长度 * @param padChar 补充的字符 * @return 补充后的字符串 @@ -2981,7 +2981,7 @@ public class StrUtil { * StrUtil.padAfter("123", 2, "ABC");//"23" * * - * @param str 字符串,如果为null,按照空串处理 + * @param str 字符串,如果为null,直接返回null * @param minLength 最小长度 * @param padStr 补充的字符 * @return 补充后的字符串 diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java index bd8fac9c1..27261779d 100644 --- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java +++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java @@ -436,7 +436,7 @@ public class SymmetricCrypto implements Serializable { } /** - * 解密Hex表示的字符串,默认UTF-8编码 + * 解密Hex(16进制)或Base64表示的字符串,默认UTF-8编码 * * @param data 被解密的String * @return 解密后的String