Merge pull request #92 from feiniao025/main

修改br为\n
This commit is contained in:
johlanse 2022-09-13 09:11:48 +08:00 committed by GitHub
commit 5797253bcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View File

@ -122,8 +122,8 @@ func GetUserScore(cookies []*http.Cookie) (Score, error) {
func PrintScore(score Score) string {
result := ""
result += fmt.Sprintf("当前学习总积分:%d 今日得分:%d\n", score.TotalScore, score.TodayScore)
result += fmt.Sprintf("[%v] [INFO]: 登录:%v/%v 文章学习:%v/%v 视频学习:%v/%v 视频时长:%v/%v\n[%v] [INFO]: 每日答题:%v/%v 每周答题:%v/%v 专项答题:%v/%v",
result += fmt.Sprintf("当前学习总积分:%d\n 今日得分:%d\n", score.TotalScore, score.TodayScore)
result += fmt.Sprintf("[%v] [INFO]: 登录:%v/%v\n 文章学习:%v/%v\n 视频学习:%v/%v\n 视频时长:%v/%v\n[%v] [INFO]: 每日答题:%v/%v\n 每周答题:%v/%v\n 专项答题:%v/%v",
time.Now().Format("2006-01-02 15:04:05"),
score.Content["login"].CurrentScore, score.Content["login"].MaxScore,
score.Content["article"].CurrentScore, score.Content["article"].MaxScore,
@ -140,8 +140,8 @@ func PrintScore(score Score) string {
func FormatScore(score Score) string {
result := ""
result += fmt.Sprintf("当前学习总积分:%d 今日得分:%d\n", score.TotalScore, score.TodayScore)
result += fmt.Sprintf("登录:%v/%v 文章学习:%v/%v 视频学习:%v/%v 视频时长:%v/%v\n每日答题%v/%v 每周答题:%v/%v 专项答题:%v/%v",
result += fmt.Sprintf("当前学习总积分:%d\n 今日得分:%d\n", score.TotalScore, score.TodayScore)
result += fmt.Sprintf("登录:%v/%v\n 文章学习:%v/%v\n 视频学习:%v/%v\n 视频时长:%v/%v\n 每日答题:%v/%v\n 每周答题:%v/%v\n 专项答题:%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,
@ -155,8 +155,8 @@ func FormatScore(score Score) string {
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",
result += fmt.Sprintf("当前学习总积分:%d\n 今日得分:%d\n", score.TotalScore, score.TodayScore)
result += fmt.Sprintf("登录:%v/%v\n 文章学习:%v/%v\n 视频学习:%v/%v\n 视频时长:%v/%v\n 每日答题:%v/%v\n 每周答题:%v/%v\n 专项答题:%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,

View File

@ -276,7 +276,7 @@ func do(m string) {
}
score, _ = lib.GetUserScore(u.ToCookies())
message := fmt.Sprintf("%v 学习完成,用时%.1f分钟</br>%v", u.Nick, endTime.Sub(startTime).Minutes(), lib.FormatScoreShort(score))
message := fmt.Sprintf("%v 学习完成,用时%.1f分钟\n%v", u.Nick, endTime.Sub(startTime).Minutes(), lib.FormatScoreShort(score))
core2.Push(u.PushId, "flush", message)
}