diff --git a/go.mod b/go.mod index 901c0f02..56531dd6 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index cebd01c7..9caea1c9 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/internal/common/service/term.go b/internal/common/service/term.go index 0e0d1597..8147ebc4 100644 --- a/internal/common/service/term.go +++ b/internal/common/service/term.go @@ -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" ) @@ -33,20 +33,17 @@ 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 { - logger.Errorf("service.GetTermList: term list cache returned nil, key=%s", constants.TermListKey) + if list != nil && len(list.Terms) > 0 { + return list, nil } - return list, nil } + // 校历页面不需要鉴权 calendar, err := jwch.NewStudent().GetSchoolCalendar() if err = base.HandleJwchError(err); err != nil { 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 {