瀏覽代碼

添加配置token

lex-xin 9 月之前
父節點
當前提交
8924b9f31b
共有 3 個文件被更改,包括 72 次插入22 次删除
  1. 18 17
      src/main.ts
  2. 43 0
      src/utils/index.ts
  3. 11 5
      src/utils/request.ts

+ 18 - 17
src/main.ts

@@ -13,23 +13,24 @@ import useErrorLog from './hooks/useErrorLog';
 
 async function setupApp() {
   // 处理token
-  const authLoadNum = sessionStorage.getItem('authLoadNum');
-  const search = location.href.split('??');
-  if (search[1] && authLoadNum !== '1') {
-    const parse = search[1];
-    console.log(parse, 'parse');
-    const result = parseQuery(parse);
-    if (result.Authorization) {
-      const ex = 7 * 24 * 60 * 60 * 1000;
-      storage.set(ACCESS_TOKEN_ADMIN, result.Authorization, ex);
-      sessionStorage.setItem('authLoadNum', '1');
-      sessionStorage.setItem('authSource', result.source?.toString() || '');
-    }
-    console.log(result, 'result');
-  } else {
-    sessionStorage.removeItem('authLoadNum');
-    storage.remove(ACCESS_TOKEN_ADMIN);
-  }
+  // const authLoadNum = sessionStorage.getItem('authLoadNum');
+  // const search = location.href.split('??');
+  // if (search[1] && authLoadNum !== '1') {
+  //   const parse = search[1];
+  //   console.log(parse, 'parse');
+  //   const result = parseQuery(parse);
+  //   if (result.Authorization) {
+  //     const ex = 7 * 24 * 60 * 60 * 1000;
+  //     storage.set(ACCESS_TOKEN_ADMIN, result.Authorization, ex);
+  //     sessionStorage.setItem('authLoadNum', '1');
+  //     sessionStorage.setItem('authSource', result.source?.toString() || '');
+  //   }
+  //   console.log(result, 'result');
+  // } else {
+  //   sessionStorage.removeItem('authLoadNum');
+  //   storage.remove(ACCESS_TOKEN_ADMIN);
+  // }
+  
   // app loading
   // const appLoading = createApp(AppLoading);
   // appLoading.mount('#appLoading');

+ 43 - 0
src/utils/index.ts

@@ -7,6 +7,7 @@ import { cloneDeep } from 'lodash';
 import dayjs from 'dayjs';
 
 import EventEmitter from 'eventemitter3';
+import { parseQuery } from '../router';
 
 export const eventGlobal = new EventEmitter();
 
@@ -745,3 +746,45 @@ export const iframeDislableKeyboard = (iframeDom: any) => {
     iframeDom?.contentDocument?.body.appendChild(script);
   }
 };
+
+
+// 后台打开老师端页面时初始化数据
+export const getAuthForAdmin = () => {
+  const search = location.href.split('??');
+  const userAuth = {
+    Authorization: "" as any,
+    authSource: ""
+  }
+  if(search[1]) {
+    const parse = search[1];
+    const result = parseQuery(parse);
+    if (result.Authorization) {
+      
+      // storage.set(ACCESS_TOKEN_ADMIN, result.Authorization, ex);
+      // sessionStorage.setItem('authLoadNum', '1');
+      // sessionStorage.setItem('authSource', result.source?.toString() || '');
+      userAuth.Authorization = result.Authorization
+      userAuth.authSource = result.source?.toString() || ''
+    }
+  }
+
+  return userAuth
+
+  // const authLoadNum = sessionStorage.getItem('authLoadNum');
+  // const search = location.href.split('??');
+  // if (search[1] && authLoadNum !== '1') {
+  //   const parse = search[1];
+  //   console.log(parse, 'parse');
+  //   const result = parseQuery(parse);
+  //   if (result.Authorization) {
+  //     const ex = 7 * 24 * 60 * 60 * 1000;
+  //     storage.set(ACCESS_TOKEN_ADMIN, result.Authorization, ex);
+  //     sessionStorage.setItem('authLoadNum', '1');
+  //     sessionStorage.setItem('authSource', result.source?.toString() || '');
+  //   }
+  //   console.log(result, 'result');
+  // } else {
+  //   sessionStorage.removeItem('authLoadNum');
+  //   storage.remove(ACCESS_TOKEN_ADMIN);
+  // }
+}

+ 11 - 5
src/utils/request.ts

@@ -2,7 +2,7 @@ import { extend } from 'umi-request';
 import cleanDeep from 'clean-deep';
 import { useUserStore } from '../store/modules/users';
 import router from '@/router';
-import { eventGlobal } from '.';
+import { eventGlobal, getAuthForAdmin } from '.';
 import { storage } from './storage';
 import { ACCESS_TOKEN_ADMIN } from '../store/mutation-types';
 
@@ -29,11 +29,17 @@ request.interceptors.request.use(
 
     const userStore = useUserStore();
 
-    let Authorization = userStore.getToken || '';
+    let Authorization = '';
     // 为了处理课堂乐器后台预览课件的功能
-    const authSource = sessionStorage.getItem('authSource');
-    if (authSource === 'admin' && storage.get(ACCESS_TOKEN_ADMIN)) {
-      Authorization = storage.get(ACCESS_TOKEN_ADMIN);
+    // const authSource = sessionStorage.getItem('authSource');
+    const userAuth = getAuthForAdmin()
+    if (userAuth.authSource === 'admin') {
+      // if(storage.get(ACCESS_TOKEN_ADMIN)) {
+      //   Authorization = storage.get(ACCESS_TOKEN_ADMIN);
+      // }
+      Authorization = userAuth.Authorization
+    } else {
+      Authorization = userStore.getToken || '';
     }
     const authHeaders: any = {};
     // if (