Merge branch 'fix/data-board-share' into 'main_dev'

fix: 修复命令下发等接口未携带分享token

See merge request yunteng/thingskit-front!1228

@@ -44,6 +44,7 @@ export const getDeviceActiveTime = (entityId: string) => {
     },
     },
     {
     {
       joinPrefix: false,
       joinPrefix: false,
+      withShareToken: true,
     }
     }
   );
   );
 };
 };

@@ -14,6 +14,7 @@ import { PaginationResult } from '/#/axios';
 import { AlarmLogItem } from './model/deviceConfigModel';
 import { AlarmLogItem } from './model/deviceConfigModel';
 import { omit } from 'lodash-es';
 import { omit } from 'lodash-es';
 import { CommandDeliveryWayEnum } from '/@/enums/deviceEnum';
 import { CommandDeliveryWayEnum } from '/@/enums/deviceEnum';
+import { isShareMode } from '/@/views/sys/share/hook';
 enum DeviceManagerApi {
 enum DeviceManagerApi {
   /**
   /**
    * 设备URL
    * 设备URL
@@ -137,9 +138,12 @@ export const createOrEditDevice = (data) => {
 
 
 // 查询设备详情
 // 查询设备详情
 export const getDeviceDetail = (id: string) => {
 export const getDeviceDetail = (id: string) => {
-  return defHttp.get<DeviceRecord>({
-    url: DeviceManagerApi.DEVICE_URL + `/${id}`,
-  });
+  return defHttp.get<DeviceRecord>(
+    {
+      url: `${DeviceManagerApi.DEVICE_URL}${isShareMode() ? '/public' : ''}/${id}`,
+    },
+    { withShareToken: true }
+  );
 };
 };
 
 
 // 查询设备详情中的告警
 // 查询设备详情中的告警
@@ -290,6 +294,7 @@ export const commandIssuanceApi = (
     },
     },
     {
     {
       joinPrefix: false,
       joinPrefix: false,
+      withShareToken: true,
     }
     }
   );
   );
 };
 };

@@ -74,10 +74,13 @@ export const cancelTask = (
  * @returns {string}
  * @returns {string}
  */
  */
 export const genModbusCommand = (data: GenModbusCommandType) => {
 export const genModbusCommand = (data: GenModbusCommandType) => {
-  return defHttp.post<string>({
-    url: Api.GEN_MODBUS_COMMAND,
-    data,
-  });
+  return defHttp.post<string>(
+    {
+      url: Api.GEN_MODBUS_COMMAND,
+      data,
+    },
+    { withShareToken: true }
+  );
 };
 };
 
 
 export const immediateExecute = (data: ImmediateExecuteTaskType) => {
 export const immediateExecute = (data: ImmediateExecuteTaskType) => {