refactor: 多租户适配调整

This commit is contained in:
Ray.Hao
2025-12-11 21:19:02 +08:00
parent 9176298b44
commit 888e17e405
12 changed files with 260 additions and 74 deletions

View File

@@ -1,6 +1,9 @@
import { store } from "@/store";
import TenantAPI, { type TenantInfo } from "@/api/system/tenant-api";
// 前端多租户开关;默认开启,若后端未启用多租户可在 .env 设置 VITE_APP_TENANT_ENABLED=false
const TENANT_ENABLED = import.meta.env.VITE_APP_TENANT_ENABLED !== "false";
const TENANT_ID_KEY = "current_tenant_id";
const TENANT_INFO_KEY = "current_tenant_info";
@@ -52,6 +55,39 @@ export const useTenantStore = defineStore("tenant", () => {
});
}
/**
* 登录后初始化租户:获取列表并尽量确定当前租户
* - 忽略错误,以便单租户模式不受影响
*/
// 登录后准备租户上下文:先取租户列表,再用后端返回的当前租户;若单租户则自动选中
async function prepareTenantContextAfterLogin() {
if (!TENANT_ENABLED) {
return;
}
try {
await fetchTenantList();
if (tenantList.value.length > 0 && !currentTenantId.value) {
try {
const currentTenantInfo = await TenantAPI.getCurrentTenant();
if (currentTenantInfo) {
setCurrentTenant(currentTenantInfo);
} else if (tenantList.value.length === 1) {
setCurrentTenant(tenantList.value[0]);
}
} catch (error) {
if (tenantList.value.length === 1) {
setCurrentTenant(tenantList.value[0]);
}
console.debug("获取当前租户信息失败(可能是单租户模式):", error);
}
}
} catch (error) {
console.debug("获取租户列表失败(可能是单租户模式):", error);
}
}
/**
* 设置当前租户
*
@@ -120,6 +156,7 @@ export const useTenantStore = defineStore("tenant", () => {
currentTenantId,
currentTenant,
tenantList,
prepareTenantContextAfterLogin,
fetchTenantList,
setCurrentTenant,
switchTenant,

View File

@@ -1,6 +1,6 @@
import { store } from "@/store";
import AuthAPI, { type LoginFormData } from "@/api/auth-api";
import AuthAPI, { type LoginRequest } from "@/api/auth-api";
import UserAPI, { type UserInfo } from "@/api/system/user-api";
import { AuthStorage } from "@/utils/auth";
@@ -18,16 +18,16 @@ export const useUserStore = defineStore("user", () => {
/**
* 登录
*
* @param {LoginFormData}
* @param {LoginRequest}
* @returns
*/
function login(LoginFormData: LoginFormData) {
function login(loginRequest: LoginRequest) {
return new Promise<void>((resolve, reject) => {
AuthAPI.login(LoginFormData)
AuthAPI.login(loginRequest)
.then((data) => {
const { accessToken, refreshToken } = data;
// 保存记住我状态和token
rememberMe.value = LoginFormData.rememberMe;
rememberMe.value = loginRequest.rememberMe ?? false;
AuthStorage.setTokens(accessToken, refreshToken, rememberMe.value);
resolve();
})