Merge branch 'main' into sqy_dev

@@ -10,26 +10,29 @@ VITE_DROP_CONSOLE = true
 # Whether to enable gzip or brotli compression
 # Optional: gzip | brotli | none
 # If you need multiple forms, you can use `,` to separate
-VITE_BUILD_COMPRESS = 'none'
+VITE_BUILD_COMPRESS = 'gzip'
 
 # Whether to delete origin files when using compress, default false
 VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 
 # Basic interface address SPA
-VITE_GLOB_API_URL=/api
+VITE_GLOB_API_URL=http://101.133.234.90:8080/api
 
 # File upload address， optional
 # It can be forwarded by nginx or write the actual address directly
-VITE_GLOB_UPLOAD_URL=/upload
+VITE_GLOB_UPLOAD_URL=http://101.133.234.90:3300/upload
 
 # Interface prefix
-VITE_GLOB_API_URL_PREFIX=/v1
+VITE_GLOB_API_URL_PREFIX=/yt
 
 # Whether to enable image compression
-VITE_USE_IMAGEMIN= true
+VITE_USE_IMAGEMIN= false
 
 # use pwa
 VITE_USE_PWA = false
 
 # Is it compatible with older browsers
-VITE_LEGACY = false
+VITE_LEGACY = true
+
+# 实时数据的ws地址
+VITE_WEB_SOCKET = ws://101.133.234.90:8080/api/ws/plugins/telemetry?token=

@@ -10,58 +10,17 @@ import { useGlobSetting } from '/@/hooks/setting';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { RequestEnum, ContentTypeEnum } from '/@/enums/httpEnum';
 import { isString } from '/@/utils/is';
-import { getJwtToken, getAuthCache } from '/@/utils/auth';
+import { getJwtToken } from '/@/utils/auth';
 import { setObjToUrlParams, deepMerge } from '/@/utils';
 import { useErrorLogStoreWithOut } from '/@/store/modules/errorLog';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { joinTimestamp, formatRequestDate } from './helper';
 import { PageEnum } from '/@/enums/pageEnum';
-import { REFRESH_TOKEN_KEY } from '/@/enums/cacheEnum';
 import { router } from '/@/router';
 
-// import { useUserStore } from '/@/store/modules/user';
-// const userStore = useUserStore();
-// console.log(userStore.userInfo);
-
-// 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 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();
 
 /**
  * @description: 数据处理，方便区分多种处理方式
@@ -166,40 +125,10 @@ const transform: AxiosTransform = {
     try {
       console.log(response.data);
       if (response.data.status == '401' || response.data.message == '"Authentication failed"') {
-        // window.localStorage.removeItem('UNDEFINED__DEVELOPMENT__2.7.1__COMMON__LOCAL__KEY__');
-        // window.localStorage.removeItem('UNDEFINED__DEVELOPMENT__2.7.1__LOCALE__');
         window.localStorage.clear();
         window.sessionStorage.clear();
         router.push(PageEnum.BASE_HOME);
-        // doRefresh();
-
-        // console.log(router);
-        // router.push('/other');
-        // if (expireTime < nowTime) {
-        //   // console.log('过期');
-        //   createMessage.error('token已经过期,请退回登录');
-        // } else {
-        //   // console.log('未过期');
-        // }
-        // router.push(PageEnum.BASE_LOGIN);
-        // if (getJwtTokenInfo) {
-        //   if (PageEnum.BASE_LOGIN) {
-        //     router.push(PageEnum.BASE_LOGIN);
-        //   }
-        // }
-        // router.beforeEach((to, from, next) => {
-        //   console.log(to);
-        //   if (getJwtTokenInfo) {
-        //     if (to.path !== '/login') {
-        //       // doRefresh();
-        //       next({ path: '/adass' });
-        //     }
-        //   }
-        // });
-      } else {
-        // doRefresh();
       }
-
       if (code === 'ECONNABORTED' && message.indexOf('timeout') !== -1) {
         errMessage = t('sys.api.apiTimeoutMessage');
       }