Skip to content

dep: update jwch #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FantasyRL merged 7 commits into from
Apr 24, 2026
Merged

dep: update jwch #469

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f6748fe
hotfix: 为common.GetTermList添加logger
FantasyRL Apr 24, 2026
e07d9af
Merge remote-tracking branch 'upstream/main' into hotfix/course
FantasyRL Apr 24, 2026
0cbd4a4
dep: update jwch
FantasyRL Apr 24, 2026
e065d89
fix: common.GetTermList error handle
FantasyRL Apr 24, 2026
ad2c445
fix: ci
FantasyRL Apr 24, 2026
4be143a
fix: 添加注释
FantasyRL Apr 24, 2026
5b29bee
fix: 逻辑优化为list空时也去查校历界面
FantasyRL Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ require (
github.com/spf13/viper v1.21.0
github.com/spf13/viper/remote v1.20.1
github.com/upyun/go-sdk/v3 v3.0.4
github.com/west2-online/jwch v0.2.42
github.com/west2-online/jwch v0.4.23
github.com/west2-online/yjsy v0.0.10
go.baoshuo.dev/llmfunc v0.0.2
go.uber.org/zap v1.27.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,8 +634,8 @@ github.com/upyun/go-sdk/v3 v3.0.4 h1:2DCJa/Yi7/3ZybT9UCPATSzvU3wpPPxhXinNlb1Hi8Q
github.com/upyun/go-sdk/v3 v3.0.4/go.mod h1:P/SnuuwhrIgAVRd/ZpzDWqCsBAf/oHg7UggbAxyZa0E=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/west2-online/jwch v0.2.42 h1:/HXkTpNI6hD/6WAPVZ8iy70WqPr0Hz2I4gmBobAKDL4=
github.com/west2-online/jwch v0.2.42/go.mod h1:DlIfTRlv5BY+4mt6PI/xzleEbEqAoUYi3xMffe4FC3A=
github.com/west2-online/jwch v0.4.23 h1:hGlTXLiPXMWiiyuETMSVxuSvKdW48+Qwdot7t/YZ63s=
github.com/west2-online/jwch v0.4.23/go.mod h1:DlIfTRlv5BY+4mt6PI/xzleEbEqAoUYi3xMffe4FC3A=
github.com/west2-online/yjsy v0.0.10 h1:x51yWeoPjPKQ57XTmgR1PQYLx+L6tO2UXeqy/XflSio=
github.com/west2-online/yjsy v0.0.10/go.mod h1:coXKeHqvNcFdNS2IFVZSHZ21fHnSWQXiY8AR/v4xSuE=
github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
Expand Down
8 changes: 3 additions & 5 deletions internal/common/service/term.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ package service

import (
"fmt"
"github.com/west2-online/fzuhelper-server/pkg/logger"

"github.com/west2-online/fzuhelper-server/kitex_gen/common"
"github.com/west2-online/fzuhelper-server/pkg/base"
"github.com/west2-online/fzuhelper-server/pkg/constants"
"github.com/west2-online/fzuhelper-server/pkg/logger"
"github.com/west2-online/jwch"
)

Expand All @@ -33,8 +33,9 @@ func (s *CommonService) GetTermList() (*jwch.SchoolCalendar, error) {
logger.Errorf("service.GetTermList: term list cache read failed, key=%s, err=%v", constants.TermListKey, err)
return nil, fmt.Errorf("service.GetTermList: Get term list cache failed %w", err)
}
if list == nil {
if list == nil || len(list.Terms) == 0 {
logger.Errorf("service.GetTermList: term list cache returned nil, key=%s", constants.TermListKey)
return nil, fmt.Errorf("service.GetTermList: Get term list cache failed: cache returned nil")
}
return list, nil
}
Expand All @@ -44,9 +45,6 @@ func (s *CommonService) GetTermList() (*jwch.SchoolCalendar, error) {
logger.Errorf("service.GetTermList: fetch school calendar failed, err=%v", err)
return nil, fmt.Errorf("service.GetTermList: Get term list failed %w", err)
}
if calendar == nil {
logger.Errorf("service.GetTermList: fetched school calendar is nil")
}
go func() {
err = s.cache.Common.SetTermListCache(s.ctx, constants.TermListKey, calendar)
if err != nil {
Expand Down
Loading