fix: 修复看板管理分享页token非覆盖当前用户的token

@@ -16,6 +16,7 @@ import {
   UpdateDataComponentParams,
   UpdateDataComponentParams,
 } from './model';
 } from './model';
 import { defHttp } from '/@/utils/http/axios';
 import { defHttp } from '/@/utils/http/axios';
+import { isShareMode } from '/@/views/sys/share/hook';
 
 
 enum DataBoardUrl {
 enum DataBoardUrl {
   GET_DATA_BOARD = '/data_board',
   GET_DATA_BOARD = '/data_board',
@@ -224,7 +225,7 @@ export const sendCommandOneway = (params: SendCommandParams) => {
       url: `${SendCommand.ONEWAY}/${params.deviceId}`,
       url: `${SendCommand.ONEWAY}/${params.deviceId}`,
       params: params.value,
       params: params.value,
     },
     },
-    { joinPrefix: false }
+    { joinPrefix: false, withShareToken: isShareMode() }
   );
   );
 };
 };
 
 

 import { defHttp } from '/@/utils/http/axios';
 import { defHttp } from '/@/utils/http/axios';
 import { ViewTypeEnum } from '/@/views/sys/share/config/config';
 import { ViewTypeEnum } from '/@/views/sys/share/config/config';
+import { isShareMode } from '/@/views/sys/share/hook';
 
 
 enum Api {
 enum Api {
   CHECK = '/share/check',
   CHECK = '/share/check',
@@ -8,9 +9,14 @@ enum Api {
 }
 }
 
 
 export const checkShareAccessToken = (type: ViewTypeEnum, id: string) => {
 export const checkShareAccessToken = (type: ViewTypeEnum, id: string) => {
-  return defHttp.get<Record<'data', boolean>>({
-    url: `${Api.CHECK}/${type}/${id}`,
-  });
+  return defHttp.get<Record<'data', boolean>>(
+    {
+      url: `${Api.CHECK}/${type}/${id}`,
+    },
+    {
+      withShareToken: isShareMode(),
+    }
+  );
 };
 };
 
 
 export const sharePageLogin = (publicId: string) => {
 export const sharePageLogin = (publicId: string) => {
@@ -21,14 +27,20 @@ export const sharePageLogin = (publicId: string) => {
     },
     },
     {
     {
       joinPrefix: false,
       joinPrefix: false,
+      withShareToken: isShareMode(),
     }
     }
   );
   );
 };
 };
 
 
 export const getShareContent = (record: Record<'accessCredentials' | 'id', string>) => {
 export const getShareContent = (record: Record<'accessCredentials' | 'id', string>) => {
   const { id, accessCredentials } = record;
   const { id, accessCredentials } = record;
-  return defHttp.get({
-    url: `${Api.SHARE_CONTENT}/${ViewTypeEnum.DATA_BOARD}/share_data/${id}`,
-    params: { accessCredentials },
-  });
+  return defHttp.get(
+    {
+      url: `${Api.SHARE_CONTENT}/${ViewTypeEnum.DATA_BOARD}/share_data/${id}`,
+      params: { accessCredentials },
+    },
+    {
+      withShareToken: isShareMode(),
+    }
+  );
 };
 };

@@ -5,6 +5,10 @@ export const JWT_TOKEN_KEY = 'JWT_TOKEN';
 
 
 export const REFRESH_TOKEN_KEY = 'REFRESH_TOKEN';
 export const REFRESH_TOKEN_KEY = 'REFRESH_TOKEN';
 
 
+export const SHARE_JWT_TOKEN_KEY = 'SHARE_JWT_TOKEN';
+
+export const SHARE_REFRESH_TOKEN_KEY = 'SHARE_REFRESH_TOKEN';
+
 export const LOCALE_KEY = 'LOCALE__';
 export const LOCALE_KEY = 'LOCALE__';
 
 
 // user info key
 // user info key

@@ -4,7 +4,14 @@ import { defineStore } from 'pinia';
 import { store } from '/@/store';
 import { store } from '/@/store';
 import { RoleEnum } from '/@/enums/roleEnum';
 import { RoleEnum } from '/@/enums/roleEnum';
 import { PageEnum } from '/@/enums/pageEnum';
 import { PageEnum } from '/@/enums/pageEnum';
