abler-api 1.0.56 → 1.0.63

package/dist/cjs/pp-util.js

@@ -222,7 +222,7 @@ async function checkRedis() {
     redis.error = e;
   });
   if (redis.error) {
-    console.log(t_f$3("未能成功連接 redis： %s，請檢查相關設置", redis.error));
+    console.log(t_f$3("未能成功連接 red\n" + "npm\n" + "Search packages\n" + "Search\nis： %s，請檢查相關設置", redis.error));
     return t_f$3("未能成功連接 redis： %s，請檢查相關設置", redis.error);
   }
   // console.log(`checkRedis done：`);
@@ -232,13 +232,8 @@ async function initDb() {
   try {
     await 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));
-    }
-    // if (e.reason === 'bad decrypt') {
-    //     e = new Error(`解密Redis密码(${conf.redis.password})失败`);
-    // }
-    return t_f$3("初始化数据库连接失败(%s)", e.message);
+    let message = e.reason === 'bad decrypt' ? t_f$3("解密数据库密码(%s)失败", conf$3.dbConf.dbpwd) : e.message;
+    return t_f$3("初始化数据库连接失败(%s)", message);
   }
 }
 async function initKvStorage(dbSql) {
@@ -675,7 +670,7 @@ class apiUtil$2 {
    * @param req
    * @param res
    * @param noErr
-   * @returns {Promise<*>}
+   * @returns {string | undefined}
    */
   static extractToken(req, res, noErr) {
     configNeeded();
@@ -1381,7 +1376,7 @@ class apiUtil$2 {
   static decryptContent(content, cek) {
     this.validCek(cek);
     try {
-      const result = ppCrypto.decryptData(content, cek.key, 'utf8');
+      const result = ppCrypto.decryptData(content, cek.key, 'base64', 'utf8');
       if (result.startsWith('{') || result.startsWith('[')) {
         return JSON.parse(result);
       }
@@ -1901,20 +1896,8 @@ class apiUtil$2 {
    * 创建验证码对象
    * npm i svg-captcha
    */
-  static createSvgCaptcha(options) {
-    const captcha = svgCaptcha.create({
-      inverse: options.hasOwnProperty('inverse') ? options.inverse : false,
-      fontSize: options.fontSize || 48,
-      noise: options.noise || 2,
-      width: options.width || 150,
-      height: options.height || 75,
-      size: options.size || 4,
-      charPreset: options.charPreset || '0123456789',
-      ignoreChars: options.ignoreChars || '0oli',
-      color: options.hasOwnProperty('color') ? options.color : true,
-      background: options.background || '#cc9966'
-    });
-    return captcha;
+  static async createSvgCaptcha(...args) {
+    return await ppUtil$3.createCaptcha(...args);
   }
 
   //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abler-api",
-  "version": "1.0.56",
+  "version": "1.0.63",
   "description": "API服务相关工具",
   "main": "./dist/cjs/pp-util.js",
   "-module": "./dist/es/pp-util.js",
@@ -15,33 +15,15 @@
   "author": "peng_peng",
   "license": "ISC",
   "dependencies": {
-    "abler-db": "^1.0.62",
-    "abler-i18n": "^1.0.9",
-    "abler-messenger": "^1.1.19",
-    "abler-net": "^1.0.23",
-    "abler-util": "^1.0.23",
+    "abler-db": "^1.0.71",
+    "abler-i18n": "^1.0.15",
+    "abler-messenger": "^1.1.26",
+    "abler-net": "^1.0.30",
+    "abler-util": "^1.0.30",
     "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": "8027625bd8e5fd989382976d42a2404d4f4b68ce"
+  "gitHead": "b353de2389423d7493db7c11777e19b52f11e341"
 }