From 3cc2311600be64453f8c296d66fb1d0daa084536 Mon Sep 17 00:00:00 2001 From: Easy Date: Wed, 23 Oct 2024 13:40:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9Server=E9=85=B1=C2=B3Sendkey?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idormy/sms/forwarder/utils/sender/ServerchanUtils.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/ServerchanUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/ServerchanUtils.kt index bc220d8a..4f3130bc 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/ServerchanUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/ServerchanUtils.kt @@ -38,7 +38,14 @@ class ServerchanUtils { msgInfo.getContentForSend(SettingUtils.smsTemplate) } - val requestUrl: String = String.format("https://sctapi.ftqq.com/%s.send", setting.sendKey) //推送地址 + // 兼容Server酱³Sendkey，使用正则表达式提取数字部分 + val matchResult = Regex("^sctp(\\d+)t", RegexOption.IGNORE_CASE).find(setting.sendKey) + val requestUrl = if (matchResult != null && matchResult.groups[1] != null) { + "https://${matchResult.groups[1]?.value}.push.ft07.com/send/${setting.sendKey}.send" + } else { + String.format("https://sctapi.ftqq.com/%s.send", setting.sendKey) // 默认推送地址 + } + Log.i(TAG, "requestUrl:$requestUrl") val request = XHttp.post(requestUrl)