diff --git a/.gitignore b/.gitignore index 93e2207..194f8c9 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,4 @@ go.work goodBaby config.json -cookies.txt -tmp/ -bye.json \ No newline at end of file +data.db \ No newline at end of file diff --git a/api/user/user.go b/api/user/user.go index fbb7225..b16fa87 100644 --- a/api/user/user.go +++ b/api/user/user.go @@ -1,6 +1,8 @@ package user import ( + "database/sql" + "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" "github.com/ssdomei232/goodBaby/configs" @@ -76,8 +78,11 @@ func HandleLogin(c *gin.Context) { c.JSON(400, gin.H{"code": 400, "data": err.Error()}) } - if err = verifyUser(&user); err != nil { - c.JSON(400, gin.H{"code": 400, "data": "用户名或密码错误"}) + if err = verifyUser(&user); err == sql.ErrNoRows { + c.JSON(400, gin.H{"code": 400, "data": "用户不存在"}) + return + } else if err != nil { + c.JSON(500, gin.H{"code": 500, "data": "登录失败"}) return } diff --git a/go.mod b/go.mod index 9686a9f..a4f5489 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/gin-contrib/sessions v1.0.4 github.com/gin-gonic/gin v1.11.0 github.com/google/go-github/v84 v84.0.0 + github.com/robfig/cron/v3 v3.0.1 github.com/ssdomei232/napcat-http-go-sdk v1.0.0 github.com/wneessen/go-mail v0.7.2 golang.org/x/crypto v0.48.0 diff --git a/go.sum b/go.sum index f2031b6..4a67c06 100644 --- a/go.sum +++ b/go.sum @@ -94,6 +94,8 @@ github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= github.com/quic-go/quic-go v0.54.0 h1:6s1YB9QotYI6Ospeiguknbp2Znb/jZYjZLRXn9kMQBg= github.com/quic-go/quic-go v0.54.0/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY= +github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= +github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= diff --git a/main.go b/main.go index c6cac32..2672968 100644 --- a/main.go +++ b/main.go @@ -7,9 +7,11 @@ import ( "github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions/cookie" "github.com/gin-gonic/gin" + "github.com/robfig/cron/v3" "github.com/ssdomei232/goodBaby/api/account" "github.com/ssdomei232/goodBaby/api/rule" "github.com/ssdomei232/goodBaby/api/user" + "github.com/ssdomei232/goodBaby/handler/checker" ) func main() { @@ -38,6 +40,10 @@ func main() { } r.Run(":8088") + + c := cron.New() + c.AddFunc("@every 10m", checker.CheckTimers) + c.Start() } func generateRandomKey(length int) []byte {