From 8568c07d9f2c93c01508d049ccc9c6447c81f67a Mon Sep 17 00:00:00 2001
From: andy <andymtt@163.com>
Date: Mon, 22 Jun 2026 17:20:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E5=92=8Cgoogle=E7=99=BB=E9=99=86=E5=8F=82=E6=95=B0=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.ts          | 17 +++++++++++++----
 src/pages/login/index.vue |  3 +--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/api/login.ts b/src/api/login.ts
index 6a5d441..7d0c0bb 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -1,11 +1,11 @@
 import { storeAuthTokens } from "@/constants/token";
 import type { OAuthTokenResponse } from "@/constants/token";
-import { request, requestRaw } from "../utils/request";
+import { getRequestContext, request, requestRaw } from "../utils/request";
 
 // 获取oauth token
 export interface OauthTokenRequest {
   grant_type?: string;
-  openIdCode?: string[];
+  idToken?: string[];
   scope?: string;
   mobile?: string;
   code?: string;
@@ -34,7 +34,11 @@ export function buildFormUrlEncodedParams(
 export async function oauthToken(
   data: OauthTokenRequest,
 ): Promise<OAuthTokenResponse> {
-  const params = buildFormUrlEncodedParams(data as Record<string, unknown>);
+  const params = buildFormUrlEncodedParams({
+    ...data,
+    clientId: data.clientId ?? getRequestContext().clientId ?? "6",
+    clientConfigld: data.clientConfigld ?? getRequestContext().clientId ?? "6",
+  } as Record<string, unknown>);
 
   const res = await requestRaw<OAuthTokenResponse>(
     {
@@ -66,7 +70,12 @@ export function sendCode(mobile: string) {
       url: `/admin/platformUser/sendMobileCode/${encoded}`,
       method: "get",
     },
-    { skipAuth: true },
+    {
+      skipAuth: true,
+      headers: {
+        clientConfigId: getRequestContext().clientId ?? "",
+      },
+    },
   );
 }
 
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 61b7352..743266d 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -253,7 +253,6 @@ async function handlePhoneLogin() {
       mobile: `${selectedCountry.value.dialCode}${phoneDigits}`,
       code: codeValue,
       grant_type: "mobile",
-      clientConfigld: '6',
     });
     emitter.emit(NOTICE_EVENT_LOGIN_SUCCESS);
     await navigateAfterLogin();
@@ -332,7 +331,7 @@ onMounted(() => {
           const idToken = response.credential;
 
           if (idToken) {
-            oauthToken({ openIdCode: [idToken], grant_type: 'google', clientConfigld: '6' })
+            oauthToken({ idToken: [idToken], grant_type: 'google' })
               .then(() => {
                 emitter.emit(NOTICE_EVENT_LOGIN_SUCCESS);
                 return navigateAfterLogin()

From 9be0fadd69cfd36bc00bd01eca4646d78660de12 Mon Sep 17 00:00:00 2001
From: andy <andymtt@163.com>
Date: Mon, 22 Jun 2026 17:45:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/login.ts b/src/api/login.ts
index 7d0c0bb..e6abdb3 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -9,7 +9,7 @@ export interface OauthTokenRequest {
   scope?: string;
   mobile?: string;
   code?: string;
-  clientConfigld?: string;
+  clientConfigId?: string;
   [property: string]: any;
 }
 
@@ -37,7 +37,7 @@ export async function oauthToken(
   const params = buildFormUrlEncodedParams({
     ...data,
     clientId: data.clientId ?? getRequestContext().clientId ?? "6",
-    clientConfigld: data.clientConfigld ?? getRequestContext().clientId ?? "6",
+    clientConfigId: data.clientConfigId ?? getRequestContext().clientId ?? "6",
   } as Record<string, unknown>);
 
   const res = await requestRaw<OAuthTokenResponse>(

From 305b34f8f5d9cfda3fb1c4bde44d2005d0aa8d36 Mon Sep 17 00:00:00 2001
From: andy <andymtt@163.com>
Date: Fri, 26 Jun 2026 10:57:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8Dv2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 743266d..0c45b4e 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -331,7 +331,7 @@ onMounted(() => {
           const idToken = response.credential;
 
           if (idToken) {
-            oauthToken({ idToken: [idToken], grant_type: 'google' })
+            oauthToken({ idToken: [idToken], grant_type: 'google', scope: 'server' })
               .then(() => {
                 emitter.emit(NOTICE_EVENT_LOGIN_SUCCESS);
                 return navigateAfterLogin()