dongge88
/
lucky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复DDNS部分手动触发webhook失效问题.

This commit is contained in:
古大羊 2022-08-16 06:49:30 +08:00
parent 6b4cd37d1a
commit 7ef78d4bc5
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
web/web.go
View File

@ -751,7 +751,7 @@ func netinterfaces(c *gin.Context) {
func webhookTest(c *gin.Context) {
key := c.Query("key")
ddnsTask := config.GetDDNSTaskByKey(key)
ddnsTask := ddnscore.GetDDNSTaskInfoByKey(key)
if ddnsTask == nil {
c.JSON(http.StatusOK, gin.H{"ret": 1, "msg": fmt.Sprintf("找不到key对应的DDNS任务:%s", key)})
@ -775,25 +775,23 @@ func webhookTest(c *gin.Context) {
return
}
// responseStr, err := config.WebhookTest(&ddnsTask.DDNSTask,
// request.WebhookURL,
// request.WebhookMethod,
// request.WebhookRequestBody,
// request.WebhookProxy,
// request.WebhookProxyAddr,
// request.WebhookProxyUser,
// request.WebhookProxyPassword,
// request.WebhookHeaders,
// request.WebhookSuccessContent)
//fmt.Printf("request:%s\n", request)
responseStr, err := ddnscore.WebhookTest(ddnsTask,
request.WebhookURL,
request.WebhookMethod,
request.WebhookRequestBody,
request.WebhookProxy,
request.WebhookProxyAddr,
request.WebhookProxyUser,
request.WebhookProxyPassword,
request.WebhookHeaders,
request.WebhookSuccessContent)
msg := "Webhook接口调用成功"
if err != nil {
msg = err.Error()
}
c.JSON(http.StatusOK, gin.H{"ret": 0, "msg": msg, "Response": "responseStr"})
c.JSON(http.StatusOK, gin.H{"ret": 0, "msg": msg, "Response": responseStr})
}
func IPRegTest(c *gin.Context) {