component-shipinlv 1.0.3 → 1.0.5

package/dist/lib/getApiUrl.d.ts

@@ -1,3 +1,4 @@
+export declare const getMainPort: () => number;
 declare const getApiUrl: (apiName?: string, apiEnv?: Global.Env | '') => string;
 export declare const getApiEnv: (apiEnv?: Global.Env | '') => Global.Env;
 export declare const getEnv: (env?: Global.Env | '') => Global.Env;

package/dist/lib/getApiUrl.js

@@ -7,6 +7,9 @@ var envData = function envData() {
   var _window3;
   return ((_window3 = window) === null || _window3 === void 0 || (_window3 = _window3.WebBaseConfig) === null || _window3 === void 0 ? void 0 : _window3.currentEnv) || currentEnv;
 };
+export var getMainPort = function getMainPort() {
+  return window.__ShipinlvMainPort || 61800;
+};
 var getApiUrl = function getApiUrl() {
   var _domain;
   var apiName = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
@@ -15,10 +18,11 @@ var getApiUrl = function getApiUrl() {
   if (/^https?:\/\//i.test(apiName)) {
     return apiName;
   }
+  var mainPort = getMainPort();
 
   // 主客户端
   if (/_main\//i.test(apiName)) {
-    return "http://127.0.0.1:61800/".concat(apiName.replace(/^_main\//i, ''));
+    return "http://127.0.0.1:".concat(mainPort, "/").concat(apiName.replace(/^_main\//i, ''));
   }
 
   // 替换第一个 /

package/dist/lib/request.js

@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 // 二次封装 hooks request ;
 // 参数详见：https://github.com/umijs/umi-request/blob/master/README_zh-CN.md
 import request from 'umi-request';
-import getApiUrl, { getApiEnv } from "./getApiUrl";
+import getApiUrl, { getApiEnv, getMainPort } from "./getApiUrl";
 import goAuth from "./goAuth";
 import Tool from "./Tool";
 var requestApi = function requestApi() {
@@ -67,7 +67,7 @@ var requestApi = function requestApi() {
         err = new Error();
       }
       console.log('request component shipinlv:', JSON.stringify(err), url);
-      if (!((_err = err) !== null && _err !== void 0 && _err.response) && url.indexOf('http://127.0.0.1:61800') === 0) {
+      if (!((_err = err) !== null && _err !== void 0 && _err.response) && url.indexOf("http://127.0.0.1:".concat(getMainPort())) === 0) {
         err.name = "shipinlv-client-not-run";
         err.message = "\u8BF7\u5148\u6253\u5F00\u7535\u8111\u4E0A\u5DF2\u5B89\u88C5\u7684\uFF1A\u3010\u89C6\u9891\u9A74\u5DE5\u5177\u7BB1\u3011\uFF0C\u518D\u64CD\u4F5C";
         reject(err);

package/dist/service/api/SubClientController.js

@@ -2,6 +2,7 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import request from "../../lib/request";
+import { getMainPort } from "../../lib/getApiUrl";
 export function start(_x, _x2) {
   return _start.apply(this, arguments);
 }
@@ -33,7 +34,7 @@ function _runStatus() {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          return _context2.abrupt("return", request("http://127.0.0.1:".concat((body === null || body === void 0 ? void 0 : body.port) || 61800, "/sub-client/runStatus"), _objectSpread({
+          return _context2.abrupt("return", request("http://127.0.0.1:".concat((body === null || body === void 0 ? void 0 : body.port) || getMainPort(), "/sub-client/runStatus"), _objectSpread({
             method: 'GET',
             params: _objectSpread({}, body)
           }, options || {})));

package/dist/window.d.ts

@@ -5,5 +5,6 @@ declare interface Window{
   __onBindWindowError: boolean;
   __wxjs_environment: string;
   __recordError: any;
+  __ShipinlvMainPort: number;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "component-shipinlv",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",