Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

server/auth/internal/logic/usergoogleloginlogic.go

@@ -89,10 +89,11 @@ func (l *UserGoogleLoginLogic) UserGoogleLogin(req *types.RequestGoogleLogin, us
 			logx.Error(err)
 			return resp.SetStatus(basic.CodeOK)
 		}
-
+		gemail := gresult.Get("email").String()
 		l.registerInfo = &auth.RegisterToken{
 			Password:    base64.RawURLEncoding.EncodeToString(nonce),
 			Platform:    string(auth.PLATFORM_GOOGLE),
+			Email:       gemail,
 			OperateType: auth.OpTypeRegister,
 			TraceId:     uuid.NewString(),
 			CreateAt:    time.Now().UTC(),
@@ -110,8 +111,7 @@ func (l *UserGoogleLoginLogic) UserGoogleLogin(req *types.RequestGoogleLogin, us
 			return resp.SetStatus(basic.CodeOAuthRegisterTokenErr)
 		}
 		l.registerToken = token
-		l.defaultEmail = gresult.Get("email").String()
-
+		l.defaultEmail = gemail
 		return resp.SetStatus(basic.CodeOK)
 	}
 
@@ -142,7 +142,7 @@ func (l *UserGoogleLoginLogic) AfterLogic(w http.ResponseWriter, r *http.Request
 			l.token,
 			l.isRegistered,
 			l.registerToken,
-			l.registerInfo.Email,
+			l.defaultEmail,
 		)
 
 		html := fmt.Sprintf(`