From 073bae0db892c592dfccdc845f97225eac88e2a7 Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Wed, 10 Apr 2024 20:57:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A`Webhook`=20?= =?UTF-8?q?=E9=9D=9E=20`HTTP=20200`=20=E5=BA=94=E7=AD=94=E6=97=B6=E4=BB=8D?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=8C=87=E5=AE=9A=20`=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E5=BA=94=E7=AD=94=E5=85=B3=E9=94=AE=E5=AD=97`=20#234?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idormy/sms/forwarder/utils/sender/WebhookUtils.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt index e819c840..c65f643f 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt @@ -239,18 +239,17 @@ class WebhookUtils { .timeStamp(true) //url自动追加时间戳，避免缓存 .addInterceptor(LoggingInterceptor(logId)) //增加一个log拦截器, 记录请求日志 .addInterceptor(NoContentInterceptor(logId)) //拦截 HTTP 204 响应 - .execute(object : SimpleCallBack() { + .execute(object : SimpleCallBack() { override fun onError(e: ApiException) { - e.printStackTrace() + //e.printStackTrace() Log.e(TAG, e.detailMessage) - val status = 0 + val status = if (setting.response.isNotEmpty() && e.detailMessage.contains(setting.response)) 2 else 0 SendUtils.updateLogs(logId, status, e.displayMessage) SendUtils.senderLogic(status, msgInfo, rule, senderIndex, msgId) } - override fun onSuccess(resp: Any) { - val response = resp.toString() + override fun onSuccess(response: String) { Log.i(TAG, response) val status = if (setting.response.isNotEmpty() && !response.contains(setting.response)) 0 else 2 SendUtils.updateLogs(logId, status, response)