From d42096fd55c4b0caf84bb4f208b4e17534e158c1 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 21 五月 2026 15:34:49 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/opo-qd

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java |   49 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java
index 93e92a4..e204090 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java
@@ -3,7 +3,6 @@
 import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.common.utils.sign.Base64;
 import com.ruoyi.common.utils.sign.Md5Utils;
 import com.ruoyi.project.domain.GiApi;
 import com.ruoyi.project.domain.dto.ApiDTO;
@@ -16,7 +15,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.List;
 import java.util.Map;
 
@@ -32,15 +35,55 @@
     @PostMapping("/send")
     public AjaxResult getApiList(@RequestBody SmsDTO DTO) {
         if (ObjectUtils.isNotEmpty(DTO.getTel())&&ObjectUtils.isNotEmpty(DTO.getMessageContent())) {
-            String key= Md5Utils.hash(Md5Utils.hash(passWord.toLowerCase())+passWord.toLowerCase()+Md5Utils.hash(loginName.toLowerCase()));
+            String key= keyForMd5(loginName.toLowerCase(),passWord.toLowerCase());
             key="5b2d0edb45ac3583543fbf55d8af1e6d";
             String content="{\"LoginName\":\""+loginName+"\",\"PassWord\":\""+passWord+"\"," +
                     "\"Key\":\""+key+"\"," +
                     "\"Tel\":\""+DTO.getTel()+"\",\"MessageContent\":\""+DTO.getMessageContent()+"\"}";
-           String result= HttpUtils.sendPost(url, Base64.encode(content.getBytes()) );
+           String result= HttpUtils.sendPost(url, Base64.getEncoder().encodeToString(content.getBytes()) );
             return AjaxResult.success(result);
         } else {
             return AjaxResult.error("鐢佃瘽鍜屾秷鎭笉鑳戒负绌�");
         }
     }
+    public String keyForMd5(String name, String pass)
+    {
+        return md5(md5(pass) + pass + md5(name));
+    }
+
+
+    public static String md5(String str) {
+
+        return hashPasswordForStoring(str,"MD5");
+    }
+
+    public static String SHA1(String str) {
+
+        return hashPasswordForStoring(str,"SHA1");
+    }
+
+    public static String hashPasswordForStoring(String password, String algorithm) {
+        try {
+            // 1. 鑾峰彇鍝堝笇绠楁硶瀹炰緥
+            MessageDigest md = MessageDigest.getInstance(algorithm);
+            // 2. 瀵嗙爜杞� UTF-8 瀛楄妭锛堝拰 .NET 瀹屽叏涓�鑷达級
+            byte[] passwordBytes = password.getBytes(StandardCharsets.UTF_8);
+            // 3. 璁$畻鍝堝笇
+            byte[] hashBytes = md.digest(passwordBytes);
+            // 4. 杞负澶у啓鍗佸叚杩涘埗瀛楃涓诧紙鍜� .NET 杈撳嚭鏍煎紡涓�鑷达級
+            return bytesToHexUpperCase(hashBytes);
+
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("涓嶆敮鎸佺殑鍝堝笇绠楁硶: " + algorithm, e);
+        }
+    }
+    private static String bytesToHexUpperCase(byte[] bytes) {
+        StringBuilder sb = new StringBuilder();
+        for (byte b : bytes) {
+            // 杞袱浣嶅ぇ鍐欏崄鍏繘鍒�
+            sb.append(String.format("%02X", b));
+        }
+        return sb.toString();
+    }
+
 }

--
Gitblit v1.9.3