Browse Source

签名方式调整

wangzaijun 1 year ago
parent
commit
461bd39516

+ 3 - 15
src/main/java/com/smppw/analysis/infrastructure/utils/CommonUtils.java

@@ -2,14 +2,13 @@ package com.smppw.analysis.infrastructure.utils;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.digest.MD5;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.DigestUtils;
 
 import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -70,11 +69,7 @@ public class CommonUtils {
         Object[] keys = params.keySet().toArray();
         Arrays.sort(keys);
         for (Object key : keys) {
-            String valueStr = "";
-            Object value = params.get(key.toString());
-            if (value != "") {
-                valueStr = String.valueOf(value);
-            }
+            String valueStr = JSONUtil.toJsonStr(params.get(key.toString()));
             ketStr.append(key)
                     .append("=")
                     .append(valueStr)
@@ -85,14 +80,7 @@ public class CommonUtils {
                 ketStr.append(other);
             }
         }
-        return md5(ketStr.toString());
-    }
-
-    public static String md5(String str) throws Exception {
-        // 指定加密类型
-        MessageDigest messageDigest = MessageDigest.getInstance("MD5");
-        // 将字节数组转换为表示每个字节的十六进制值的字符串
-        return MD5.create().digestHex(messageDigest.digest(str.getBytes(StandardCharsets.UTF_8)));
+        return DigestUtils.md5DigestAsHex(ketStr.toString().getBytes(StandardCharsets.UTF_8));
     }
 
     public static void main(String[] args) throws Exception {