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

优化：企业微信应用发送通道允许自定义API地址【通过反向代理(proxy_pass https://qyapi.weixin.qq.com;)绕过IP白名单限制】 #352

Browse Source
This commit is contained in:
pppscn 2023-10-21 13:12:25 +08:00
parent 8eeb2b1cc2
commit 74346b7291
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/idormy/sms/forwarder/entity/setting/WeworkAgentSetting.kt
View File

@ -18,7 +18,7 @@ data class WeworkAgentSetting(
val proxyAuthenticator: Boolean? = false, val proxyAuthenticator: Boolean? = false,
val proxyUsername: String? = "", val proxyUsername: String? = "",
val proxyPassword: String? = "", val proxyPassword: String? = "",
val customizeAPI: String = "https://qyapi.weixin.qq.com/cgi-bin", val customizeAPI: String = "https://qyapi.weixin.qq.com",
) : Serializable { ) : Serializable {
fun getProxyTypeCheckId(): Int { fun getProxyTypeCheckId(): Int {

8
app/src/main/java/com/idormy/sms/forwarder/utils/sender/WeworkAgentUtils.kt
View File

@ -47,8 +47,8 @@ class WeworkAgentUtils private constructor() {
return sendTextMsg(setting, msgInfo, rule, senderIndex, logId, msgId) 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 val customApi = if (TextUtils.isEmpty(setting.customizeAPI)) "https://qyapi.weixin.qq.com" else setting.customizeAPI
var getTokenUrl = "$customApi/gettoken?" var getTokenUrl = "$customApi/cgi-bin/gettoken?"
getTokenUrl += "corpid=" + setting.corpID getTokenUrl += "corpid=" + setting.corpID
getTokenUrl += "&corpsecret=" + setting.secret getTokenUrl += "&corpsecret=" + setting.secret
Log.d(TAG, "getTokenUrl：$getTokenUrl") Log.d(TAG, "getTokenUrl：$getTokenUrl")
@ -141,8 +141,8 @@ class WeworkAgentUtils private constructor() {
textText["content"] = content textText["content"] = content
textMsgMap["text"] = textText textMsgMap["text"] = textText
val accessToken: String by SharedPreference("access_token_" + setting.agentID, "") 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 customApi = if (TextUtils.isEmpty(setting.customizeAPI)) "https://qyapi.weixin.qq.com" else setting.customizeAPI
val requestUrl = "$customApi/message/send?access_token=$accessToken" val requestUrl = "$customApi/cgi-bin/message/send?access_token=$accessToken"
Log.i(TAG, "requestUrl:$requestUrl") Log.i(TAG, "requestUrl:$requestUrl")
val requestMsg: String = Gson().toJson(textMsgMap) val requestMsg: String = Gson().toJson(textMsgMap)
Log.i(TAG, "requestMsg:$requestMsg") Log.i(TAG, "requestMsg:$requestMsg")