Merge pull request #187 from mfish-qf/develop

Develop

Author: mfish-qf

src/layouts/default/header/components/tenant-dropdown/index.vue

@@ -57,7 +57,7 @@
         let userInfo = toRaw(userStore.getUserInfo);
         while (!userInfo) {
           userInfo = toRaw(userStore.getUserInfo);
-          await sleep(100);
+          await sleep(500);
         }
         tenants.value = userInfo.tenants;
         const tenant: TenantVo = tenants.value?.find((tenant) => tenant.id == userStore.getTenantId) as TenantVo;

src/layouts/default/header/components/user-dropdown/index.vue

@@ -80,7 +80,7 @@
         let userInfo = toRaw(userStore.getUserInfo);
         while (!userInfo) {
           userInfo = toRaw(userStore.getUserInfo);
-          await sleep(100);
+          await sleep(500);
         }
         getUserInfo.id = userInfo.id;
         getUserInfo.nickname = userInfo.nickname ? userInfo.nickname : userInfo.account;

src/logics/InitAppConfig.ts

@@ -18,7 +18,7 @@ import { sleep } from "/@/utils/Utils";
 export async function initAppConfigStore() {
   const userStore = useUserStoreWithOut();
   while (!userStore.getUserInfo) {
-    await sleep(100);
+    await sleep(500);
   }
   setAppConfigStore().then();
 }

src/store/modules/Lock.ts

@@ -3,6 +3,7 @@ import { defineStore } from "pinia";
 import { LOCK_INFO_KEY } from "/@/enums/CacheEnum";
 import { Persistent } from "/@/utils/cache/Persistent";
 import { useUserStore } from "./User";
+import { oauth2Config } from "/@/settings/LoginSetting";
 
 interface LockState {
   lockInfo: Nullable<LockInfo>;
@@ -40,10 +41,10 @@ export const useLockStore = defineStore({
           const res = await userStore.login({
             username: username!,
             password: password!,
-            client_id: "system",
-            client_secret: "system",
+            client_id: oauth2Config.client_id,
+            client_secret: oauth2Config.client_secret,
             grant_type: "password",
-            redirect_uri: "http://baidu.com",
+            redirect_uri: oauth2Config.redirect_uri,
             mode: "none"
           });
           if (res) {

src/store/modules/User.ts

@@ -169,17 +169,15 @@ export const useUserStore = defineStore({
     async logout() {
       if (this.getToken) {
         try {
-          const result = await doLogout();
-          if (result) {
-            this.setToken(undefined);
-            this.setRefreshToken(undefined);
-            this.setSessionTimeout(false);
-            this.setUserInfo(null);
-            this.setTenantId(undefined);
-            clearAuthCache(true);
-            this.setIsLogout(true);
-            await router.push(PageEnum.BASE_LOGIN);
-          }
+          await doLogout();
+          this.setToken(undefined);
+          this.setRefreshToken(undefined);
+          this.setSessionTimeout(false);
+          this.setUserInfo(null);
+          this.setTenantId(undefined);
+          clearAuthCache(true);
+          this.setIsLogout(true);
+          await router.push(PageEnum.BASE_LOGIN);
         } catch {
           throw new Error("注销Token失败");
         }

src/utils/http/axios/CheckStatus.ts

@@ -29,13 +29,12 @@ export function checkStatus(
       break;
     // 401: 认证失败返回401
     case 401:
-      userStore.setToken(undefined);
       errMessage = t("sys.api.errMsg401");
       if (stp === SessionTimeoutProcessingEnum.PAGE_COVERAGE) {
         userStore.setSessionTimeout(true);
         break;
       }
-      userStore.logout();
+      userStore.logout().then();
       break;
     case 403:
       errMessage = t("sys.api.errMsg403");

src/utils/http/axios/index.ts

@@ -13,7 +13,6 @@ import { deepMerge, setObjToUrlParams } from "/@/utils";
 import { useErrorLogStoreWithOut } from "/@/store/modules/ErrorLog";
 import { useI18n } from "/@/hooks/web/UseI18n";
 import { formatRequestDate, joinTimestamp, messageTips } from "./Helper";
-import { useUserStoreWithOut } from "/@/store/modules/User";
 import { AxiosRetry } from "/@/utils/http/axios/AxiosRetry";
 
 const globSetting = useGlobSetting();
@@ -42,8 +41,8 @@ const transform: AxiosTransform = {
       // 抛出请求异常
       throw new Error(t("sys.api.apiRequestFailed"));
     }
-    let { code, msg } = data;
-    const hasSuccess = data && code === ResultEnum.SUCCESS;
+    let { msg } = data;
+    const hasSuccess = data && data.code === ResultEnum.SUCCESS;
     if (hasSuccess) {
       if (msg === null || msg === undefined || msg === "") {
         msg = t("sys.api.operationSuccess");
@@ -54,16 +53,6 @@ const transform: AxiosTransform = {
       }
       return data.data;
     }
-    // 在此处根据自己项目的实际情况对不同的code执行不同的操作
-    // 如果不希望中断当前请求，请return数据，否则直接抛出异常即可
-    switch (code) {
-      case ResultEnum.TIMEOUT:
-        msg = t("sys.api.timeoutMessage");
-        const userStore = useUserStoreWithOut();
-        userStore.setToken(undefined);
-        userStore.logout().then();
-        break;
-    }
     // errorMessageMode=‘modal’的时候会显示modal错误弹窗，而不是消息提示，用于一些比较重要的错误
     // errorMessageMode='none' 一般是调用时明确表示不希望自动弹出错误提示
     messageTips(options.errorMessageMode, msg, true, 0);