瀏覽代碼

feat:token

ananzhusen 1 年之前
父節點
當前提交
1772f2926b

+ 1 - 1
src/http.ts

@@ -11,7 +11,7 @@ axios.defaults.withCredentials = false;
 axios.interceptors.request.use(
   (config: any) => {
     config.headers.Authorization =
-      'Bearer ' + (localStorage.token || getCookie('token') || '');
+      'Bearer ' + ( getCookie('token') || '');
 
     return config;
   },

+ 27 - 19
src/services/user.ts

@@ -49,9 +49,13 @@ const message = reactive<{ unread: number }>({
   unread: 0,
 });
 
-export const getRootDomain = () => {
-  let domain = '';
-  const domainItems = location.hostname.split('.');
+export const getDomain = () => {
+  if (import.meta.env.BASE_URL[0] === '/') {
+    return location.hostname;
+  }
+
+  let domain = location.hostname;
+  const domainItems = domain.split('.');
   if (
     domainItems.length < 3 ||
     (domainItems.length === 4 &&
@@ -60,11 +64,8 @@ export const getRootDomain = () => {
       +domainItems[2] > 0 &&
       +domainItems[3] > 0)
   ) {
-    domain = location.hostname;
-  } else if (
-    location.hostname.endsWith('.com.cn') ||
-    location.hostname.endsWith('.org.cn')
-  ) {
+    domain = '';
+  } else if (domain.endsWith('.com.cn') || domain.endsWith('.org.cn')) {
     domain = domainItems.slice(-3).join('.');
   } else {
     domain = domainItems.slice(-2).join('.');
@@ -138,16 +139,23 @@ export const useUser = () => {
     }
     data.created = dayjs(data.createdAt).format('YYYY-MM-DD HH:mm:ss');
 
+    // if (data.token) {
+    //   if (import.meta.env.BASE_URL[0] === '/') {
+    //     // localStorage.setItem('token', data.token);
+    //   } else {
+    //     setCookie('token', data.token, {
+    //       path: '/',
+    //       domain: getDomain(),
+    //     });
+    //     // localStorage.removeItem('token');
+    //   }
+    //   delete data.token;
+    // }
     if (data.token) {
-      if (import.meta.env.BASE_URL[0] === '/') {
-        localStorage.setItem('token', data.token);
-      } else {
-        setCookie('token', data.token, {
-          path: '/',
-          domain: getRootDomain(),
-        });
-        localStorage.removeItem('token');
-      }
+      setCookie('token', data.token, {
+        path: '/',
+        domain: getDomain(),
+      });
       delete data.token;
     }
     updateObject(user, data);
@@ -155,8 +163,8 @@ export const useUser = () => {
 
   const signout = () => {
     updateObject(user, {});
-    localStorage.removeItem('token');
-    const domain = getRootDomain();
+    // localStorage.removeItem('token');
+    const domain = getDomain();
     if (domain) {
       deleteCookie('token', {
         path: '/',

+ 1 - 1
src/views/components/FileProps.vue

@@ -286,7 +286,7 @@ import { MoreIcon, CloseIcon, EllipsisIcon} from 'tdesign-icons-vue-next';
 const { getEnterprise } = useEnterprise();
 
 const headers = {
-  Authorization: 'Bearer ' + (localStorage.token || getCookie('token') || ''),
+  Authorization: 'Bearer ' + (getCookie('token') || ''),
 };
 const updataData = { directory: '/大屏/图片/默认' };
 

+ 1 - 1
src/views/components/Graphics.vue

@@ -491,7 +491,7 @@ const search = ref('');
 const loading = ref(false);
 
 const headers = {
-  Authorization: 'Bearer ' + (localStorage.token || getCookie('token') || ''),
+  Authorization: 'Bearer ' + (getCookie('token') || ''),
 };
 const updataData = { directory: '/大屏/默认' };
 let lastName = '方案';

+ 1 - 1
src/views/components/PenProps.vue

@@ -1365,7 +1365,7 @@ import { EllipsisIcon, LinkIcon, LinkUnlinkIcon, ChevronDownIcon, FormatVertical
 
 const { user } = useUser();
 const headers = {
-  Authorization: 'Bearer ' + (localStorage.token || getCookie('token') || ''),
+  Authorization: 'Bearer ' + (getCookie('token') || ''),
 };
 const updataData = { directory: '/大屏/图片/默认' };
 

+ 3 - 3
src/views/components/View.vue

@@ -801,7 +801,7 @@ import axios from 'axios';
 import { MessagePlugin } from 'tdesign-vue-next';
 
 import { registerBasicDiagram } from '@/services/register';
-import { useUser, getRootDomain } from '@/services/user';
+import { useUser, getDomain } from '@/services/user';
 import {
   cdn,
   getComponents,
@@ -905,11 +905,11 @@ const open = async (flag: boolean = false) => {
       path: '/',
       domain: 't.le5le.com',
     });
-    localStorage.setItem('token', route.query.token + '');
+    // localStorage.setItem('token', route.query.token + '');
     // setCookie('token', route.query.token + '');
     setCookie('token', route.query.token + '', {
       path: '/',
-      domain: getRootDomain(),
+      domain: getDomain(),
     });
     getUser();
     const newQuery = { ...route.query };