From d808ff5c990ebd353ff6a061b2c444301c4b3819 Mon Sep 17 00:00:00 2001 From: Hank Shen Date: Fri, 1 Nov 2024 11:24:30 +0800 Subject: [PATCH] update --- application/handler/frontend/oauth/handler.go | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- release.md | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/handler/frontend/oauth/handler.go b/application/handler/frontend/oauth/handler.go index 925f22561..a42d1bc6f 100644 --- a/application/handler/frontend/oauth/handler.go +++ b/application/handler/frontend/oauth/handler.go @@ -155,7 +155,7 @@ func checkOrUpdateUser(ctx echo.Context, oauthM *modelCustomer.OAuth, ouser *got if ouser.RefreshToken != oauthM.RefreshToken { oauthSet[`refresh_token`] = ouser.RefreshToken } - if !ouser.ExpiresAt.IsZero() { + if !ouser.ExpiresAt.IsZero() && ouser.ExpiresAt.Unix() > 0 { oauthSet[`expired`] = ouser.ExpiresAt.Unix() } diff --git a/go.mod b/go.mod index 05538620a..2cd4705bc 100644 --- a/go.mod +++ b/go.mod @@ -12,8 +12,8 @@ exclude github.com/gomodule/redigo v2.0.0+incompatible require ( github.com/admpub/nging/v5 v5.3.3-pre55 - github.com/coscms/webcore v0.3.27 - github.com/coscms/webfront v0.0.0-20241031072834-af2495daa9a6 + github.com/coscms/webcore v0.3.28 + github.com/coscms/webfront v0.0.0-20241101032153-b40aba3cf332 ) require ( diff --git a/go.sum b/go.sum index fd860ce95..8fe47632e 100644 --- a/go.sum +++ b/go.sum @@ -947,10 +947,10 @@ github.com/coscms/oauth2s v0.4.1 h1:wt8IpmGmI/mwecKwjbdDWsGhecFJtJ2todeTdWWEg+0= github.com/coscms/oauth2s v0.4.1/go.mod h1:O2SoVCCNeStzWkHTQ9/udvGiWI5/tKGR7x7H9rwkN0Q= github.com/coscms/sms v0.0.7 h1:FNYoCRsyGoKhNH+DFYjdYnjsFJjsPT1vStivGV6oReA= github.com/coscms/sms v0.0.7/go.mod h1:8Lgm1SgZ0AyLj1npgMlulgBHbWzjOgWO8kkYQHHwuQQ= -github.com/coscms/webcore v0.3.27 h1:qwKue1nEfartrH4v24cYIQ1cC5qYZ6jSTEhSXQOqtt4= -github.com/coscms/webcore v0.3.27/go.mod h1:z8MxUKt5he5wnOwS23huvkdczDxRgyzS3almEmqtDEQ= -github.com/coscms/webfront v0.0.0-20241031072834-af2495daa9a6 h1:GCV3HD9YR55VOb8jSCdpQM2PfOS5FVm9LRDXPfOSi5I= -github.com/coscms/webfront v0.0.0-20241031072834-af2495daa9a6/go.mod h1:fP+Dw6ZrEnfgYKe7ohMWoM30MO28pihS/KsTs95dl2c= +github.com/coscms/webcore v0.3.28 h1:O3q7UDDOX5WWPKXc6VLPF5usG7gyQ5q/sy+kAN0Yl/U= +github.com/coscms/webcore v0.3.28/go.mod h1:z8MxUKt5he5wnOwS23huvkdczDxRgyzS3almEmqtDEQ= +github.com/coscms/webfront v0.0.0-20241101032153-b40aba3cf332 h1:SzdEVApYbmgRaCz4w2OiyfQnzDm+iTCbj1epQtMxi+g= +github.com/coscms/webfront v0.0.0-20241101032153-b40aba3cf332/go.mod h1:WE/GZaDfxSLszDR6D9+DKIN86kl/jPABt3N3rAQMOwU= github.com/cpu/goacmedns v0.1.1/go.mod h1:MuaouqEhPAHxsbqjgnck5zeghuwBP1dLnPoobeGqugQ= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= diff --git a/release.md b/release.md index 55a303591..ab30fb6a9 100644 --- a/release.md +++ b/release.md @@ -1 +1 @@ -修复找回密码功能 \ No newline at end of file +修复第三方账号登录时绑定账号报错 \ No newline at end of file