diff --git a/dao/checkin.go b/dao/checkin.go index dc25531..a1d4e9b 100644 --- a/dao/checkin.go +++ b/dao/checkin.go @@ -102,3 +102,11 @@ func (c CheckinDAO) FindUserActivityExtendedByID(id int) *dto.UserActivityExtend } return &userActivityExtended } +func (c CheckinDAO) FindUserActivitiesToday(userID int, day string) []po.UserActivity { + var userActivities []po.UserActivity + err := c.Tx.Find(&userActivities, "user_id=? and day=?", userID, day).Error + if err != nil { + panic(err) + } + return userActivities +} diff --git a/data/po/checkin.go b/data/po/checkin.go index eae1b25..ead4cea 100644 --- a/data/po/checkin.go +++ b/data/po/checkin.go @@ -10,6 +10,7 @@ type Activity struct { ID int `json:"id"` Category string `json:"category"` Name string `json:"name"` + Image string `json:"image"` Credit int `json:"credit"` } diff --git a/pkg/httpclient/resty.go b/pkg/httpclient/resty.go index c9102bd..775cb1f 100644 --- a/pkg/httpclient/resty.go +++ b/pkg/httpclient/resty.go @@ -23,7 +23,7 @@ func SDULogin(username string, password string) (*dto.SDULoginData, error) { } result1 := string(resp.Body()) if resp.StatusCode()/100 != 2 { - return nil, errors.New(result1) + return nil, errors.New("账号或密码错误") } resp, err = Client.R().SetBody("service=https://service.sdu.edu.cn/tp_up/view?m=up"). Post("https://pass.sdu.edu.cn/cas/restlet/tickets/" + result1) diff --git a/router/router.go b/router/router.go index 32143b6..060aca5 100644 --- a/router/router.go +++ b/router/router.go @@ -22,6 +22,7 @@ func Setup(engine *gin.Engine) { checkin.GET("/list_activities", app.HandlerFunc(hub.ListActivities)) checkin.Use(middleware.JWT(1)) checkin.POST("/submit", app.HandlerFunc(hub.Submit)) + checkin.GET("/get_my_activities_today", app.HandlerFunc(hub.GetMyActivitiesToday)) checkin.POST("/set_status", middleware.JWT(2), app.HandlerFunc(hub.SetStatus)) checkin.GET("/get_user_activity", middleware.JWT(2), app.HandlerFunc(hub.GetUserActivity)) checkin.GET("/list_user_activities", middleware.JWT(2), app.HandlerFunc(hub.ListUserActivities)) diff --git a/service/checkin.go b/service/checkin.go index 2246eb1..14f686c 100644 --- a/service/checkin.go +++ b/service/checkin.go @@ -71,3 +71,6 @@ func (c CheckinService) GetUserActivity(aw *app.Wrapper) app.Result { } return aw.Success(checkinDAO.FindUserActivityByID(id)) } +func (c CheckinService) GetMyActivitiesToday(aw *app.Wrapper) app.Result { + return aw.Success(checkinDAO.FindUserActivitiesToday(aw.ExtractUserClaims().UserID, time.Now().Format("20060102"))) +}