👣 重构底层多租户

kicc-ui/src/store/modules/permission.ts

@@ -53,16 +53,16 @@ export const usePermissionStore = defineStore({
       this.menuList = list;
       list?.length > 0 && this.setLastBuildMenuTime();
     },
-    setLastBuildMenuTime() {
+    setLastBuildMenuTime(time?: number) {
-      this.lastBuildMenuTime = new Date().getTime();
+      this.lastBuildMenuTime = time || new Date().getTime();
     },
     setDynamicAddedRoute(added: boolean) {
       this.isDynamicAddedRoute = added;
     },
     resetState(): void {
-      this.isDynamicAddedRoute = false;
+      this.setDynamicAddedRoute(false);
-      this.menuList = [];
+      this.setMenuList([]);
-      this.lastBuildMenuTime = 0;
+      this.setLastBuildMenuTime(0);
     },
     async buildRoutesAction(): Promise<AppRouteRecordRaw[]> {
       const { t } = useI18n();

kicc-ui/src/store/modules/user.ts

@@ -81,20 +81,20 @@ export const useUserStore = defineStore({
       this.refresh_token = refreshToken;
       setAuthCache(REFRESH_TOKEN_KEY, refreshToken);
     },
-    setUserInfo(userInfo: User) {
+    setUserInfo(userInfo: Nullable<User>) {
       this.userInfo = userInfo;
       setAuthCache(USER_INFO_KEY, userInfo);
     },
     setSessionTimeout(flag: boolean) {
       this.sessionTimeout = flag;
     },
-    resetState() {
+    resetState(): void {
-      this.userInfo = null;
+      this.setUserInfo(null);
-      this.sessionTimeout = false;
+      this.setSessionTimeout(false);
-      this.access_token = '';
+      this.setAccessToken('');
-      this.refresh_token = '';
+      this.setRefreshToken('');
-      this.roleIds = [];
+      this.setRoleIds([]);
-      this.permissions = [];
+      this.setPermissions([]);
     },
     /** 登录 */
     async login(params: LoginParams): Promise<User | null> {
@@ -149,9 +149,7 @@ export const useUserStore = defineStore({
       } catch {
         console.log('注销Token失败');
       }
-      this.setAccessToken('');
+      this.resetState();
-      this.setRefreshToken('');
-      this.setSessionTimeout(false);
       goLogin && await router.push(PageEnum.BASE_LOGIN);
     },
     /** 退出前确认 */

kicc-ui/src/utils/auth/index.ts

@@ -27,6 +27,10 @@ export function setAuthCache(key: BasicKeys, value: any) {
   return fn(key, value, true);
 }
 
+/**
+ * 清空授权缓存(清除当前项目所有缓存信息)
+ * 注意:这个请谨慎使用,会清空所有storage数据,不止会清除授权缓存,包括项目配置缓存,国际化缓存等等当前系统中所有缓存信息
+ */
 export function clearAuthCache(immediate = true) {
   const fn = isLocal ? Persistent.clearLocal : Persistent.clearSession;
   return fn(immediate);

kicc-ui/src/utils/http/axios/Axios.ts

@@ -12,7 +12,7 @@ import axios from 'axios';
 import qs from 'qs';
 import { AxiosCanceler } from './axiosCancel';
 import { isFunction } from '/@/utils/is';
-import { cloneDeep, omit } from 'lodash-es';
+import { cloneDeep } from 'lodash-es';
 import { ContentTypeEnum } from '/@/enums/httpEnum';
 import { RequestEnum } from '/@/enums/httpEnum';