From bf5547d84b994f28a44fb0493731a06cebf97358 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Mon, 21 Feb 2022 16:08:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9Awebhook=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=80=9A=E9=81=93=E7=9A=84=20webParams=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8F=AF=E7=94=A8=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sms/forwarder/sender/SenderWebNotifyMsg.java   | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderWebNotifyMsg.java b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderWebNotifyMsg.java
index aaab7062..559dbf59 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderWebNotifyMsg.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderWebNotifyMsg.java
@@ -8,6 +8,7 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 
+import com.alibaba.fastjson.JSON;
 import com.idormy.sms.forwarder.model.vo.SmsVo;
 import com.idormy.sms.forwarder.utils.CertUtils;
 import com.idormy.sms.forwarder.utils.Define;
@@ -178,15 +179,10 @@ public class SenderWebNotifyMsg extends SenderBaseMsg {
 
     //JSON需要转义的字符
     private static String escapeJson(String str) {
-        return str.replace("\n", "\\n")
-                .replace("\"", "\\\"")
-                .replace("\\/", "\\\\/")
-                .replace("\\b", "\\\\b")
-                .replace("\\f", "\\\\f")
-                .replace("\\t", "\\\\t")
-                .replace("\\n", "\\\\n")
-                .replace("\\r", "\\\\r")
-                .replace("\\u", "\\\\u");
+        if (str == null) return "null";
+
+        String jsonStr = JSON.toJSONString(str);
+        return jsonStr.length() >= 2 ? jsonStr.substring(1, jsonStr.length() - 1) : jsonStr;
     }
 
 }
\ No newline at end of file