From 74346b7291cf7e72a3d320cbc658ef1aeb19176f Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Sat, 21 Oct 2023 13:12:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A`=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=BA=94=E7=94=A8`=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E9=80=9A=E9=81=93=E5=85=81=E8=AE=B8=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?API=E5=9C=B0=E5=9D=80=E3=80=90=E9=80=9A=E8=BF=87=E5=8F=8D?=
 =?UTF-8?q?=E5=90=91=E4=BB=A3=E7=90=86(proxy=5Fpass=20https://qyapi.weixin?=
 =?UTF-8?q?.qq.com;)=E7=BB=95=E8=BF=87IP=E7=99=BD=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E3=80=91=20#352?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sms/forwarder/entity/setting/WeworkAgentSetting.kt    | 2 +-
 .../idormy/sms/forwarder/utils/sender/WeworkAgentUtils.kt | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/entity/setting/WeworkAgentSetting.kt b/app/src/main/java/com/idormy/sms/forwarder/entity/setting/WeworkAgentSetting.kt
index 437790ab..c67df844 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/entity/setting/WeworkAgentSetting.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/entity/setting/WeworkAgentSetting.kt
@@ -18,7 +18,7 @@ data class WeworkAgentSetting(
     val proxyAuthenticator: Boolean? = false,
     val proxyUsername: String? = "",
     val proxyPassword: String? = "",
-    val customizeAPI: String = "https://qyapi.weixin.qq.com/cgi-bin",
+    val customizeAPI: String = "https://qyapi.weixin.qq.com",
 ) : Serializable {
 
     fun getProxyTypeCheckId(): Int {
diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WeworkAgentUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WeworkAgentUtils.kt
index bd2cd6db..dcf65a76 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WeworkAgentUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WeworkAgentUtils.kt
@@ -47,8 +47,8 @@ class WeworkAgentUtils private constructor() {
                 return sendTextMsg(setting, msgInfo, rule, senderIndex, logId, msgId)
             }
 
-            val customApi = if (TextUtils.isEmpty(setting.customizeAPI)) "https://qyapi.weixin.qq.com/cgi-bin" else setting.customizeAPI
-            var getTokenUrl = "$customApi/gettoken?"
+            val customApi = if (TextUtils.isEmpty(setting.customizeAPI)) "https://qyapi.weixin.qq.com" else setting.customizeAPI
+            var getTokenUrl = "$customApi/cgi-bin/gettoken?"
             getTokenUrl += "corpid=" + setting.corpID
             getTokenUrl += "&corpsecret=" + setting.secret
             Log.d(TAG, "getTokenUrl：$getTokenUrl")
@@ -141,8 +141,8 @@ class WeworkAgentUtils private constructor() {
             textText["content"] = content
             textMsgMap["text"] = textText
             val accessToken: String by SharedPreference("access_token_" + setting.agentID, "")
-            val customApi = if (TextUtils.isEmpty(setting.customizeAPI)) "https://qyapi.weixin.qq.com/cgi-bin" else setting.customizeAPI
-            val requestUrl = "$customApi/message/send?access_token=$accessToken"
+            val customApi = if (TextUtils.isEmpty(setting.customizeAPI)) "https://qyapi.weixin.qq.com" else setting.customizeAPI
+            val requestUrl = "$customApi/cgi-bin/message/send?access_token=$accessToken"
             Log.i(TAG, "requestUrl:$requestUrl")
             val requestMsg: String = Gson().toJson(textMsgMap)
             Log.i(TAG, "requestMsg:$requestMsg")