From 742c825ad91c17e8e2d2189d590817e3fd3b62c4 Mon Sep 17 00:00:00 2001
From: fuxinji9527 <1992666531@qq.com>
Date: Tue, 7 May 2024 17:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E5=85=A5commons-codec=EF=BC=8C?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2SHA256=E5=8A=A0=E5=AF=86=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  7 ++++
 .../DomainPackageServiceImpl.java             |  3 +-
 .../com/easysoftware/redis/RedisUtil.java     | 36 -------------------
 3 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/pom.xml b/pom.xml
index a3b0d02..509b378 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,6 +171,13 @@
 			<groupId>org.springframework.kafka</groupId>
 			<artifactId>spring-kafka</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.15</version>
+		</dependency>
+
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java b/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java
index 6d17dad..65a0519 100644
--- a/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java
+++ b/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java
@@ -30,6 +30,7 @@ import com.easysoftware.ranking.Ranker;
 import com.easysoftware.redis.RedisGateway;
 import com.easysoftware.redis.RedisUtil;
 import jakarta.annotation.Resource;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -201,7 +202,7 @@ public class DomainPackageServiceImpl implements DomainPackageService {
         // 根据请求参数生成唯一redis key
         String redisKeyStr = RedisUtil.objectToString(condition);
         String redisKeyFormat = "domainPage_%s";
-        String redisKey = String.format(redisKeyFormat, RedisUtil.getSHA256(redisKeyStr));
+        String redisKey = String.format(redisKeyFormat, DigestUtils.sha256Hex(redisKeyStr));
         try {
             // 结果未过期，直接返回
             if (redisGateway.hasKey(redisKey)) {
diff --git a/src/main/java/com/easysoftware/redis/RedisUtil.java b/src/main/java/com/easysoftware/redis/RedisUtil.java
index 90209db..ff32a19 100644
--- a/src/main/java/com/easysoftware/redis/RedisUtil.java
+++ b/src/main/java/com/easysoftware/redis/RedisUtil.java
@@ -7,9 +7,6 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -124,38 +121,5 @@ public final class RedisUtil {
             return null;
         }
     }
-
-    /**
-     * Generate the SHA-256 hash of an input string.
-     *
-     * @param input The input string to generate the hash for.
-     * @return The SHA-256 hash of the input string.
-     */
-    public static String getSHA256(final String input) {
-        try {
-            // 初始化MessageDigest实例，并指定SHA-256算法
-            MessageDigest md = MessageDigest.getInstance("SHA-256");
-
-            // 将输入字符串转换为字节数组，并更新摘要
-            md.update(input.getBytes(StandardCharsets.UTF_8));
-
-            // 完成哈希计算，并获取哈希值的字节表示
-            byte[] hash = md.digest();
-
-            // 将字节数组转换为十六进制字符串
-            StringBuilder hexString = new StringBuilder();
-            for (byte b : hash) {
-                String hex = Integer.toHexString(0xff & b);
-                if (hex.length() == 1) {
-                    hexString.append('0');
-                }
-                hexString.append(hex);
-            }
-
-            return hexString.toString();
-        } catch (NoSuchAlgorithmException e) {
-            throw new RuntimeException(e);
-        }
-    }
 }
 
-- 
Gitee