ls-pro-common 1.1.1 → 1.1.2

package/es/http/index.js

@@ -1,66 +1,53 @@
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { extend } from 'umi-request';
-import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading } from '../utils'; //默认超时时间为1分钟
-
+import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading } from '../utils';
+//默认超时时间为1分钟
 var request = extend({
   timeout: 60000
 });
 var httpStatus = {
   404: '服务不存在',
-  429: '接口限流',
+  429: '服务繁忙',
   502: '网关出错',
   503: '当前服务器异常',
   504: '请求超时'
 };
 /** 请求拦截器,统一添加token */
-
 request.interceptors.request.use(function (url, options) {
   var token = getCookie("token");
-  console.log('我的拦截', token);
-  options.headers = options.headers || {}; // 处理 token
-
+  options.headers = options.headers || {};
+  // 处理 token
   if (token && url.indexOf('noToken=1') === -1) {
-    options.headers["token"] = token;
-  } // 处理门店
-
-
+    options.headers['token'] = token;
+  }
+  // 处理门店
   var shopNo = getCache('shopNo', true) || getCache('shopNo');
-
   if (shopNo) {
     options.headers["shopNo"] = shopNo;
-  } // 处理门店
-
-
+  }
+  // 处理门店
   var shopCode = getCache('shopCode', true) || getCache('shopCode');
-
   if (shopCode) {
     options.headers["shopCode"] = shopCode;
-  } // 处理仓库
-
-
+  }
+  // 处理仓库
   var storeNo = getCache('storeNo', true) || getCache('storeNo');
-
   if (storeNo) {
     options.headers["storeNo"] = storeNo;
   }
-
   var tag = getCookie('x-asm-prefer-tag');
-
   if (tag) {
     options.headers['x-asm-prefer-tag'] = tag;
   }
-
   url = url.replace('&noToken=1', '').replace('noToken=1', '');
   var param = {
     resCode: getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId'),
     _t1: Date.now()
   };
-
   if (!param.resCode) {
     delete param.resCode;
   }
-
   url = setUrlQuery(url, param);
   return {
     url: url,
@@ -68,119 +55,102 @@ request.interceptors.request.use(function (url, options) {
   };
 });
 /** 请求返回拦截器,统一处理业务异常 */
