From 98e9c113781f11e8e3d271d1173df240bd2cc4e8 Mon Sep 17 00:00:00 2001
From: mayuanfei <mayuanfei@163.com>
Date: Tue, 18 Apr 2023 16:15:34 +0800
Subject: [PATCH] =?UTF-8?q?SecurityUtils=E7=B1=BB=E5=90=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=B9=B6=E4=B8=94=E5=8A=A0=E5=85=A5md5=E5=92=8Csha256?=
 =?UTF-8?q?=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

---
 .../{SecurityUtils.java => EncryptUtils.java} | 66 +++++++------------
 1 file changed, 22 insertions(+), 44 deletions(-)
 rename ruoyi-common/src/main/java/com/ruoyi/common/utils/{SecurityUtils.java => EncryptUtils.java} (74%)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/EncryptUtils.java
similarity index 74%
rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
rename to ruoyi-common/src/main/java/com/ruoyi/common/utils/EncryptUtils.java
index edbb29311..e278a8409 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/EncryptUtils.java
@@ -18,7 +18,7 @@ import java.util.Map;
  *
  * @author 老马
  */
-public class SecurityUtils {
+public class EncryptUtils {
     /**
      * 公钥
      */
@@ -130,7 +130,7 @@ public class SecurityUtils {
      * @return 公私钥Map
      */
     public static Map<String, String> generateSm2Key() {
-        Map<String, String> keyMap = new HashMap<>();
+        Map<String, String> keyMap = new HashMap<>(2);
         SM2 sm2 = SmUtil.sm2();
         keyMap.put(PRIVATE_KEY, sm2.getPrivateKeyBase64());
         keyMap.put(PUBLIC_KEY, sm2.getPublicKeyBase64());
@@ -173,7 +173,7 @@ public class SecurityUtils {
      * @return 公私钥Map
      */
     public static Map<String, String> generateRsaKey() {
-        Map<String, String> keyMap = new HashMap<>();
+        Map<String, String> keyMap = new HashMap<>(2);
         RSA rsa = SecureUtil.rsa();
         keyMap.put(PRIVATE_KEY, rsa.getPrivateKeyBase64());
         keyMap.put(PUBLIC_KEY, rsa.getPublicKeyBase64());
@@ -210,46 +210,24 @@ public class SecurityUtils {
         return rsa.decryptStr(data, KeyType.PrivateKey, StandardCharsets.UTF_8);
     }
 
-    // 测试方法
-    public static void main(String[] args) {
-        String str = "";
-        String password = "";
-        Map<String, String> keyMap = new HashMap<>();
-
-        //base64加解密测试
-        str = "老马base64加解密测试";
-        String encryptByBase64 = encryptByBase64(str);
-        System.out.println("base64加解密测试: encryptByBase64=" + encryptByBase64);
-        String decryptByBase64 = decryptByBase64(encryptByBase64);
-        System.out.println("base64加解密测试: decryptByBase64=" + decryptByBase64);
-        //aes加解密测试
-        str = "老马aes测试";
-        password = "adsfasddg234sfwt2545sgr@";
-        String encryptByAes = encryptByAes(str, password);
-        System.out.println("aes加解密测试: encryptByAes=" + encryptByAes);
-        String decryptByAes = decryptByAes(encryptByAes, password);
-        System.out.println("aes加解密测试: decryptByAes=" + decryptByAes);
-        //sm4加解密测试
-        str = "老马sm4测试";
-        password = "adsfasddg234sfwt";
-        String encryptBySm4 = encryptBySm4(str, password);
-        System.out.println("sm4加解密测试: encryptBySm4=" + encryptBySm4);
-        String decryptBySm4 = decryptBySm4(encryptBySm4, password);
-        System.out.println("sm4加解密测试: decryptBySm4=" + decryptBySm4);
-        //sm2加解密测试
-        str = "老马sm2测试";
-        keyMap = generateSm2Key();
-        String encryptBySm2 = encryptBySm2(str, keyMap.get(SecurityUtils.PUBLIC_KEY));
-        System.out.println("sm2加解密测试: encryptBySm2=" + encryptBySm2);
-        String decryptBySm2 = decryptBySm2(encryptBySm2, keyMap.get(SecurityUtils.PRIVATE_KEY));
-        System.out.println("sm2加解密测试: decryptBySm2=" + decryptBySm2);
-        //rsa加解密测试
-        str = "老马rsa测试";
-        keyMap = generateRsaKey();
-        String encryptByRsa = encryptByRsa(str, keyMap.get(SecurityUtils.PUBLIC_KEY));
-        System.out.println("rsa加解密测试: encryptByRsa=" + encryptByRsa);
-        String decryptByRsa = decryptByRsa(encryptByRsa, keyMap.get(SecurityUtils.PRIVATE_KEY));
-        System.out.println("rsa加解密测试: decryptByRsa=" + decryptByRsa);
-
+    /**
+     * md5加密
+     *
+     * @param data 待加密数据
+     * @return 加密后字符串, 采用Hex编码
+     */
+    public static String encryptByMd5(String data) {
+        return SecureUtil.md5(data);
     }
+
+    /**
+     * sha256加密
+     *
+     * @param data 待加密数据
+     * @return 加密后字符串, 采用Hex编码
+     */
+    public static String encryptBySha256(String data) {
+        return SecureUtil.sha256(data);
+    }
+
 }