From 1d77171763d55d14daf5170ef510ed988a3f33d6 Mon Sep 17 00:00:00 2001
From: khalil <842328916@qq.com>
Date: Mon, 18 Aug 2025 18:49:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=B7=E6=AD=8C=E7=99=BB=E5=BD=95-=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AEopenid=E6=98=AF=E5=90=A6=E6=98=AF=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=96=B0=E6=97=A7=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/accompany/email/service/EmailService.java    | 2 +-
 .../accompany/oauth2/service/account/AccountManageService.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/accompany-base/accompany-email/accompany-email-service/src/main/java/com/accompany/email/service/EmailService.java b/accompany-base/accompany-email/accompany-email-service/src/main/java/com/accompany/email/service/EmailService.java
index 0c7b9dc90..db887b39a 100644
--- a/accompany-base/accompany-email/accompany-email-service/src/main/java/com/accompany/email/service/EmailService.java
+++ b/accompany-base/accompany-email/accompany-email-service/src/main/java/com/accompany/email/service/EmailService.java
@@ -141,7 +141,7 @@ public class EmailService extends BaseService {
         }
     }
 
-    private boolean isValidEmail(String email) {
+    public boolean isValidEmail(String email) {
         return !StringUtils.isEmpty(email) && email.matches(EMAIL_REGEX);
     }
 }
diff --git a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java
index 78476c206..6a213bccf 100644
--- a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java
+++ b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java
@@ -145,7 +145,8 @@ public class AccountManageService {
             Account account = null;
             String thirdAccountEmail = null;
 
-            if (LoginTypeEnum.GOOGLE.getValue() == type) {
+            // openid是邮箱，则是新版本
+            if (LoginTypeEnum.GOOGLE.getValue() == type && emailService.isValidEmail(openid)) {
                 GoogleOpenidRef ref = googleOpenidRefService.getRefByEmail(openid, idToken);
                 if (null != ref) {
                     openid = ref.getOpenId();