abler-api 1.0.20 → 1.0.22

package/README.md

@@ -26,6 +26,14 @@ API服务启动时检查前置条件
 
 ### 更新日志
 
+#### 1.0.22
+
+- extractToken Bug修复
+
+#### 1.0.21
+
+- 随abler-db更新版本
+
 #### 1.0.20
 
 - preconditions.checkAll(saveFile) 增加参数saveFile，指定保存检查结果的文件，若未指定或值为 undefined，则为保持和老版本兼容自动设置为 "../log/preconditions"，若值为 “”， 则不保存文件

package/dist/cjs/pp-util.js

@@ -147,8 +147,8 @@ class preconditions$2 {
   /**
    * 初始化数据库连接
    */
-  static async initDb(dbSql) {
-    return await initDb(dbSql);
+  static async initDb() {
+    return await initDb();
   }
 
   /**
@@ -228,9 +228,9 @@ async function checkRedis() {
   // console.log(`checkRedis done：`);
   // console.log(redis);
 }
-async function initDb(dbSql) {
+async function initDb() {
   try {
-    dbUtil$1.config(conf$3, err$1, dbSql);
+    dbUtil$1.config(conf$3, err$1);
   } catch (e) {
     if (e.reason === 'bad decrypt') {
       e = new Error(t_f$3("解密数据库密码(%s)失败", conf$3.dbconn.dbpwd));
@@ -685,12 +685,14 @@ class apiUtil$2 {
           token = params.token; //向后兼容
           delete params.token;
         } else {
-          // 如果没有token，则返回错误
-          console.log(errCfg.TOKEN_NEEDED);
-          if (res) {
-            res.send(errCfg.ERROR(errCfg.TOKEN_NEEDED));
-          } else if (!noErr) {
-            throw errCfg.TOKEN_NEEDED;
+          if (!noErr) {
+            // 如果没有token，则返回错误
+            console.log(errCfg.TOKEN_NEEDED);
+            if (res) {
+              res.send(errCfg.ERROR(errCfg.TOKEN_NEEDED));
+            } else {
+              throw errCfg.TOKEN_NEEDED;
+            }
           }
         }
       }

package/package.json

@@ -1,46 +1,47 @@
-{
-  "name": "abler-api",
-  "version": "1.0.20",
-  "description": "API服务相关工具",
-  "main": "./dist/cjs/pp-util.js",
-  "-module": "./dist/es/pp-util.js",
-  "scripts": {
-    "build": "npx rollup -c rollup.config.js",
-    "postbuild": "node ..\\postbuild.js",
-    "test": "echo \"Skip tests for this package\" && exit 0"
-  },
-  "files": [
-    "dist"
-  ],
-  "author": "peng_peng",
-  "license": "ISC",
-  "dependencies": {
-    "abler-db": "^1.0.20",
-    "abler-i18n": "^1.0.2",
-    "abler-messenger": "^1.0.18",
-    "abler-net": "^1.0.5",
-    "abler-util": "^1.0.4",
-    "basic-auth": "^2.0.1",
-    "node-cron": "^3.0.1",
-    "proxy-agent": "6.5.0",
-    "q": "^1.5.1"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.18.5",
-    "@babel/eslint-parser": "^7.18.2",
-    "@babel/plugin-transform-runtime": "^7.18.0",
-    "@babel/preset-env": "^7.18.2",
-    "@babel/runtime": "^7.18.0",
-    "@rollup/plugin-babel": "^5.3.1",
-    "@rollup/plugin-commonjs": "^22.0.0",
-    "@rollup/plugin-eslint": "^8.0.2",
-    "@rollup/plugin-node-resolve": "^13.3.0",
-    "@typescript-eslint/eslint-plugin": "^5.25.0",
-    "@typescript-eslint/parser": "^5.25.0",
-    "eslint": "^8.16.0",
-    "eslint-plugin-react": "^7.30.0",
-    "rollup-plugin-filesize": "^10.0.0",
-    "rollup-plugin-json": "^4.0.0",
-    "rollup-plugin-terser": "^7.0.2"
-  }
-}
+{
+  "name": "abler-api",
+  "version": "1.0.22",
+  "description": "API服务相关工具",
+  "main": "./dist/cjs/pp-util.js",
+  "-module": "./dist/es/pp-util.js",
+  "scripts": {
+    "build": "npx rollup -c rollup.config.js",
+    "postbuild": "node ..\\postbuild.js",
+    "test": "echo \"Skip tests for this package\" && exit 0"
+  },
+  "files": [
+    "dist"
+  ],
+  "author": "peng_peng",
+  "license": "ISC",
+  "dependencies": {
+    "abler-db": "^1.0.27",
+    "abler-i18n": "^1.0.2",
+    "abler-messenger": "^1.0.20",
+    "abler-net": "^1.0.6",
+    "abler-util": "^1.0.6",
+    "basic-auth": "^2.0.1",
+    "node-cron": "^3.0.1",
+    "proxy-agent": "6.5.0",
+    "q": "^1.5.1"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.18.5",
+    "@babel/eslint-parser": "^7.18.2",
+    "@babel/plugin-transform-runtime": "^7.18.0",
+    "@babel/preset-env": "^7.18.2",
+    "@babel/runtime": "^7.18.0",
+    "@rollup/plugin-babel": "^5.3.1",
+    "@rollup/plugin-commonjs": "^22.0.0",
+    "@rollup/plugin-eslint": "^8.0.2",
+    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@typescript-eslint/eslint-plugin": "^5.25.0",
+    "@typescript-eslint/parser": "^5.25.0",
+    "eslint": "^8.16.0",
+    "eslint-plugin-react": "^7.30.0",
+    "rollup-plugin-filesize": "^10.0.0",
+    "rollup-plugin-json": "^4.0.0",
+    "rollup-plugin-terser": "^7.0.2"
+  },
+  "gitHead": "45a3feb5ff29d29806aeabf0a0fa0c4506bd6505"
+}