From 7aee7d20388a561db24d80a06ccad0f0920dc833 Mon Sep 17 00:00:00 2001 From: pickmefly <36589961+pickmefly@users.noreply.github.com> Date: Mon, 10 Jan 2022 16:56:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?TG=5Fbot=E8=AF=B7=E6=B1=82=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E4=B8=BAGET?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 兼容更多反代 --- .../sms/forwarder/sender/SenderTelegramMsg.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderTelegramMsg.java b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderTelegramMsg.java index f3a141e2..441ce992 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderTelegramMsg.java +++ b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderTelegramMsg.java @@ -54,14 +54,8 @@ public class SenderTelegramMsg extends SenderBaseMsg { } final String requestUrl = apiToken; Log.i(TAG, "requestUrl:" + requestUrl); - - Map bodyMap = new HashMap(); - bodyMap.put("chat_id", chatId); - bodyMap.put("text", text); - bodyMap.put("parse_mode", "HTML"); - - final String requestMsg = JSON.toJSONString(bodyMap); - Log.i(TAG, "requestMsg:" + requestMsg); + String finalText = text; + Log.i(TAG, "requestMsg:" + finalText); //代理相关 final Proxy.Type proxyType = telegramSettingVo.getProxyType(); @@ -107,12 +101,8 @@ public class SenderTelegramMsg extends SenderBaseMsg { .connectionPool(new ConnectionPool(5, 1, TimeUnit.SECONDS)).build(); } - RequestBody requestBody = RequestBody.create(MediaType.parse("application/json;charset=utf-8"), requestMsg); - final Request request = new Request.Builder() - .url(requestUrl) - .addHeader("Content-Type", "application/json; charset=utf-8") - .post(requestBody) + .url(requestUrl+"?chat_id="+chatId+"&text="+ finalText) .build(); client.newCall(request).enqueue(new Callback() { From fad00d68943e7707b994dbd29807182fcaca5cd7 Mon Sep 17 00:00:00 2001 From: pickmefly <36589961+pickmefly@users.noreply.github.com> Date: Mon, 10 Jan 2022 17:19:15 +0800 Subject: [PATCH 2/2] Update SenderTelegramMsg.java --- .../java/com/idormy/sms/forwarder/sender/SenderTelegramMsg.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderTelegramMsg.java b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderTelegramMsg.java index 441ce992..ab14e10c 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderTelegramMsg.java +++ b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderTelegramMsg.java @@ -102,7 +102,7 @@ public class SenderTelegramMsg extends SenderBaseMsg { } final Request request = new Request.Builder() - .url(requestUrl+"?chat_id="+chatId+"&text="+ finalText) + .url(requestUrl + "?chat_id=" + chatId + "&text=" + finalText) .build(); client.newCall(request).enqueue(new Callback() {