Skip to content

Commit dc348f8

Browse files
fumiamafumiama
committed
🔥 🎨 统一 cron
1 parent 8c40293 commit dc348f8

File tree

5 files changed

+25
-21
lines changed

5 files changed

+25
-21
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.17
55
require (
66
github.com/FloatTech/AnimeAPI v1.3.0-beta8.0.20220222140454-0d15c275f385
77
github.com/FloatTech/sqlite v0.2.0
8-
github.com/FloatTech/zbputils v1.3.0-beta8.0.20220222140356-fceefeb900dc
8+
github.com/FloatTech/zbputils v1.3.0-beta8.0.20220223084851-30900a9dfa51
99
github.com/antchfx/htmlquery v1.2.4
1010
github.com/corona10/goimagehash v1.0.3
1111
github.com/fogleman/gg v1.3.0

‎go.sum

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ github.com/FloatTech/AnimeAPI v1.3.0-beta8.0.20220222140454-0d15c275f385/go.mod
33
github.com/FloatTech/bot-manager v1.0.0/go.mod h1:8YYRJ16oroGHQGD2En0oVnmcKJkxR9O/jd5BPSfWfOQ=
44
github.com/FloatTech/sqlite v0.2.0 h1:x3uls/hExXH1+bbaNLkvilce6ATtWlDx4IqoxBW/bv8=
55
github.com/FloatTech/sqlite v0.2.0/go.mod h1:xIDWIvpOFl8AXmZm0FC8t3PZjiR6ZutytCpBv2EWCns=
6-
github.com/FloatTech/zbputils v1.3.0-beta8.0.20220222140356-fceefeb900dc h1:4oQAPzmpfzdz+8aTXuQYfcN5/v1rNVIxRpwHNJXqN40=
76
github.com/FloatTech/zbputils v1.3.0-beta8.0.20220222140356-fceefeb900dc/go.mod h1:tUXu86+Hoi6vcLHfcVwjZa9ZYF4JRoNaCC510EELjfs=
7+
github.com/FloatTech/zbputils v1.3.0-beta8.0.20220223084631-5f53225f25fd h1:ysvDWN/ktQwn6kNBZwBl9meYX3NvB6HXNC0dh+t9d4U=
8+
github.com/FloatTech/zbputils v1.3.0-beta8.0.20220223084631-5f53225f25fd/go.mod h1:kSp2Z3Udn8NBnbfHayj//uX1G38WsX2dGcLG4yoXmI4=
9+
github.com/FloatTech/zbputils v1.3.0-beta8.0.20220223084851-30900a9dfa51 h1:5WB1ZorvJBQ4KBvTpmk5XXTLGOJpdN0cEf8ICzLoh44=
10+
github.com/FloatTech/zbputils v1.3.0-beta8.0.20220223084851-30900a9dfa51/go.mod h1:kSp2Z3Udn8NBnbfHayj//uX1G38WsX2dGcLG4yoXmI4=
811
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
912
github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc h1:AAx50/fb/xS4lvsdQg+bFbGvqSDhyV1MF+p2PLCamZ0=
1013
github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc/go.mod h1:OMmITAib6POA37xCichWM0aRnoVpSMZO1rB/G01wrr0=

‎plugin_bilibili/fansDaily.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"time"
77

88
control "github.com/FloatTech/zbputils/control"
9-
"github.com/fumiama/cron"
9+
"github.com/FloatTech/zbputils/process"
1010
zero "github.com/wdvxdr1123/ZeroBot"
1111
"github.com/wdvxdr1123/ZeroBot/message"
1212

@@ -63,10 +63,9 @@ func init() {
6363

6464
// 定时任务每天晚上最后2分钟执行一次
6565
func fansDaily() {
66-
c := cron.New()
67-
_, err := c.AddFunc("58 23 * * *", func() { sendNotice() })
68-
if err == nil {
69-
c.Start()
66+
_, err := process.CronTab.AddFunc("58 23 * * *", func() { sendNotice() })
67+
if err != nil {
68+
panic(err)
7069
}
7170
}
7271

‎plugin_moyu/run.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"time"
66

77
control "github.com/FloatTech/zbputils/control"
8-
"github.com/fumiama/cron"
8+
"github.com/FloatTech/zbputils/process"
99
zero "github.com/wdvxdr1123/ZeroBot"
1010
"github.com/wdvxdr1123/ZeroBot/message"
1111

@@ -21,10 +21,9 @@ func init() { // 插件主体
2121
})
2222

2323
// 定时任务每天10点执行一次
24-
c := cron.New()
25-
_, err := c.AddFunc("0 10 * * *", func() { sendNotice() })
26-
if err == nil {
27-
c.Start()
24+
_, err := process.CronTab.AddFunc("0 10 * * *", func() { sendNotice() })
25+
if err != nil {
26+
panic(err)
2827
}
2928
}
3029

‎plugin_moyu_calendar/calendar.go

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ import (
1111
"strings"
1212
"time"
1313

14+
"github.com/FloatTech/zbputils/binary"
1415
control "github.com/FloatTech/zbputils/control"
15-
"github.com/fumiama/cron"
16+
"github.com/FloatTech/zbputils/process"
1617
zero "github.com/wdvxdr1123/ZeroBot"
1718
"github.com/wdvxdr1123/ZeroBot/message"
1819

@@ -28,8 +29,7 @@ func init() {
2829
})
2930

3031
// 定时任务每天8点执行一次
31-
c := cron.New()
32-
_, err := c.AddFunc("* 8 * * *", func() {
32+
_, err := process.CronTab.AddFunc("* 8 * * *", func() {
3333
m, ok := control.Lookup("moyucalendar")
3434
if !ok {
3535
return
@@ -48,8 +48,8 @@ func init() {
4848
return true
4949
})
5050
})
51-
if err == nil {
52-
c.Start()
51+
if err != nil {
52+
panic(err)
5353
}
5454
}
5555

@@ -76,7 +76,7 @@ func crew() (string, error) {
7676
if err != nil {
7777
return "", err
7878
}
79-
match := newest.FindStringSubmatch(string(b))
79+
match := newest.FindStringSubmatch(binary.BytesToString(b))
8080
if len(match) < 2 {
8181
return "", errors.New("newest not found")
8282
}
@@ -112,7 +112,7 @@ func crew() (string, error) {
112112
if err != nil {
113113
return "", err
114114
}
115-
matcha := weixin.FindStringSubmatch(string(b))
115+
matcha := weixin.FindStringSubmatch(binary.BytesToString(b))
116116
if len(matcha) < 2 {
117117
continue
118118
}
@@ -135,11 +135,14 @@ func crew() (string, error) {
135135
return "", errors.New("status not ok")
136136
}
137137
bw, _ := ioutil.ReadAll(respw.Body)
138-
today := regexp.MustCompile(time.Now().Format("2006-01-02"))
138+
today, err := regexp.Compile(time.Now().Format("2006-01-02"))
139+
if err != nil {
140+
return "", err
141+
}
139142
if !today.Match(bw) {
140143
return "", errors.New("calendar not found")
141144
}
142-
matchw := calendar.FindStringSubmatch(string(bw))
145+
matchw := calendar.FindStringSubmatch(binary.BytesToString(bw))
143146
if len(matchw) < 2 {
144147
return "", errors.New("calendar not found")
145148
}

0 commit comments

Comments
 (0)