coolcare-lite-scada-component 2.0.33 → 2.0.34

package/es/services/request.js

@@ -8,10 +8,10 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 import { extend } from 'umi-request';
-import { notification, Modal } from 'antd';
+import { notification } from 'antd';
 // eslint-disable-next-line no-unused-vars
 
-import { getAccessToken, getXAccessToken, parseAccessToken, storeToken, goLogin } from "../utils/auth";
+import { getAccessToken, storeToken } from "../utils/auth";
 var codeMessage = {
   200: '服务器成功返回请求的数据。',
   201: '新建或修改数据成功。',
@@ -46,24 +46,6 @@ var errorHandler = function errorHandler(error) {
       statusText = response.statusText,
       url = response.url;
     if (status === 401) {
-      if (isShowLoginOverdueModal) {
-        return;
-      }
-      isShowLoginOverdueModal = true;
-      Modal.confirm({
-        title: '登录过期',
-        maskClosable: false,
-        closable: false,
-        content: '登录时效已过期，请重新登录',
-        okText: '重新登录',
-        onOk: function onOk() {
-          goLogin();
-          isShowLoginOverdueModal = false;
-        },
-        onCancel: function onCancel() {
-          isShowLoginOverdueModal = false;
-        }
-      });
       return;
     }
     var errorText = codeMessage[status] || statusText;
@@ -120,22 +102,9 @@ requestClient.use(/*#__PURE__*/function () {
 requestClient.interceptors.request.use(function (url, options) {
   var headers = options.headers;
   var accessToken = getAccessToken();
-  var xAccessToken = getXAccessToken();
-  if (!xAccessToken) {
-    // 如果 x-access-token 没有的话，直接跳转登录页面
-    goLogin();
-  }
-
-  // @ts-ignore
-  headers.Authorization = "Bearer ".concat(accessToken);
 
   // @ts-ignore
   headers.Authorization = "Bearer ".concat(accessToken);
-  if (accessToken && parseAccessToken(accessToken).exp * 1000 < Date.now() + 1 * 60 * 1000) {
-    // 如果 access-token 的过期时间 < 当前时间 + 1分钟， 说明 token 快过期了, 传 x-access-token 刷新 token
-    // @ts-ignore
-    headers['X-Authorization'] = "Bearer ".concat(xAccessToken);
-  }
   return {
     url: url,
     options: _objectSpread(_objectSpread({}, options), {}, {

package/es/utils/auth.js

@@ -43,18 +43,14 @@ export function parseAccessToken(token) {
  * @param xAccessToken x-access-token
  */
 export function storeToken(accessToken, xAccessToken) {
-  /** x-access-token 有效时长（单位：天） */
-  var xAccessTokenExpires = parseAccessToken(xAccessToken).exp * 1000;
   // 将 access-token 保存到 cookie
   Cookies.set(accessTokenCookieName, accessToken || '', {
-    domain: "das-sc.brighticecream.com",
-    expires: new Date(xAccessTokenExpires)
+    domain: 'das-sc.brighticecream.com'
   });
 
   // 将 x-access-token 保存到 cookie
   Cookies.set(xAccessTokenCookieName, xAccessToken || '', {
-    domain: "das-sc.brighticecream.com",
-    expires: new Date(xAccessTokenExpires)
+    domain: 'das-sc.brighticecream.com'
   });
 }
 export function storeAccessToken(token) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "scripts": {
     "start": "umi dev",
     "build:prod": "UMI_ENV=prod umi build",