Archives/SmsForwarder
2
0
Fork 0
mirror of https://github.com/pppscn/SmsForwarder synced 2024-11-08 01:10:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

优化：通过Content-Type=applicaton/json指定请求体为json格式 #491

Browse Source
This commit is contained in:
pppscn 2024-06-29 16:27:00 +08:00
parent 3fccec54b1
commit e3df9bada6
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt
View File

@ -91,6 +91,15 @@ class WebhookUtils {
Log.i(TAG, "requestUrl:$requestUrl")
}
//通过`Content-Type=applicaton/json`指定请求体为`json`格式
var isJson = false
for ((key, value) in setting.headers.entries) {
if (key.equals("Content-Type", ignoreCase = true) && value.contains("application/json")) {
isJson = true
break
}
}
val request = if (setting.method == "GET" && TextUtils.isEmpty(webParams)) {
setting.webServer += (if (setting.webServer.contains("?")) "&" else "?") + "from=" + URLEncoder.encode(
from,
@ -128,7 +137,7 @@ class WebhookUtils {
}
Log.d(TAG, "method = GET, Url = $requestUrl")
XHttp.get(requestUrl).keepJson(true)
} else if (webParams.isNotEmpty() && webParams.startsWith("{")) {
} else if (webParams.isNotEmpty() && (isJson || webParams.startsWith("{"))) {
val bodyMsg = webParams.replace("[from]", from)
.replace("[content]", escapeJson(content))
.replace("[msg]", escapeJson(content))