From 9513957d7cd6276f592a9e8296b7d0aa91e29e3b Mon Sep 17 00:00:00 2001
From: cdle <798731886@qq.com>
Date: Thu, 19 Aug 2021 09:38:44 +0800
Subject: [PATCH] x

---
 models/push.go     | 16 ++++++----------
 models/pushplus.go |  3 +++
 models/qywx.go     |  6 ------
 models/tbot.go     | 11 -----------
 4 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/models/push.go b/models/push.go
index bb3b96a..755985d 100644
--- a/models/push.go
+++ b/models/push.go
@@ -1,17 +1,13 @@
 package models
 
 func (ck *JdCookie) Push(msg string) {
-	if Config.QywxKey != "" {
-		go qywxNotify(&QywxConfig{Content: msg})
-	}
-	if Config.TelegramBotToken != "" {
-		go tgBotNotify(msg)
-	}
-	if Config.QQID != 0 {
-		go SendQQ(Config.QQID, msg)
+	if ck.PtPin != "" {
 		go SendQQ(int64(ck.QQ), msg)
-	}
-	if ck.PushPlus != "" {
 		go pushPlus(ck.PushPlus, msg)
+		go SendTgMsg(ck.Telegram, msg)
+	} else {
+		go SendQQ(Config.QQID, msg)
+		go qywxNotify(&QywxConfig{QywxKey: Config.QywxKey, Content: msg})
+		go SendTgMsg(Config.TelegramUserID, msg)
 	}
 }
diff --git a/models/pushplus.go b/models/pushplus.go
index 390d628..7531248 100644
--- a/models/pushplus.go
+++ b/models/pushplus.go
@@ -7,6 +7,9 @@ import (
 )
 
 func pushPlus(token string, content string) {
+	if token == "" {
+		return
+	}
 	req := httplib.Post("http://pushplus.hxtrip.com/send")
 	req.Header("Content-Type", "application/json")
 	data, _ := json.Marshal(struct {
diff --git a/models/qywx.go b/models/qywx.go
index 9ddf129..ac36c5b 100644
--- a/models/qywx.go
+++ b/models/qywx.go
@@ -19,12 +19,6 @@ type QywxNotifyMessage struct {
 }
 
 func qywxNotify(c *QywxConfig) {
-	// if Config.TelegramBotToken == "" {
-
-	// }
-	if c.QywxKey == "" {
-		c.QywxKey = Config.QywxKey
-	}
 	if c.QywxKey == "" {
 		return
 	}
diff --git a/models/tbot.go b/models/tbot.go
index 97a99da..4887a96 100644
--- a/models/tbot.go
+++ b/models/tbot.go
@@ -38,17 +38,6 @@ func initTgBot() {
 	}()
 }
 
-func tgBotNotify(msg string) {
-	if b == nil {
-		return
-	}
-	if Config.TelegramUserID == 0 {
-		logs.Warn("tgbot未绑定用id")
-		return
-	}
-	b.Send(&tb.User{ID: Config.TelegramUserID}, msg)
-}
-
 func SendTgMsg(id int, msg string) {
 	if b == nil || id == 0 {
 		return