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/layout/components/SocialCallback/index.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/layout/components/SocialCallback/index.vue b/src/layout/components/SocialCallback/index.vue
index e3a50e0..dcc10a6 100644
--- a/src/layout/components/SocialCallback/index.vue
+++ b/src/layout/components/SocialCallback/index.vue
@@ -10,7 +10,6 @@
const route = useRoute();
const loading = ref(true);
-
/**
* 鎺ユ敹Route浼犻�掔殑鍙傛暟
* @param {Object} route.query.
@@ -18,19 +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);
};
@@ -52,7 +54,6 @@
};
const loginByCode = async (data: LoginData) => {
- console.log(2)
try {
const res = await login(data);
await processResponse(res);
--
Gitblit v1.9.3