update

admpub · Nov 1, 2024 · d808ff5 · d808ff5
1 parent 5fefa53
commit d808ff5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1 +1 @@
-修复找回密码功能
+修复第三方账号登录时绑定账号报错
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		修复找回密码功能
		修复第三方账号登录时绑定账号报错