diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java index 8fb0fc5e4..2320dab04 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java @@ -1,67 +1,42 @@ package com.ruoyi.common.utils.sign; -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.springframework.util.DigestUtils; +import java.io.IOException; +import java.io.InputStream; /** * Md5加密方法 - * + * * @author ruoyi */ -public class Md5Utils -{ - private static final Logger log = LoggerFactory.getLogger(Md5Utils.class); +public class Md5Utils { - private static byte[] md5(String s) - { - MessageDigest algorithm; - try - { - algorithm = MessageDigest.getInstance("MD5"); - algorithm.reset(); - algorithm.update(s.getBytes("UTF-8")); - byte[] messageDigest = algorithm.digest(); - return messageDigest; - } - catch (Exception e) - { - log.error("MD5 Error...", e); - } - return null; + /** + * 效验MD5 + * @param s 任意字符串 + * @return md5的值 + */ + public static String hash(String s) { + return hash(s.getBytes()); } - private static final String toHex(byte hash[]) - { - if (hash == null) - { - return null; - } - StringBuffer buf = new StringBuffer(hash.length * 2); - int i; - - for (i = 0; i < hash.length; i++) - { - if ((hash[i] & 0xff) < 0x10) - { - buf.append("0"); - } - buf.append(Long.toString(hash[i] & 0xff, 16)); - } - return buf.toString(); + /** + * 效验MD5 + * @param s 字节 + * @return md5的值 + */ + public static String hash(byte s[]) { + return DigestUtils.md5DigestAsHex(s); } - public static String hash(String s) - { - try - { - return new String(toHex(md5(s)).getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8); - } - catch (Exception e) - { - log.error("not supported charset...{}", e); - return s; - } + /** + * 效验MD5 + * @param s 文件流 + * @return md5的值 + */ + public static String hash(InputStream s) throws IOException { + return DigestUtils.md5DigestAsHex(s); } + + }