abler-api 0.1.34 → 0.1.37

package/dist/cjs/pp-util.js

@@ -689,7 +689,7 @@ class apiUtil$2 {
   static createApiCallRec(tokenData, req) {
     if (!req.apiCallRec) {
       if (req.apiCallRecId) {
-        return dbQueryOne(dbSql.loadApiUsage, {
+        return dbUtil.dbQueryOne(dbSql.loadApiUsage, {
           replacements: {
             id: req.apiCallRecId
           }
@@ -698,10 +698,10 @@ class apiUtil$2 {
           return req.apiCallRec;
         });
       } else {
-        let params = extractParams(req); // let contentLength = parseInt(req.headers["content-length"]) || 0;
+        let params = this.extractParams(req); // let contentLength = parseInt(req.headers["content-length"]) || 0;
 
         let rec = {
-          id: newGuid(),
+          id: ppUtil$4.newGuid(),
           companyId: tokenData.apiKey || '',
           orderId: params.orderId || '',
           signerId: params.signerId || '',
@@ -736,6 +736,24 @@ class apiUtil$2 {
     }
 
     return req.apiCallRec;
+
+    function _getBodyLogStr(req) {
+      let contentLength = parseInt(req.headers["content-length"]) || 0;
+      if (contentLength < 500) return req.rawBody || '';
+      let tempBody = {};
+
+      for (let key in req.body) {
+        let value = req.body[key];
+
+        if (typeof value == 'string' && value.length > 500) {
+          value = value.substring(0, 31) + '...(' + value.length + ')';
+        }
+
+        tempBody[key] = value;
+      }
+
+      return JSON.stringify(tempBody);
+    }
   }
   /**
    * 查询机构信息
@@ -1077,9 +1095,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 +1485,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');
 
 /**
@@ -1601,8 +1624,7 @@ async function checkExEnvSetting(loadjs) {
 
       if (!msg) {
         delete require.cache[fileName];
-        const envSettingEx = loadjs(fileName);
-        ppUtil$3.importExEnvSetting(conf$2._envSetting, envSettingEx);
+        ppUtil$3.importExEnvSetting(conf$2._envSetting, fileName, loadjs);
       }
 
       return msg;
@@ -1615,7 +1637,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');
 
 /**
@@ -1588,8 +1593,7 @@ async function checkExEnvSetting(loadjs) {
 
       if (!msg) {
         delete require.cache[fileName];
-        const envSettingEx = loadjs(fileName);
-        ppUtil$3.importExEnvSetting(conf$2._envSetting, envSettingEx);
+        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,9 +1,9 @@
 {
   "name": "abler-api",
-  "version": "0.1.34",
+  "version": "0.1.37",
   "description": "API服务相关工具",
   "main": "./dist/cjs/pp-util.js",
-  "module": "./dist/es/pp-util.js",
+  "-module": "./dist/es/pp-util.js",
   "scripts": {
     "build": "npx rollup -c rollup.config.js",
     "test": "echo \"Error: no test specified\" && exit 1"