-
 request.interceptors.response.use( /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(response, options) {
-    var noMsg, _data$flag, _data$flag2, _data$flag3, _data$flag4, data, retCode, retMsg, requestId, faultCode, _data$flag5, _data$flag6, _data$flag7, _data$flag8, _data, _retCode, _retMsg, status, _requestId, _faultCode;
-
+    var noMsg, _data$flag, _data$flag2, _data$flag3, _data$flag4, data, retCode, retMsg, requestId, faultCode, text, _data$flag5, _data$flag6, _data$flag7, _data$flag8, _data, _retCode, _retMsg, status, _requestId, _faultCode;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            noMsg = getUrlQuery('noMsg', options.url); // http 状态码错误
-
-            if (!(response.status < 200 || response.status >= 300)) {
-              _context.next = 18;
-              break;
-            }
-
-            _context.prev = 2;
-            _context.next = 5;
-            return response.clone().json();
-
-          case 5:
-            data = _context.sent;
-            retCode = (_data$flag = data.flag) === null || _data$flag === void 0 ? void 0 : _data$flag.retCode;
-            retMsg = (_data$flag2 = data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retMsg;
-            requestId = (_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.requestId;
-            faultCode = (_data$flag4 = data.flag) === null || _data$flag4 === void 0 ? void 0 : _data$flag4.faultCode;
-
-            if (retCode === 'timeout' || retCode === '4011') {
-              reLogin();
-            } else if (noMsg !== '1') {
-              if (faultCode) {
-                httpError(retMsg, retCode, faultCode, options.url);
-              } else {
-                showError(retMsg + options.url);
-              }
-            }
-
-            _context.next = 16;
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          noMsg = getUrlQuery('noMsg', options.url); // http 状态码错误
+          if (!(response.status < 200 || response.status >= 300)) {
+            _context.next = 20;
             break;
-
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](2);
-            showError(options.url + (_context.t0.message || response.statusText));
-
-          case 16:
-            _context.next = 28;
-            break;
-
-          case 18:
-            if (!(noMsg !== '1')) {
-              _context.next = 28;
-              break;
+          }
+          _context.prev = 2;
+          _context.next = 5;
+          return response.clone().json();
+        case 5:
+          data = _context.sent;
+          retCode = (_data$flag = data.flag) === null || _data$flag === void 0 ? void 0 : _data$flag.retCode;
+          retMsg = (_data$flag2 = data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retMsg;
+          requestId = (_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.requestId;
+          faultCode = (_data$flag4 = data.flag) === null || _data$flag4 === void 0 ? void 0 : _data$flag4.faultCode;
+          if (retCode === 'timeout' || retCode === '4011') {
+            reLogin();
+          } else if (noMsg !== '1') {
+            if (faultCode) {
+              httpError(retMsg, retCode, faultCode, options.url);
+            } else {
+              showError(retMsg + options.url);
             }
-
-            _context.next = 21;
-            return response.clone().json();
-
-          case 21:
-            _data = _context.sent;
-            _retCode = (_data === null || _data === void 0 ? void 0 : (_data$flag5 = _data.flag) === null || _data$flag5 === void 0 ? void 0 : _data$flag5.retCode) || '0';
-            _retMsg = ((_data$flag6 = _data.flag) === null || _data$flag6 === void 0 ? void 0 : _data$flag6.retMsg) || '访问接口出错';
-            status = (getUrlQuery('apiStatus') || '0').split(',');
-            _requestId = (_data$flag7 = _data.flag) === null || _data$flag7 === void 0 ? void 0 : _data$flag7.requestId;
-            _faultCode = (_data$flag8 = _data.flag) === null || _data$flag8 === void 0 ? void 0 : _data$flag8.faultCode;
-
-            if (_retCode && !status.includes(_retCode)) {
-              if (_retCode === 'timeout' || _retCode === '4011') {
-                reLogin();
+          }
+          _context.next = 18;
+          break;
+        case 13:
+          _context.prev = 13;
+          _context.t0 = _context["catch"](2);
+          text = httpStatus[response.status];
+          if (response.status === 503 && response.statusText === 'no healthy upstream') {
+            text = '服务未启动';
+          } else if (response.status === 503 && response.statusText === 'reached concurrency limit') {
+            text = '请求被限流';
+          }
+          showError(text || _context.t0.message || response.statusText);
+        case 18:
+          _context.next = 30;
+          break;
+        case 20:
+          if (!(noMsg !== '1')) {
+            _context.next = 30;
+            break;
+          }
+          _context.next = 23;
+          return response.clone().json();
+        case 23:
+          _data = _context.sent;
+          _retCode = (_data === null || _data === void 0 ? void 0 : (_data$flag5 = _data.flag) === null || _data$flag5 === void 0 ? void 0 : _data$flag5.retCode) || '0';
+          _retMsg = ((_data$flag6 = _data.flag) === null || _data$flag6 === void 0 ? void 0 : _data$flag6.retMsg) || '访问接口出错';
+          status = (getUrlQuery('apiStatus') || '0').split(',');
+          _requestId = (_data$flag7 = _data.flag) === null || _data$flag7 === void 0 ? void 0 : _data$flag7.requestId;
+          _faultCode = (_data$flag8 = _data.flag) === null || _data$flag8 === void 0 ? void 0 : _data$flag8.faultCode;
+          if (_retCode && !status.includes(_retCode)) {
+            if (_retCode === 'timeout' || _retCode === '4011') {
+              reLogin();
+            } else {
+              if (_faultCode) {
+                httpError(_retMsg, _retCode, _faultCode, options.url);
               } else {
-                if (_faultCode) {
-                  httpError(_retMsg, _retCode, _faultCode, options.url);
-                } else {
-                  showError(_retMsg);
-                }
+                showError(_retMsg);
               }
             }
-
-          case 28:
-            return _context.abrupt("return", response);
-
-          case 29:
-          case "end":
-            return _context.stop();
-        }
+          }
+        case 30:
+          return _context.abrupt("return", response);
+        case 31:
+        case "end":
+          return _context.stop();
       }
     }, _callee, null, [[2, 13]]);
   }));
-
   return function (_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }());
