abler-api 1.0.1 → 1.0.3

package/dist/cjs/pp-util.js

@@ -35,10 +35,10 @@ const {
   dbUtil: dbUtil$1,
   ppRedis,
   kvStorage: kvStorage$1,
-  redisSimulator
+  redisSimulator,
+  DbVersionManager
 } = require$$4__default["default"];
 let conf$3, err$1;
-// const dbCheck = require('../dbupdate/dd-version');
 
 /**
  * API服务启动时前置条件检查
@@ -54,11 +54,11 @@ class preconditions$2 {
   static appName;
   static checkFunctions = [];
   static checkPromises = [];
-  static setAppName(aName) {
+  static config(appName) {
     ppUtil$4.configNeeded();
     conf$3 = ppUtil$4.appConfig;
     err$1 = ppUtil$4.appErrCfg;
-    preconditions$2.appName = aName || conf$3.thisApp;
+    preconditions$2.appName = appName || conf$3.thisApp;
     return preconditions$2;
   }
   static addCheckPromise(p) {
@@ -150,13 +150,11 @@ class preconditions$2 {
   static async initKvStorage(dbSql) {
     return await initKvStorage(dbSql);
   }
-
-  // /**
-  //  * 数据库可用性及业务数据版本版本检查
-  //  */
-  // static async checkDatabase() {
-  //     return await checkDatabase();
-  // }
+  static async checkAppDbVersion() {
+    const dbVersionManager = new DbVersionManager();
+    const updateInfo = await dbVersionManager.checkAppDbVersion();
+    return updateInfo.updateMessage;
+  }
 }
 async function createEnvSettingFile(fileName, lastEnvSettingEx) {
   try {
@@ -272,7 +270,7 @@ const {
   netUtil: netUtil$1
 } = require$$6__default["default"];
 const preconditions$1 = ppPrecond;
-let conf$2, appSetting, errCfg, dbSql;
+let conf$2, appSetting, errCfg;
 const pnToken = "access_token",
   hnToken = pnToken,
   pnApiKey = "apiKey",
@@ -294,17 +292,15 @@ class apiUtil$2 {
 
   // static apiCallRecSaver;
 
-  static config(appConfig, appErrCfg, appDbSql) {
-    conf$2 = appConfig;
+  static config() {
+    conf$2 = ppUtil$3.appConfig;
     appSetting = conf$2?.appSetting;
-    errCfg = appErrCfg;
-    dbSql = appDbSql;
-    ppUtil$3.config(appConfig, appErrCfg);
-    kvStorage.config(appConfig, appErrCfg);
+    errCfg = ppUtil$3.appErrCfg;
+    kvStorage.config(conf$2, errCfg);
     apiUtil$2.debugFlag = appSetting?.debugFlag || apiUtil$2.debugFlag;
     apiUtil$2.testFlag = appSetting?.testFlag || apiUtil$2.testFlag;
     // apiUtil.apiCallRecSaver = apiCallRecSaver;
-    preconditions$1.setAppName();
+    preconditions$1.config();
     apiUtil$2.appAsPrefix = conf$2.thisApp.toLowerCase();
   }
 
@@ -885,7 +881,7 @@ class apiUtil$2 {
   static createApiCallRec(tokenData, req) {
     if (!req.apiCallRec) {
       if (req.apiCallRecId) {
-        return dbUtil.dbQueryOne(dbSql.loadApiUsage, {
+        return dbUtil.dbQueryOne(conf$2.dbSql.loadApiUsage, {
           replacements: {
             id: req.apiCallRecId
           }
@@ -951,7 +947,7 @@ class apiUtil$2 {
    * @returns {Promise<null|*>}
    */
   static async queryCompanyInfo(companyId, nullable) {
-    return await dbUtil.dbQueryOne(dbSql.queryCompanyInfo, {
+    return await dbUtil.dbQueryOne(conf$2.dbSql.queryCompanyInfo, {
       companyId
     }, nullable);
   }
@@ -969,7 +965,7 @@ class apiUtil$2 {
       certSpare: null,
       certSpareId: ''
     };
-    return await dbUtil.dbQueryOne(dbSql.queryCertDataByOwner, {
+    return await dbUtil.dbQueryOne(conf$2.dbSql.queryCertDataByOwner, {
       ownerId: companyId,
       applyId: "company"
     }, false).then(certRec => {
@@ -980,7 +976,7 @@ class apiUtil$2 {
       // 公司正式证书
       certInfo.certLiving = pubKeyData;
       certInfo.certLivingId = certRec.id;
-      return dbUtil.dbQueryOne(dbSql.queryCertDataByOwner, {
+      return dbUtil.dbQueryOne(conf$2.dbSql.queryCertDataByOwner, {
         ownerId: companyId,
         applyId: "company_spare"
       }, false).then(certRec1 => {
@@ -1085,13 +1081,13 @@ class apiUtil$2 {
             // 备用证书验证成功了，则将备用证书替换为正式证书
             console.log(t_f$2("公司(%s)备用证书验签成功，正式启用...", tokenData.apiKey));
             return dbUtil.dbTrans(trans => {
-              let p1 = dbUtil.dbExec(dbSql.deleteCertRecById, {
+              let p1 = dbUtil.dbExec(conf$2.dbSql.deleteCertRecById, {
                 replacements: {
                   id: tokenData.certLivingId
                 },
                 transaction: trans
               });
-              let p2 = dbUtil.dbExec(dbSql.spareCertToLiving, {
+              let p2 = dbUtil.dbExec(conf$2.dbSql.spareCertToLiving, {
                 replacements: {
                   id: tokenData.certSpareId
                 },
@@ -1445,7 +1441,7 @@ class apiUtil$2 {
   static async restoreAppInfo(apiKey, req) {
     let appInfo = await apiUtil$2.restoreObj(`${this.appAsPrefix}App_${apiKey}`, appSetting.tokenExpireTime);
     if (!appInfo) {
-      appInfo = await dbUtil.dbQueryOneAndUnstringify(dbSql.APP_QUERY, {
+      appInfo = await dbUtil.dbQueryOneAndUnstringify(conf$2.dbSql.APP_QUERY, {
         apiKey
       }, "exData");
       if (appInfo) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abler-api",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "API服务相关工具",
   "main": "./dist/cjs/pp-util.js",
   "-module": "./dist/es/pp-util.js",
@@ -15,11 +15,11 @@
   "author": "peng_peng",
   "license": "ISC",
   "dependencies": {
-    "abler-db": "^1.0.1",
+    "abler-db": "^1.0.3",
     "abler-i18n": "^1.0.1",
-    "abler-messenger": "^1.0.1",
-    "abler-net": "^1.0.1",
-    "abler-util": "^1.0.1",
+    "abler-messenger": "^1.0.3",
+    "abler-net": "^1.0.3",
+    "abler-util": "^1.0.3",
     "basic-auth": "^2.0.1",
     "node-cron": "^3.0.1",
     "q": "^1.5.1"
@@ -42,5 +42,5 @@
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-terser": "^7.0.2"
   },
-  "gitHead": "39ef23cc8a94e51adf8a76fe5ec0566270e4e39d"
+  "gitHead": "ef71a9b05cf37ec9837a09b1d4dce9ca354de627"
 }