From 72610ab1948bf57e0073a0dd377ab84393459ca0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 18 六月 2024 18:44:27 +0800
Subject: [PATCH] update 优化 三方登录不同域名获取不到租户id问题
---
src/views/login.vue | 10 +---------
src/layout/components/SocialCallback/index.vue | 10 +++++++---
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/layout/components/SocialCallback/index.vue b/src/layout/components/SocialCallback/index.vue
index eac66bc..dcc10a6 100644
--- a/src/layout/components/SocialCallback/index.vue
+++ b/src/layout/components/SocialCallback/index.vue
@@ -17,18 +17,22 @@
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 tenantId = route.query.tenantId as string ? route.query.tenantId as string : '000000';
const processResponse = async (res: any) => {
if (res.code !== 200) {
throw new Error(res.msg);
}
- if (res.data !== null) {
+ if (res.data !== null && res.data.access_token !== null) {
setToken(res.data.access_token);
}
ElMessage.success(res.msg);
setTimeout(() => {
- location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+ if (res.data !== null && res.data.domain !== null) {
+ location.href = res.data.domain + import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+ } else {
+ location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+ }
}, 2000);
};
diff --git a/src/views/login.vue b/src/views/login.vue
index 7e1394e..0bb9a3f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -186,14 +186,6 @@
}
};
-//妫�娴嬬鎴烽�夋嫨妗嗙殑鍙樺寲
-watch(
- () => loginForm.value.tenantId,
- () => {
- localStorage.setItem('tenantId', String(loginForm.value.tenantId));
- }
-);
-
/**
* 绗笁鏂圭櫥褰�
* @param type
@@ -202,7 +194,7 @@
authBinding(type).then((res: any) => {
if (res.code === HttpStatus.SUCCESS) {
// 鑾峰彇鎺堟潈鍦板潃璺宠浆
- window.location.href = res.data;
+ window.location.href = res.data + '&tenantId=' + loginForm.value.tenantId;
} else {
ElMessage.error(res.msg);
}
--
Gitblit v1.9.3