-
 function ajax(url) {
   var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var type = arguments.length > 2 ? arguments[2] : undefined;
   var needGateWay = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   var isJson = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
-
   if (needGateWay) {
     url = toGatewayUrl(url);
   }
-
   var loadText = getUrlQuery('_loading', url);
-
   if (loadText) {
     showLoading(loadText);
     url = setUrlQuery(url, {
       _loading: ''
     }).replace('&_loading=', '').replace('_loading=', '');
   }
-
   if (type === 'get') {
     return request.get(url, {
       params: params
@@ -215,8 +185,6 @@ function ajax(url) {
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-
-
 export function httpGet(url) {
   var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
@@ -230,7 +198,6 @@ export function httpGet(url) {
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-
 export function httpPost(url) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var isJson = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
@@ -244,7 +211,6 @@ export function httpPost(url) {
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-
 export function httpPut(url) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
@@ -257,7 +223,6 @@ export function httpPut(url) {
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-
 export function httpDelete(url, data) {
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   return ajax(url, data, 'delete', needGateWay);
@@ -268,7 +233,6 @@ export function httpDelete(url, data) {
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<Record<string,string>>
  */
-
 export function getDict(dictCode) {
   var showValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
@@ -288,52 +252,44 @@ export function getDict(dictCode) {
  * @param needGateWay 是否需要网关 默认为true
  * @returns
  */
-
 export function fetchOptions(_x3, _x4, _x5, _x6) {
   return _fetchOptions.apply(this, arguments);
 }
-
 function _fetchOptions() {
   _fetchOptions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(url, param, valueField, labelField) {
     var showValue,
-        needGateWay,
-        _yield$httpGet,
-        _yield$httpGet$rows,
-        rows,
-        data,
-        _args2 = arguments;
-
+      needGateWay,
+      _yield$httpGet,
+      _yield$httpGet$rows,
+      rows,
+      data,
+      _args2 = arguments;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            showValue = _args2.length > 4 && _args2[4] !== undefined ? _args2[4] : true;
-            needGateWay = _args2.length > 5 && _args2[5] !== undefined ? _args2[5] : true;
-            _context2.next = 4;
-            return httpGet(url, param, needGateWay);
-
-          case 4:
-            _yield$httpGet = _context2.sent;
-            _yield$httpGet$rows = _yield$httpGet.rows;
-            rows = _yield$httpGet$rows === void 0 ? [] : _yield$httpGet$rows;
-            data = (rows || []).map(function (o) {
-              return {
-                value: o[valueField],
-                text: o[labelField],
-                label: (showValue ? o[valueField] + '→' : '') + o[labelField],
-                status: o.status
-              };
-            });
-            return _context2.abrupt("return", data);
-
-          case 9:
-          case "end":
-            return _context2.stop();
-        }
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          showValue = _args2.length > 4 && _args2[4] !== undefined ? _args2[4] : true;
+          needGateWay = _args2.length > 5 && _args2[5] !== undefined ? _args2[5] : true;
+          _context2.next = 4;
+          return httpGet(url, param, needGateWay);
+        case 4:
+          _yield$httpGet = _context2.sent;
+          _yield$httpGet$rows = _yield$httpGet.rows;
+          rows = _yield$httpGet$rows === void 0 ? [] : _yield$httpGet$rows;
+          data = (rows || []).map(function (o) {
+            return {
+              value: o[valueField],
+              text: o[labelField],
+              label: (showValue ? o[valueField] + '→' : '') + o[labelField],
+              status: o.status
+            };
+          });
+          return _context2.abrupt("return", data);
+        case 9:
+        case "end":
+          return _context2.stop();
       }
     }, _callee2);
   }));
   return _fetchOptions.apply(this, arguments);
 }
-
 export default request;

package/es/index.js

@@ -12,7 +12,6 @@ import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
 /** Hooks */
-
 import useSingle from './hooks/useSingle';
 import useDtl from './hooks/useDtl';
 import usePermission from './hooks/usePermission';