ls-pro-common 3.1.13 → 3.1.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/common.js +1 -1
  2. package/dist/common.min.js +1 -1
  3. package/es/http/index.js +46 -17
  4. package/lib/http/index.js +46 -17
  5. package/package.json +1 -1
package/es/http/index.js CHANGED
@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
2
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
3
3
  import _regeneratorRuntime from "@babel/runtime/regenerator";
4
4
  import { extend } from 'umi-request';
5
- import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, getBrowserId } from '../utils';
5
+ import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, getBrowserId, setCache } from '../utils';
6
6
  //默认超时时间为1分钟
7
7
  var request = extend({
8
8
  timeout: 60000
@@ -83,7 +83,12 @@ request.interceptors.request.use(function (url, options) {
83
83
  // @ts-ignore
84
84
  options.headers['x-asm-prefer-tag'] = tag; //灰度发版标识
85
85
  }
86
-
86
+ // wms 提示，是否排班标识
87
+ var expireWarnFlag = getCache('expireWarnFlag', true);
88
+ if (expireWarnFlag === '1') {
89
+ // @ts-ignore
90
+ options.headers['expireWarnFlag'] = '1';
91
+ }
87
92
  var token = getCookie('token');
88
93
  if (token && url.indexOf('noToken=1') === -1) {
89
94
  //@ts-ignore
@@ -118,7 +123,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
118
123
  userAgent = (_navigator = navigator) === null || _navigator === void 0 ? void 0 : (_navigator$userAgent = _navigator.userAgent) === null || _navigator$userAgent === void 0 ? void 0 : _navigator$userAgent.toLowerCase();
119
124
  isMobile = /mobile/i.test(userAgent); // http 状态码错误
120
125
  if (!(response.status < 200 || response.status >= 300)) {
121
- _context.next = 21;
126
+ _context.next = 25;
122
127
  break;
123
128
  }
124
129
  _context.prev = 4;
@@ -128,7 +133,19 @@ request.interceptors.response.use( /*#__PURE__*/function () {
128
133
  data = _context.sent;
129
134
  retCode = (_data$flag = data.flag) === null || _data$flag === void 0 ? void 0 : _data$flag.retCode;
130
135
  retMsg = (_data$flag2 = data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retMsg;
131
- faultCode = (_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.faultCode;
136
+ faultCode = (_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.faultCode; // wms 提示，是否排班标识
137
+ if (!(retCode === '99110')) {
138
+ _context.next = 15;
139
+ break;
140
+ }
141
+ if (!(getCache('expireWarnFlag', true) === '1')) {
142
+ _context.next = 14;
143
+ break;
144
+ }
145
+ return _context.abrupt("return", response);
146
+ case 14:
147
+ setCache('expireWarnFlag', '1', true);
148
+ case 15:
132
149
  if ((retCode === 'timeout' || retCode === '4011' || retCode === '4013') && !isMobile) {
133
150
  if (!getCookie('token')) {
134
151
  (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
@@ -151,10 +168,10 @@ request.interceptors.response.use( /*#__PURE__*/function () {
151
168
  showError(_text || retMsg);
152
169
  }
153
170
  }
154
- _context.next = 19;
171
+ _context.next = 23;
155
172
  break;
156
- case 14:
157
- _context.prev = 14;
173
+ case 18:
174
+ _context.prev = 18;
158
175
  _context.t0 = _context["catch"](4);
159
176
  _text2 = httpStatus[response.status];
160
177
  if (response.status === 503 && response.statusText === 'no healthy upstream') {
@@ -163,23 +180,35 @@ request.interceptors.response.use( /*#__PURE__*/function () {
163
180
  _text2 = '请求的服务被限流';
164
181
  }
165
182
  showError(_text2 || _context.t0.message || response.statusText);
166
- case 19:
167
- _context.next = 31;
183
+ case 23:
184
+ _context.next = 39;
168
185
  break;
169
- case 21:
186
+ case 25:
170
187
  if (!(noMsg !== '1')) {
171
- _context.next = 31;
188
+ _context.next = 39;
172
189
  break;
173
190
  }
174
- _context.next = 24;
191
+ _context.next = 28;
175
192
  return response.clone().json();
176
- case 24:
193
+ case 28:
177
194
  _data = _context.sent;
178
195
  _retCode = (_data === null || _data === void 0 ? void 0 : (_data$flag4 = _data.flag) === null || _data$flag4 === void 0 ? void 0 : _data$flag4.retCode) || '0';
179
196
  _retMsg = ((_data$flag5 = _data.flag) === null || _data$flag5 === void 0 ? void 0 : _data$flag5.retMsg) || '请求的服务出错';
180
197
  status = (getUrlQuery('apiStatus', options.url) || '0').split(',');
181
198
  requestId = (_data$flag6 = _data.flag) === null || _data$flag6 === void 0 ? void 0 : _data$flag6.requestId;
182
- _faultCode = (_data$flag7 = _data.flag) === null || _data$flag7 === void 0 ? void 0 : _data$flag7.faultCode;
199
+ _faultCode = (_data$flag7 = _data.flag) === null || _data$flag7 === void 0 ? void 0 : _data$flag7.faultCode; // wms 提示，是否排班标识
200
+ if (!(_retCode === '99110')) {
201
+ _context.next = 38;
202
+ break;
203
+ }
204
+ if (!(getCache('expireWarnFlag', true) === '1')) {
205
+ _context.next = 37;
206
+ break;
207
+ }
208
+ return _context.abrupt("return", response);
209
+ case 37:
210
+ setCache('expireWarnFlag', '1', true);
211
+ case 38:
183
212
  if (_retCode && !status.includes(_retCode)) {
184
213
  if ((_retCode === 'timeout' || _retCode === '4011') && !isMobile) {
185
214
  if (!getCookie('token')) {
@@ -195,13 +224,13 @@ request.interceptors.response.use( /*#__PURE__*/function () {
195
224
  }
196
225
  }
197
226
  }
198
- case 31:
227
+ case 39:
199
228
  return _context.abrupt("return", response);
200
- case 32:
229
+ case 40:
201
230
  case "end":
202
231
  return _context.stop();
203
232
  }
204
- }, _callee, null, [[4, 14]]);
233
+ }, _callee, null, [[4, 18]]);
205
234
  }));
206
235
  return function (_x, _x2) {
207
236
  return _ref.apply(this, arguments);
package/lib/http/index.js CHANGED
@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
2
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
3
3
  import _regeneratorRuntime from "@babel/runtime/regenerator";
4
4
  import { extend } from 'umi-request';
5
- import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, getBrowserId } from '../utils';
5
+ import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, getBrowserId, setCache } from '../utils';
6
6
  //默认超时时间为1分钟
7
7
  var request = extend({
8
8
  timeout: 60000
@@ -83,7 +83,12 @@ request.interceptors.request.use(function (url, options) {
83
83
  // @ts-ignore
84
84
  options.headers['x-asm-prefer-tag'] = tag; //灰度发版标识
85
85
  }
86
-
86
+ // wms 提示，是否排班标识
87
+ var expireWarnFlag = getCache('expireWarnFlag', true);
88
+ if (expireWarnFlag === '1') {
89
+ // @ts-ignore
90
+ options.headers['expireWarnFlag'] = '1';
91
+ }
87
92
  var token = getCookie('token');
88
93
  if (token && url.indexOf('noToken=1') === -1) {
89
94
  //@ts-ignore
@@ -118,7 +123,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
118
123
  userAgent = (_navigator = navigator) === null || _navigator === void 0 ? void 0 : (_navigator$userAgent = _navigator.userAgent) === null || _navigator$userAgent === void 0 ? void 0 : _navigator$userAgent.toLowerCase();
119
124
  isMobile = /mobile/i.test(userAgent); // http 状态码错误
120
125
  if (!(response.status < 200 || response.status >= 300)) {
121
- _context.next = 21;
126
+ _context.next = 25;
122
127
  break;
123
128
  }
124
129
  _context.prev = 4;
@@ -128,7 +133,19 @@ request.interceptors.response.use( /*#__PURE__*/function () {
128
133
  data = _context.sent;
129
134
  retCode = (_data$flag = data.flag) === null || _data$flag === void 0 ? void 0 : _data$flag.retCode;
130
135
  retMsg = (_data$flag2 = data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retMsg;
131
- faultCode = (_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.faultCode;
136
+ faultCode = (_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.faultCode; // wms 提示，是否排班标识
137
+ if (!(retCode === '99110')) {
138
+ _context.next = 15;
139
+ break;
140
+ }
141
+ if (!(getCache('expireWarnFlag', true) === '1')) {
142
+ _context.next = 14;
143
+ break;
144
+ }
145
+ return _context.abrupt("return", response);
146
+ case 14:
147
+ setCache('expireWarnFlag', '1', true);
148
+ case 15:
132
149
  if ((retCode === 'timeout' || retCode === '4011' || retCode === '4013') && !isMobile) {
133
150
  if (!getCookie('token')) {
134
151
  (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
@@ -151,10 +168,10 @@ request.interceptors.response.use( /*#__PURE__*/function () {
151
168
  showError(_text || retMsg);
152
169
  }
153
170
  }
154
- _context.next = 19;
171
+ _context.next = 23;
155
172
  break;
156
- case 14:
157
- _context.prev = 14;
173
+ case 18:
174
+ _context.prev = 18;
158
175
  _context.t0 = _context["catch"](4);
159
176
  _text2 = httpStatus[response.status];
160
177
  if (response.status === 503 && response.statusText === 'no healthy upstream') {
@@ -163,23 +180,35 @@ request.interceptors.response.use( /*#__PURE__*/function () {
163
180
  _text2 = '请求的服务被限流';
164
181
  }
165
182
  showError(_text2 || _context.t0.message || response.statusText);
166
- case 19:
167
- _context.next = 31;
183
+ case 23:
184
+ _context.next = 39;
168
185
  break;
169
- case 21:
186
+ case 25:
170
187
  if (!(noMsg !== '1')) {
171
- _context.next = 31;
188
+ _context.next = 39;
172
189
  break;
173
190
  }
174
- _context.next = 24;
191
+ _context.next = 28;
175
192
  return response.clone().json();
176
- case 24:
193
+ case 28:
177
194
  _data = _context.sent;
178
195
  _retCode = (_data === null || _data === void 0 ? void 0 : (_data$flag4 = _data.flag) === null || _data$flag4 === void 0 ? void 0 : _data$flag4.retCode) || '0';
179
196
  _retMsg = ((_data$flag5 = _data.flag) === null || _data$flag5 === void 0 ? void 0 : _data$flag5.retMsg) || '请求的服务出错';
180
197
  status = (getUrlQuery('apiStatus', options.url) || '0').split(',');
181
198
  requestId = (_data$flag6 = _data.flag) === null || _data$flag6 === void 0 ? void 0 : _data$flag6.requestId;
182
- _faultCode = (_data$flag7 = _data.flag) === null || _data$flag7 === void 0 ? void 0 : _data$flag7.faultCode;
199
+ _faultCode = (_data$flag7 = _data.flag) === null || _data$flag7 === void 0 ? void 0 : _data$flag7.faultCode; // wms 提示，是否排班标识
200
+ if (!(_retCode === '99110')) {
201
+ _context.next = 38;
202
+ break;
203
+ }
204
+ if (!(getCache('expireWarnFlag', true) === '1')) {
205
+ _context.next = 37;
206
+ break;
207
+ }
208
+ return _context.abrupt("return", response);
209
+ case 37:
210
+ setCache('expireWarnFlag', '1', true);
211
+ case 38:
183
212
  if (_retCode && !status.includes(_retCode)) {
184
213
  if ((_retCode === 'timeout' || _retCode === '4011') && !isMobile) {
185
214
  if (!getCookie('token')) {
@@ -195,13 +224,13 @@ request.interceptors.response.use( /*#__PURE__*/function () {
195
224
  }
196
225
  }
197
226
  }
198
- case 31:
227
+ case 39:
199
228
  return _context.abrupt("return", response);
200
- case 32:
229
+ case 40:
201
230
  case "end":
202
231
  return _context.stop();
203
232
  }
204
- }, _callee, null, [[4, 14]]);
233
+ }, _callee, null, [[4, 18]]);
205
234
  }));
206
235
  return function (_x, _x2) {
207
236
  return _ref.apply(this, arguments);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ls-pro-common",
3
- "version": "3.1.13",
3
+ "version": "3.1.14",
4
4
  "description": "ls-pro-common",
5
5
  "license": "MIT",
6
6
  "sideEffects": [