From 31bf646cef818303d399d3e35c7f4dd695d86edb Mon Sep 17 00:00:00 2001 From: cdle <798731886@qq.com> Date: Wed, 13 Oct 2021 17:57:08 +0800 Subject: [PATCH] update --- im/tg/tg.go | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/im/tg/tg.go b/im/tg/tg.go index a700617..3fcc8cd 100644 --- a/im/tg/tg.go +++ b/im/tg/tg.go @@ -2,12 +2,12 @@ package tg import ( "fmt" + "net/http" + "net/url" "os" "regexp" "strings" "time" - "net/http" - "net/url" "github.com/astaxie/beego/httplib" "github.com/beego/beego/v2/core/logs" @@ -59,18 +59,22 @@ func init() { logs.Warn("未提供telegram机器人token") return } - client, clientErr := buildClientWithProxy(tg.Get("url")) - if clientErr != nil { - logs.Warn("监听telegram机器人失败clientErr:%v", clientErr) - return - } - var err error - b, err = tb.NewBot(tb.Settings{ - Client: client, + + settings := tb.Settings{ Token: token, Poller: &tb.LongPoller{Timeout: 10 * time.Second}, // ParseMode: tb.ModeMarkdownV2, - }) + } + if url := tg.Get("url"); url != "" { + client, clientErr := buildClientWithProxy(url) + if clientErr != nil { + logs.Warn("监听telegram代理失败:%v", clientErr) + return + } + settings.Client = client + } + var err error + b, err = tb.NewBot(settings) if err != nil { logs.Warn("监听telegram机器人失败:%v", err)