From abb4f543b954ce6c448b7198626847c1ef2f284f Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期四, 20 六月 2024 10:15:41 +0800 Subject: [PATCH] !125 ♥️发布 vue 版本 5.2.0 与 cloud 版本 2.2.0 Merge pull request !125 from 疯狂的狮子Li/dev --- src/layout/components/SocialCallback/index.vue | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/layout/components/SocialCallback/index.vue b/src/layout/components/SocialCallback/index.vue index eac66bc..de65aed 100644 --- a/src/layout/components/SocialCallback/index.vue +++ b/src/layout/components/SocialCallback/index.vue @@ -17,7 +17,9 @@ const code = route.query.code as string; const state = route.query.state as string; const source = route.query.source as string; -const tenantId = localStorage.getItem('tenantId') ? (localStorage.getItem('tenantId') as string) : '000000'; +const stateJson = JSON.parse(atob(state)); +const tenantId = stateJson.tenantId as string ? stateJson.tenantId as string : '000000'; +const domain = stateJson.domain as string; const processResponse = async (res: any) => { if (res.code !== 200) { @@ -60,12 +62,21 @@ }; const init = async () => { + // 濡傛灉鍩熷悕涓嶇浉绛� 鍒欓噸瀹氬悜澶勭悊 + let host = window.location.host; + if (domain !== host) { + let urlFull = new URL(window.location.href); + urlFull.host = domain; + window.location.href = urlFull.toString(); + return; + } + const data: LoginData = { socialCode: code, socialState: state, tenantId: tenantId, source: source, - clientId: 'e5cd7e4891bf95d1d19206ce24a7b32e', + clientId: import.meta.env.VITE_APP_CLIENT_ID, grantType: 'social' }; -- Gitblit v1.9.3