From 57e2aef0c230c75e9051cd2beb2a8322945942ce Mon Sep 17 00:00:00 2001
From: johlanse <johlansel38@gmail.com>
Date: Fri, 12 Aug 2022 11:26:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=8D=E6=8E=A8=E9=80=81=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/score.go | 15 +++++++++++++++
 main.go      | 12 ++++++++----
 push/ding.go | 11 +++++++----
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/lib/score.go b/lib/score.go
index 547093f..3c104d7 100644
--- a/lib/score.go
+++ b/lib/score.go
@@ -130,3 +130,18 @@ func FormatScore(score Score) string {
 	)
 	return result
 }
+
+func FormatScoreShort(score Score) string {
+	result := ""
+	result += fmt.Sprintf("当前学习总积分：%d </br> 今日得分：%d</br>", score.TotalScore, score.TodayScore)
+	result += fmt.Sprintf("登录：%v/%v</br>  文章学习：%v/%v</br>  视频学习：%v/%v</br>  视频时长：%v/%v</br>每日答题：%v/%v</br>  每周答题：%v/%v</br>   专项答题：%v/%v",
+		score.Content["login"].CurrentScore, score.Content["login"].MaxScore,
+		score.Content["article"].CurrentScore, score.Content["article"].MaxScore,
+		score.Content["video"].CurrentScore, score.Content["video"].MaxScore,
+		score.Content["video_time"].CurrentScore, score.Content["video_time"].MaxScore,
+		score.Content["daily"].CurrentScore, score.Content["daily"].MaxScore,
+		score.Content["weekly"].CurrentScore, score.Content["weekly"].MaxScore,
+		score.Content["special"].CurrentScore, score.Content["special"].MaxScore,
+	)
+	return result
+}
diff --git a/main.go b/main.go
index d089639..0ab8a8b 100644
--- a/main.go
+++ b/main.go
@@ -92,6 +92,8 @@ func main() {
 		core.Quit()
 		return
 	}
+	getPush := push.GetPush(config)
+	getPush("flush", "学习强国助手已上线")
 
 	go update.CheckUpdate(VERSION)
 
@@ -207,6 +209,7 @@ func do(m string) {
 	log.Infoln("检测到模式", config.Model)
 
 	getPush := push.GetPush(config)
+	getPush("flush", "学习强国助手已上线")
 	core := &lib.Core{ShowBrowser: config.ShowBrowser, Push: getPush}
 	defer core.Quit()
 	core.Init()
@@ -220,7 +223,7 @@ func do(m string) {
 				log.Errorln(err)
 			}
 		}()
-
+		startTime := time.Now()
 		core2.LearnArticle(u)
 		core2.LearnVideo(u)
 		if config.Model == 2 {
@@ -230,6 +233,7 @@ func do(m string) {
 			core2.RespondDaily(u, "weekly")
 			core2.RespondDaily(u, "special")
 		}
+		endTime := time.Now()
 		score, err := lib.GetUserScore(u.ToCookies())
 		if err != nil {
 			log.Errorln("获取成绩失败")
@@ -237,14 +241,14 @@ func do(m string) {
 			return
 		}
 
-		score, _ = lib.GetUserScore(user.ToCookies())
+		score, _ = lib.GetUserScore(u.ToCookies())
 		content := lib.FormatScore(score)
-		err = push.PushMessage(user.Nick+"学习情况", user.Nick+"学习情况"+content, "score", user.PushId)
+		err = push.PushMessage(u.Nick+"学习情况", u.Nick+"学习情况"+content, "score", u.PushId)
 		if err != nil {
 			log.Errorln(err.Error())
 			err = nil
 		}
-		message := u.Nick + " 学习完成：今日得分:" + lib.PrintScore(score)
+		message := fmt.Sprintf("%v 学习完成,用时%.1f分钟</br>%v", u.Nick, endTime.Sub(startTime).Minutes(), lib.FormatScoreShort(score))
 		core2.Push("flush", message)
 	}
 
diff --git a/push/ding.go b/push/ding.go
index b697adf..5a1e737 100644
--- a/push/ding.go
+++ b/push/ding.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/guonaihong/gout"
+	log "github.com/sirupsen/logrus"
 )
 
 type Ding struct {
@@ -18,7 +19,7 @@ type Ding struct {
 func (d *Ding) Send() func(kind string, message string) {
 	s := TypeSecret{Secret: d.Secret, Webhook: d.Token}
 	return func(kind string, message string) {
-		if kind == "markdown" {
+		if kind == "flush" {
 			err := s.SendMessage(map[string]interface{}{
 				"msgtype": "markdown",
 				"markdown": map[string]string{
@@ -30,9 +31,11 @@ func (d *Ding) Send() func(kind string, message string) {
 				return
 			}
 		} else {
-			err := s.SendMessage(Text(message))
-			if err != nil {
-				return
+			if log.GetLevel() == log.DebugLevel {
+				err := s.SendMessage(Text(message))
+				if err != nil {
+					return
+				}
 			}
 		}
 	}