-import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY, ROLES_KEY, USER_INFO_KEY } from '/@/enums/cacheEnum';
+import {
+  JWT_TOKEN_KEY,
+  REFRESH_TOKEN_KEY,
+  ROLES_KEY,
+  SHARE_JWT_TOKEN_KEY,
+  SHARE_REFRESH_TOKEN_KEY,
+  USER_INFO_KEY,
+} from '/@/enums/cacheEnum';
 import { getAuthCache, setAuthCache } from '/@/utils/auth';
 import { getAuthCache, setAuthCache } from '/@/utils/auth';
 import {
 import {
   LoginParams,
   LoginParams,
@@ -33,6 +40,8 @@ interface UserState {
   lastUpdateTime: number;
   lastUpdateTime: number;
   jwtToken?: string;
   jwtToken?: string;
   refreshToken?: string;
   refreshToken?: string;
+  shareJwtToken?: string;
+  shareRefreshToken?: string;
   outTarget?: string;
   outTarget?: string;
 }
 }
 
 
@@ -100,6 +109,13 @@ export const useUserStore = defineStore({
       setAuthCache(JWT_TOKEN_KEY, jwtToken);
       setAuthCache(JWT_TOKEN_KEY, jwtToken);
       setAuthCache(REFRESH_TOKEN_KEY, refreshToken);
       setAuthCache(REFRESH_TOKEN_KEY, refreshToken);
     },
     },
+
+    storeShareToken(jwtToken: string, refreshToken: string) {
+      this.shareJwtToken = jwtToken;
+      this.shareRefreshToken = refreshToken;
+      setAuthCache(SHARE_JWT_TOKEN_KEY, jwtToken);
+      setAuthCache(SHARE_REFRESH_TOKEN_KEY, refreshToken);
+    },
     setToken(info: string | undefined) {
     setToken(info: string | undefined) {
       this.jwtToken = info;
       this.jwtToken = info;
       setAuthCache(JWT_TOKEN_KEY, info);
       setAuthCache(JWT_TOKEN_KEY, info);

 import { Persistent, BasicKeys } from '/@/utils/cache/persistent';
 import { Persistent, BasicKeys } from '/@/utils/cache/persistent';
-import { CacheTypeEnum } from '/@/enums/cacheEnum';
+import { CacheTypeEnum, SHARE_JWT_TOKEN_KEY, SHARE_REFRESH_TOKEN_KEY } from '/@/enums/cacheEnum';
 import projectSetting from '/@/settings/projectSetting';
 import projectSetting from '/@/settings/projectSetting';
 import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY } from '/@/enums/cacheEnum';
 import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY } from '/@/enums/cacheEnum';
 
 
@@ -26,3 +26,11 @@ export function getJwtToken() {
 export function getRefreshToken() {
 export function getRefreshToken() {
   return getAuthCache(REFRESH_TOKEN_KEY);
   return getAuthCache(REFRESH_TOKEN_KEY);
 }
 }
+
+export function getShareJwtToken() {
+  return getAuthCache(SHARE_JWT_TOKEN_KEY);
+}
+
+export function getShareRefreshToken() {
+  return getAuthCache(SHARE_REFRESH_TOKEN_KEY);
+}

@@ -80,7 +80,6 @@ export class VAxios {
   private refreshTokenBeforeReq(doRefreshTokenApi: () => Promise<unknown>): Promise<unknown> {
   private refreshTokenBeforeReq(doRefreshTokenApi: () => Promise<unknown>): Promise<unknown> {
     // 创建一个未完成的promise，把改变状态的resolve方法交给请求token结束后执行
     // 创建一个未完成的promise，把改变状态的resolve方法交给请求token结束后执行
     const promise = new Promise((resolve) => {
     const promise = new Promise((resolve) => {
-      console.log('等待新token');
       // 等待队列放的是一个回调函数，来延迟resolve的执行，以此控制promise状态的改变
       // 等待队列放的是一个回调函数，来延迟resolve的执行，以此控制promise状态的改变
       this.waitingQueue.push(() => resolve(null));
       this.waitingQueue.push(() => resolve(null));
     });
     });
@@ -88,7 +87,6 @@ export class VAxios {
       this.refreshing = true;
       this.refreshing = true;
       // 模拟请求刷新Token接口，当接口返回数据时执行then方法 TODO 添加catch捕获异常
       // 模拟请求刷新Token接口，当接口返回数据时执行then方法 TODO 添加catch捕获异常
       doRefreshTokenApi().then(() => {
       doRefreshTokenApi().then(() => {
-        console.log('刷新token成功，放行队列中的请求', this.waitingQueue.length);
         this.refreshing = false;
         this.refreshing = false;
         this.waitingQueue.forEach((cb) => cb());
         this.waitingQueue.forEach((cb) => cb());
         this.waitingQueue.length = 0;
         this.waitingQueue.length = 0;
@@ -244,7 +242,6 @@ export class VAxios {
     const { requestOptions } = this.options;
     const { requestOptions } = this.options;
 
 
     const opt: RequestOptions = Object.assign({}, requestOptions, options);
     const opt: RequestOptions = Object.assign({}, requestOptions, options);
-
     const { beforeRequestHook, requestCatchHook, transformRequestHook } = transform || {};
     const { beforeRequestHook, requestCatchHook, transformRequestHook } = transform || {};
     if (beforeRequestHook && isFunction(beforeRequestHook)) {
     if (beforeRequestHook && isFunction(beforeRequestHook)) {
       conf = beforeRequestHook(conf, opt);
       conf = beforeRequestHook(conf, opt);

@@ -10,7 +10,7 @@ import { useGlobSetting } from '/@/hooks/setting';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { RequestEnum, ContentTypeEnum } from '/@/enums/httpEnum';
 import { RequestEnum, ContentTypeEnum } from '/@/enums/httpEnum';
 import { isString } from '/@/utils/is';
 import { isString } from '/@/utils/is';
-import { getJwtToken } from '/@/utils/auth';
+import { getJwtToken, getShareJwtToken } from '/@/utils/auth';
 import { setObjToUrlParams, deepMerge } from '/@/utils';
 import { setObjToUrlParams, deepMerge } from '/@/utils';
 import { useErrorLogStoreWithOut } from '/@/store/modules/errorLog';
 import { useErrorLogStoreWithOut } from '/@/store/modules/errorLog';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useI18n } from '/@/hooks/web/useI18n';
@@ -92,12 +92,25 @@ const transform: AxiosTransform = {
    */
    */
   requestInterceptors: (config, options) => {
   requestInterceptors: (config, options) => {
     // 请求之前处理config
     // 请求之前处理config
-    const token = getJwtToken();
-    if (token && (config as Recordable)?.requestOptions?.withToken !== false) {
-      // jwt token
-      config.headers['X-Authorization'] = options.authenticationScheme
-        ? `${options.authenticationScheme} ${token}`
-        : token;
+    const { requestOptions } = config;
+    const { withShareToken } = requestOptions || {};
+    const { requestOptions: { withToken } = {} } = options;
+    if (withToken !== false) {
+      const shareToken = getShareJwtToken();
+      if (withShareToken && shareToken) {
+        console.log({ withShareToken, shareToken });
+        config.headers['X-Authorization'] = options.authenticationScheme
+          ? `${options.authenticationScheme} ${shareToken}`
+          : shareToken;
+      } else {
+        const token = getJwtToken();
+        console.log({ token });
+        if (token) {
+          config.headers['X-Authorization'] = options.authenticationScheme
+            ? `${options.authenticationScheme} ${token}`
+            : token;
+        }
+      }
     }
     }
     return config;
     return config;
   },
   },
@@ -194,7 +207,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
           ignoreCancelToken: true,
           ignoreCancelToken: true,
           // 是否携带token
           // 是否携带token
           withToken: true,
           withToken: true,
-        },
+        } as RequestOptions,
       },
       },
       opt || {}
       opt || {}
     )
     )

+export const isShareMode = () => {
+  const sharePageReg = /\/share\/[^/]+\/[^/]+\/[^/]+/;
+  const { pathname } = location;
+  return sharePageReg.test(pathname);
+};

@@ -37,7 +37,7 @@
     const { params } = ROUTE;
     const { params } = ROUTE;
     const { publicId } = params as Partial<ShareRouteParams>;
     const { publicId } = params as Partial<ShareRouteParams>;
     const { token, refreshToken } = await sharePageLogin(publicId!);
     const { token, refreshToken } = await sharePageLogin(publicId!);
-    userStore.storeToken(token, refreshToken);
+    userStore.storeShareToken(token, refreshToken);
   };
   };
 
 
   const getCheckNeedAccessToken = async () => {
   const getCheckNeedAccessToken = async () => {

 import { useWebSocket } from '@vueuse/core';
 import { useWebSocket } from '@vueuse/core';
 import { Ref, unref } from 'vue';
 import { Ref, unref } from 'vue';
 import { DataBoardLayoutInfo } from '../types/type';
 import { DataBoardLayoutInfo } from '../types/type';
-import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
 import { useGlobSetting } from '/@/hooks/setting';
 import { useGlobSetting } from '/@/hooks/setting';
-import { getAuthCache } from '/@/utils/auth';
 import { isNullAndUnDef } from '/@/utils/is';
 import { isNullAndUnDef } from '/@/utils/is';
+import { getJwtToken, getShareJwtToken } from '/@/utils/auth';
+import { isShareMode } from '/@/views/sys/share/hook';
 
 
 interface SocketMessage {
 interface SocketMessage {
   tsSubCmds: SocketMessageItem[];
   tsSubCmds: SocketMessageItem[];
@@ -50,7 +50,7 @@ const generateMessage = (deviceId: string, cmdId: number, attr: string): SocketM
 };
 };
 
 
 export function useSocketConnect(dataSourceRef: Ref<DataBoardLayoutInfo[]>) {
 export function useSocketConnect(dataSourceRef: Ref<DataBoardLayoutInfo[]>) {
-  const token = getAuthCache(JWT_TOKEN_KEY);
+  const token = isShareMode() ? getShareJwtToken() : getJwtToken();
 
 
   const cmdIdMapping = new Map<number, GroupMappingRecord[]>();
   const cmdIdMapping = new Map<number, GroupMappingRecord[]>();
 
 

@@ -21,6 +21,8 @@ export interface RequestOptions {
   ignoreCancelToken?: boolean;
   ignoreCancelToken?: boolean;
   // Whether to send token in header
   // Whether to send token in header
   withToken?: boolean;
   withToken?: boolean;
+  // Carry and share token 携带分享的访问令牌
+  withShareToken?: boolean;
 }
 }
 
 
 export interface Result<T = any> {
 export interface Result<T = any> {