abler-api 0.1.70 → 0.1.72

package/dist/cjs/pp-util.js

@@ -33,7 +33,7 @@ const {
   netUtil: netUtil$1
 } = require$$4__default["default"];
 const fs$1 = require$$5__default["default"];
-let conf$3, appSetting$1, err$2, dbSql;
+let conf$3, appSetting, err$2, dbSql;
 const pnToken = "access_token",
       hnToken = pnToken,
       pnApiKey = "apiKey",
@@ -58,13 +58,13 @@ class apiUtil$2 {
 
   static config(appConfig, appErrCfg, appDbSql) {
     conf$3 = appConfig;
-    appSetting$1 = conf$3?.appSetting;
+    appSetting = conf$3?.appSetting;
     err$2 = appErrCfg;
     dbSql = appDbSql;
     ppUtil$4.config(appConfig, appErrCfg);
     kvStorage$1.config(appConfig, appErrCfg);
-    apiUtil$2.debugFlag = appSetting$1?.debugFlag || apiUtil$2.debugFlag;
-    apiUtil$2.testFlag = appSetting$1?.testFlag || apiUtil$2.testFlag; // apiUtil.apiCallRecSaver = apiCallRecSaver;
+    apiUtil$2.debugFlag = appSetting?.debugFlag || apiUtil$2.debugFlag;
+    apiUtil$2.testFlag = appSetting?.testFlag || apiUtil$2.testFlag; // apiUtil.apiCallRecSaver = apiCallRecSaver;
   } //#region ===== 需要应用系统重写的方法
 
   /**
@@ -611,7 +611,7 @@ class apiUtil$2 {
 
 
   static tokenExpireTime(req) {
-    return apiUtil$2.isDebugMode(req) ? 30 * 24 * 60 * 60 : apiUtil$2.isTestMode(req) ? 4 * 60 * 60 : appSetting$1.tokenExpireTime;
+    return apiUtil$2.isDebugMode(req) ? 30 * 24 * 60 * 60 : apiUtil$2.isTestMode(req) ? 4 * 60 * 60 : appSetting.tokenExpireTime;
   }
   /**
    * 获取用户令牌保存键
@@ -1109,8 +1109,8 @@ class apiUtil$2 {
   static getEnvHosts(params) {
     configNeeded();
     return {
-      hosts: appSetting$1.serverHosts || ["localhost"],
-      port: appSetting$1.listenPort || +params.port || 8443
+      hosts: appSetting.serverHosts || ["localhost"],
+      port: appSetting.listenPort || +params.port || 8443
     };
   }
   /**
@@ -1574,7 +1574,7 @@ function configNeeded() {
   if (!conf$3 || !err$2) {
     ppUtil$4.configNeeded();
     conf$3 = ppUtil$4.appConfig;
-    appSetting$1 = conf$3.appSetting;
+    appSetting = conf$3.appSetting;
     err$2 = ppUtil$4.appErrCfg;
   }
 }
@@ -1854,8 +1854,8 @@ class commonMessenger$2 {
 
   static initMessenger(appConfig, appErrCfg, msgChannel) {
     conf$1 = appConfig;
-    this.redisMessenger = conf$1.redis.enabled ? new RedisMessenger(appConfig, appErrCfg, msgChannel).subscribe(msgChannel) : null;
-    this.myMsgAddr = commonMessenger$2.getMyMsgAddr();
+    commonMessenger$2.redisMessenger = conf$1.redis.enabled ? new RedisMessenger(appConfig, appErrCfg, msgChannel).subscribe(msgChannel) : null;
+    commonMessenger$2.myMsgAddr = commonMessenger$2.getMyMsgAddr();
   }
 
   static getMyMsgAddr() {
@@ -1863,7 +1863,7 @@ class commonMessenger$2 {
       conf$1.pm_id = process.env.pm_id || "0";
       let myIp = ppUtil$2.getMyIp();
 
-      if (this.redisMessenger) {
+      if (commonMessenger$2.redisMessenger) {
         myIp = `${conf$1.pm_id}@${myIp}`;
       }
 
@@ -1874,9 +1874,9 @@ class commonMessenger$2 {
     return conf$1.myMsgAddr;
   }
 
-  static setMessageHandle(messageHandle) {
-    if (this.redisMessenger) {
-      return this.redisMessenger.setMessageHandle(messageHandle, msgChannel);
+  static setMessageHandle(messageHandle, msgChannel) {
+    if (commonMessenger$2.redisMessenger) {
+      return commonMessenger$2.redisMessenger.setMessageHandle(messageHandle, msgChannel);
     }
 
     if (commonMessenger$2.onMessage.indexOf(messageHandle) < 0) {
@@ -1886,9 +1886,9 @@ class commonMessenger$2 {
     return commonMessenger$2;
   }
 
-  static async publishMessage(message) {
-    if (this.redisMessenger) {
-      return this.redisMessenger.publish(message, msgChannel);
+  static async publishMessage(message, msgChannel) {
+    if (commonMessenger$2.redisMessenger) {
+      return commonMessenger$2.redisMessenger.publish(message, msgChannel);
     } else {
       //没有消息处理器，则将消息转发到目标地址（不支持pm2多进程）
       if (message.destAddr) {
@@ -1923,7 +1923,7 @@ class commonMessenger$2 {
 
 async function forwardMessage(message) {
   let reqOptions = {
-    url: `https://${message.destAddr}:${appSetting.listenPort}/api/message`,
+    url: `https://${message.destAddr}:${conf$1.appSetting.listenPort}/api/message`,
     method: "POST",
     data: message
   };

package/package.json

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