fix: 修改底层

zhengyiming

7 天以前 19fb7e7af8464bc88088d8bbc80c481752827994

 src/utils/request/index.ts

@@ -3,7 +3,6 @@
import qs from 'qs';
import NProgress from '../progress';
import { loadEnv } from '@build/index';
import { getToken, getUserInfo } from '../storage';
import { useUserStoreHook } from '@/store/modules/user';
import { ElLoading as Loading, ElNotification } from 'element-plus';
import { router } from '@/router';
@@ -176,9 +175,9 @@
          NProgress.start();
        }

        const token = getToken();
        const userStore = useUserStoreHook();

        const userInfo = getUserInfo();
        const userInfo = userStore.userInfo;

        const { showLoading = true, mock } = $config;

@@ -198,31 +197,10 @@
        }

        return new Promise((resolve) => {
          if (token && $config.withCredentials) {
            if (tokenIsExpired(userInfo)) {
              if (!BoleRequest.refreshTokenPending) {
                const userStore = useUserStoreHook();
                BoleRequest.refreshTokenPending = true;
                // token过期刷新
                userStore
                  .refreshToken({
                    refreshToken: userInfo.refreshToken,
                    clientId: userStore.accountInfo.client_id,
                  })
                  .then((res) => {
                    $config.headers['Authorization'] = 'Bearer ' + res.accessToken;
                    BoleRequest.requests.forEach((cb) => cb(res.accessToken));
                    BoleRequest.requests = [];
                  })
                  .finally(() => {
                    BoleRequest.refreshTokenPending = false;
                  });
              }
              resolve(BoleRequest.retryOriginalRequest($config));
            } else {
              $config.headers['Authorization'] = 'Bearer ' + token;
          if (userInfo.accessToken && $config.withCredentials) {
            $config.headers['Authorization'] = 'Bearer ' + userInfo.accessToken;
            $config.headers['X-Authorizatio'] = 'Bearer ' + userInfo.refreshToken;
              resolve($config);
            }
          } else {
            resolve($config);
          }
@@ -246,6 +224,16 @@
          NProgress.done();
        }

        const userStore = useUserStoreHook();

        if (response.headers['x-access-token']) {
          userStore.setToken(response.headers['access-token']);
          userStore.setUserInfo({
            accessToken: response.headers['access-token'],
            refreshToken: response.headers['x-access-token'],
          });
        }

        endLoading();

        return getResponse ? response : (response.data as any).result;