Merge branch 'ft-dev' into 'main'

fix:解决expire，为undefined问题

See merge request huang/yun-teng-iot-front!74

@@ -6,17 +6,17 @@ import type { RequestOptions, Result } from '/#/axios';
 import type { AxiosTransform, CreateAxiosOptions } from './axiosTransform';
 import type { AxiosTransform, CreateAxiosOptions } from './axiosTransform';
 import { VAxios } from './Axios';
 import { VAxios } from './Axios';
 import { checkStatus } from './checkStatus';
 import { checkStatus } from './checkStatus';
-import { useGlobSetting } from '/@/hooks/setting';
-import { useMessage } from '/@/hooks/web/useMessage';
+// import { useGlobSetting } from '/@/hooks/setting';
+// 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, getAuthCache } from '/@/utils/auth';
+import { getJwtToken } 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';
 import { joinTimestamp, formatRequestDate } from './helper';
 import { joinTimestamp, formatRequestDate } from './helper';
 import { PageEnum } from '/@/enums/pageEnum';
 import { PageEnum } from '/@/enums/pageEnum';
-import { REFRESH_TOKEN_KEY } from '/@/enums/cacheEnum';
+// import { REFRESH_TOKEN_KEY } from '/@/enums/cacheEnum';
 import { router } from '/@/router';
 import { router } from '/@/router';
 
 
 // import { useUserStore } from '/@/store/modules/user';
 // import { useUserStore } from '/@/store/modules/user';
@@ -25,43 +25,43 @@ import { router } from '/@/router';
 
 
 // YUNTENG IOT__DEVELOPMENT__2.7.1__COMMON__LOCAL__KEY__
 // YUNTENG IOT__DEVELOPMENT__2.7.1__COMMON__LOCAL__KEY__
 
 
-function timestampToTime(timestamp) {
-  const date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
-  const Y = date.getFullYear() + '-';
-  const M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
-  const D = date.getDate() + ' ';
-  const h = date.getHours() + ':';
-  const m = date.getMinutes() + ':';
-  const s = date.getSeconds();
-  return Y + M + D + h + m + s;
-}
+// function timestampToTime(timestamp) {
+//   const date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+//   const Y = date.getFullYear() + '-';
+//   const M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+//   const D = date.getDate() + ' ';
+//   const h = date.getHours() + ':';
+//   const m = date.getMinutes() + ':';
+//   const s = date.getSeconds();
+//   return Y + M + D + h + m + s;
+// }
 
 
-function convertToDate() {
-  const date = new Date();
-  const y = date.getFullYear();
-  let m = date.getMonth() + 1;
-  let d = date.getDate();
-  let h = date.getHours();
-  let min = date.getMinutes();
-  let s = date.getSeconds();
-  m = m < 10 ? '0' + m : m; //月小于10，加0
-  d = d < 10 ? '0' + d : d; //day小于10，加0
-  h = h < 10 ? '0' + h : h;
-  min = min < 10 ? '0' + min : min;
-  s = s < 10 ? '0' + s : s;
-  return y + '-' + m + '-' + d + ' ' + h + ':' + min + ':' + s;
-}
+// function convertToDate() {
+//   const date = new Date();
+//   const y = date.getFullYear();
+//   let m = date.getMonth() + 1;
+//   let d = date.getDate();
+//   let h = date.getHours();
+//   let min = date.getMinutes();
+//   let s = date.getSeconds();
+//   m = m < 10 ? '0' + m : m; //月小于10，加0
+//   d = d < 10 ? '0' + d : d; //day小于10，加0
+//   h = h < 10 ? '0' + h : h;
+//   min = min < 10 ? '0' + min : min;
+//   s = s < 10 ? '0' + s : s;
+//   return y + '-' + m + '-' + d + ' ' + h + ':' + min + ':' + s;
+// }
 
 
-const globSetting = useGlobSetting();
-const urlPrefix = globSetting.urlPrefix;
-const { createMessage, createErrorModal } = useMessage();
-const getJwtTokenInfo = getAuthCache(REFRESH_TOKEN_KEY);
-const getExiper = window.localStorage.getItem(
-  'UNDEFINED__DEVELOPMENT__2.7.1__COMMON__LOCAL__KEY__'
-);
-const getExiperValue = JSON.parse(getExiper);
-const expireTime = timestampToTime(getExiperValue.expire);
-const nowTime = convertToDate();
+// const globSetting = useGlobSetting();
+// const urlPrefix = globSetting.urlPrefix;
+// const { createMessage, createErrorModal } = useMessage();
+// const getJwtTokenInfo = getAuthCache(REFRESH_TOKEN_KEY);
+// const getExiper = window.localStorage.getItem(
+//   'UNDEFINED__DEVELOPMENT__2.7.1__COMMON__LOCAL__KEY__'
+// );
+// const getExiperValue = JSON.parse(getExiper);
+// const expireTime = timestampToTime(getExiperValue.expire);
+// const nowTime = convertToDate();
 
 
 /**
 /**
  * @description: 数据处理，方便区分多种处理方式
  * @description: 数据处理，方便区分多种处理方式