diff --git a/.golangci.yml b/.golangci.yml index b7dc396b7e..fd5c16ae86 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,5 @@ linters-settings: errcheck: - exclude-functions: ["fmt:.*"] ignoretests: true goimports: diff --git a/plugin/moyu/holiday_test.go b/plugin/moyu/holiday_test.go index 013dd52277..5a0ee99131 100644 --- a/plugin/moyu/holiday_test.go +++ b/plugin/moyu/holiday_test.go @@ -23,31 +23,31 @@ func TestSetHoliday(t *testing.T) { t.Fatal(err) } - err = SetHoliday("元旦", 1, 2024, 1, 1) + err = SetHoliday("元旦", 1, 2025, 1, 1) if err != nil { t.Fatal(err) } - err = SetHoliday("春节", 7, 2024, 2, 10) + err = SetHoliday("春节", 7, 2025, 1, 29) if err != nil { t.Fatal(err) } - err = SetHoliday("清明节", 1, 2024, 4, 5) + err = SetHoliday("清明节", 1, 2025, 4, 4) if err != nil { t.Fatal(err) } - err = SetHoliday("劳动节", 1, 2024, 5, 1) + err = SetHoliday("劳动节", 1, 2025, 5, 1) if err != nil { t.Fatal(err) } - err = SetHoliday("端午节", 1, 2023, 6, 10) + err = SetHoliday("端午节", 3, 2024, 6, 8) if err != nil { t.Fatal(err) } - err = SetHoliday("中秋节", 2, 2023, 9, 29) + err = SetHoliday("中秋节", 3, 2024, 9, 15) if err != nil { t.Fatal(err) } - err = SetHoliday("国庆节", 6, 2023, 10, 1) + err = SetHoliday("国庆节", 7, 2024, 10, 1) if err != nil { t.Fatal(err) } diff --git a/plugin/moyu/nowork.go b/plugin/moyu/nowork.go index 04eb7e8ecc..39aa5d2059 100644 --- a/plugin/moyu/nowork.go +++ b/plugin/moyu/nowork.go @@ -32,7 +32,10 @@ func GetHoliday(name string) *Holiday { if err != nil { return NewHoliday(name+err.Error(), 0, 0, 0, 0) } - fmt.Sscanf(ret, "%d_%d_%d_%d", &dur, &year, &month, &day) + _, err = fmt.Sscanf(ret, "%d_%d_%d_%d", &dur, &year, &month, &day) + if err != nil { + return NewHoliday(name+err.Error(), 0, 0, 0, 0) + } logrus.Debugln("[moyu]获取节日:", name, dur, year, month, day) return NewHoliday(name, dur, year, month, day) }