abler-api 0.1.19 → 0.1.22

package/dist/cjs/pp-util.js

@@ -1055,14 +1055,9 @@ class apiUtil$1 {
 
   static getEnvHosts(params) {
     configNeeded();
-    let envType = ppUtil$2.getEnvType();
-    let x = conf$1.envHosts[envType] || {
-      hosts: ["localhost"]
-    };
-    let port = +params.port || 8443;
     return {
-      hosts: x.hosts,
-      port: x.port || port
+      hosts: appSetting.serverHosts || ["localhost"],
+      port: appSetting.listenPort || +params.port || 8443
     };
   }
   /**
@@ -1075,7 +1070,7 @@ class apiUtil$1 {
 
   static async hostIsMySelf(host, req) {
     let clientIp = apiUtil$1.getClientIp(req);
-    return getMyIp({
+    return ppUtil$2.getMyIp({
       hosts: [host, clientIp]
     });
   }
@@ -1438,10 +1433,6 @@ function configNeeded() {
 
 var ppUtilApi = apiUtil$1;
 
-function commonjsRequire(path) {
-	throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
-}
-
 const fs = require$$0__default$1["default"];
 const path = require$$1__default$1["default"];
 const ppUtil$1 = require$$1__default["default"].ppUtil;
@@ -1525,8 +1516,8 @@ class preconditions$1 {
    */
 
 
-  static async checkExEnvSetting() {
-    return await checkExEnvSetting();
+  static async checkExEnvSetting(loadjs) {
+    return await checkExEnvSetting(loadjs);
   }
   /**
    * redis 可用性检查
@@ -1560,7 +1551,7 @@ async function createEnvSettingFile(fileName) {
   }
 }
 
-async function checkExEnvSetting() {
+async function checkExEnvSetting(loadjs) {
   if (!conf._envSetting.localSettingImported) {
     let fileName = conf.getEnvSettingFileName();
 
@@ -1568,7 +1559,7 @@ async function checkExEnvSetting() {
       return await createEnvSettingFile(fileName);
     }
 
-    let envSettingEx = commonjsRequire(fileName);
+    let envSettingEx = loadjs(fileName);
 
     if (envSettingEx.cfgVersion !== conf._envSettings.default.cfgVersion) {
       if (envSettingEx.cfgVersion !== "0.0") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abler-api",
-  "version": "0.1.19",
+  "version": "0.1.22",
   "description": "API服务相关工具",
   "main": "./dist/cjs/pp-util.js",
   "-module": "./dist/es/pp-util.js",