littlebalalafairy/SmsForwarder
1
0
Fork 0
mirror of https://github.com/pppscn/SmsForwarder synced 2025-08-03 17:37:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化：发送通道webhook的webParams非空时（wiki:2.1/2.2）不再限制必须包含[msg]标签

Browse Source
This commit is contained in:
pppscn 2022-06-24 09:57:10 +08:00
parent 271fa6a102
commit 27e3340c32
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ class WebhookUtils {
} }
Log.d(TAG, "method = GET, Url = $webServer") Log.d(TAG, "method = GET, Url = $webServer")
requestBuilder = Request.Builder().url(webServer).get() requestBuilder = Request.Builder().url(webServer).get()
} else if (setting.method == "GET" && !TextUtils.isEmpty(setting.webParams)) { } else if (setting.method == "GET" && !TextUtils.isEmpty(webParams)) {
webParams = webParams.toString().replace("[from]", URLEncoder.encode(from, "UTF-8")) webParams = webParams.toString().replace("[from]", URLEncoder.encode(from, "UTF-8"))
.replace("[content]", URLEncoder.encode(content, "UTF-8")) .replace("[content]", URLEncoder.encode(content, "UTF-8"))
.replace("[msg]", URLEncoder.encode(content, "UTF-8")) .replace("[msg]", URLEncoder.encode(content, "UTF-8"))
@ -90,7 +90,7 @@ class WebhookUtils {
webServer += (if (webServer.contains("?")) "&" else "?") + webParams webServer += (if (webServer.contains("?")) "&" else "?") + webParams
Log.d(TAG, "method = GET, Url = $webServer") Log.d(TAG, "method = GET, Url = $webServer")
requestBuilder = Request.Builder().url(webServer).get() requestBuilder = Request.Builder().url(webServer).get()
} else if (webParams != null && webParams.contains("[msg]")) { } else if (webParams != null && !TextUtils.isEmpty(webParams)) {
val bodyMsg: String val bodyMsg: String
var contentType = "application/x-www-form-urlencoded" var contentType = "application/x-www-form-urlencoded"
if (webParams.startsWith("{")) { if (webParams.startsWith("{")) {