abler-api 0.1.33 → 0.1.36

package/dist/cjs/pp-util.js

@@ -1077,9 +1077,14 @@ class apiUtil$2 {
 
   static async hostIsMySelf(host, req) {
     let clientIp = apiUtil$2.getClientIp(req);
-    return ppUtil$4.getMyIp({
-      hosts: [host, clientIp]
-    });
+
+    try {
+      return !!ppUtil$4.getMyIp({
+        hosts: [host, clientIp]
+      });
+    } catch (e) {
+      return false;
+    }
   }
   /**
    * 检查是否应该把请求转发到其它服务器，若是则转发
@@ -1462,7 +1467,7 @@ var ppUtilApi = apiUtil$2;
 const fs = require$$4__default["default"];
 const path = require$$1__default$1["default"];
 const ppUtil$3 = require$$1__default["default"].ppUtil;
-const redisUtil = require$$2__default["default"].redisUtil;
+const ppRedis = require$$2__default["default"].ppRedis;
 let conf$2, err$1; // const dbCheck = require('../dbupdate/dd-version');
 
 /**
@@ -1600,9 +1605,8 @@ async function checkExEnvSetting(loadjs) {
       let msg = await createEnvSettingFile(fileName, envSettingEx);
 
       if (!msg) {
-        delete require.cache[cfgFile];
-        const envSettingEx = loadjs(fileName);
-        pputil.importExEnvSetting(conf$2._envSetting, envSettingEx);
+        delete require.cache[fileName];
+        ppUtil$3.importExEnvSetting(conf$2._envSetting, fileName, loadjs);
       }
 
       return msg;
@@ -1615,7 +1619,7 @@ async function checkExEnvSetting(loadjs) {
 
 async function checkRedis() {
   if (!conf$2.redis.enabled) return "";
-  const redis = redisUtil.newClient("io"); // console.log(`checkRedis begin：`);
+  const redis = ppRedis.newClient("kv"); // console.log(`checkRedis begin：`);
 
   await ppUtil$3.wait(15 * 1000, param => {
     if (redis.ready && redis.connected || redis.error) {

package/dist/es/pp-util.js

@@ -1064,9 +1064,14 @@ class apiUtil$2 {
 
   static async hostIsMySelf(host, req) {
     let clientIp = apiUtil$2.getClientIp(req);
-    return ppUtil$4.getMyIp({
-      hosts: [host, clientIp]
-    });
+
+    try {
+      return !!ppUtil$4.getMyIp({
+        hosts: [host, clientIp]
+      });
+    } catch (e) {
+      return false;
+    }
   }
   /**
    * 检查是否应该把请求转发到其它服务器，若是则转发
@@ -1449,7 +1454,7 @@ var ppUtilApi = apiUtil$2;
 const fs = require$$4;
 const path = require$$1$1;
 const ppUtil$3 = require$$1.ppUtil;
-const redisUtil = require$$2.redisUtil;
+const ppRedis = require$$2.ppRedis;
 let conf$2, err$1; // const dbCheck = require('../dbupdate/dd-version');
 
 /**
@@ -1587,9 +1592,8 @@ async function checkExEnvSetting(loadjs) {
       let msg = await createEnvSettingFile(fileName, envSettingEx);
 
       if (!msg) {
-        delete require.cache[cfgFile];
-        const envSettingEx = loadjs(fileName);
-        pputil.importExEnvSetting(conf$2._envSetting, envSettingEx);
+        delete require.cache[fileName];
+        ppUtil$3.importExEnvSetting(conf$2._envSetting, fileName, loadjs);
       }
 
       return msg;
@@ -1602,7 +1606,7 @@ async function checkExEnvSetting(loadjs) {
 
 async function checkRedis() {
   if (!conf$2.redis.enabled) return "";
-  const redis = redisUtil.newClient("io"); // console.log(`checkRedis begin：`);
+  const redis = ppRedis.newClient("kv"); // console.log(`checkRedis begin：`);
 
   await ppUtil$3.wait(15 * 1000, param => {
     if (redis.ready && redis.connected || redis.error) {

package/package.json

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