q-koa 13.8.57 → 13.8.58

package/core/app.js

@@ -672,285 +672,265 @@ class APP {
       __dirname,
       `${rootDirectory}/${APP_DIR}/${appName}/${PLUGINS_DIR}`
     )
-    const publicExist = fs.existsSync(pluginDir)
-    if (!publicExist) await fsPromise.mkdir(pluginDir)
+    await fsPromise.mkdir(pluginDir, { recursive: true })
     const excludesModel = _.get(
       this.app[appName],
       'appConfig.excludesModel',
       []
     )
-    const pluginDirList = await fsPromise.readdir(pluginDir)
-    const pluginDirResult = pluginDirList.filter(
-      (item) => !excludesModel.includes(item)
+    // withFileTypes 直接带出类型，省掉每个文件夹一次同步 lstatSync
+    const pluginEntries = await fsPromise.readdir(pluginDir, {
+      withFileTypes: true,
+    })
+    const folders = pluginEntries
+      .filter(
+        (item) => item.isDirectory() && !excludesModel.includes(item.name)
+      )
+      .map((item) => item.name)
+
+    // 各插件目录的 readdir 互相独立，并行读取
+    const folderFileList = await Promise.all(
+      folders.map(async (folder) => [
+        folder,
+        await fsPromise.readdir(path.resolve(pluginDir, folder)),
+      ])
     )
 
-    for (const folder of pluginDirResult) {
-      const isFolder = fs
-        .lstatSync(path.resolve(pluginDir, folder))
-        .isDirectory()
-      if (isFolder) {
-        const folderResult = await fsPromise.readdir(
-          path.resolve(pluginDir, folder)
-        )
-        for (const filename of folderResult) {
-          const extname = path.extname(filename)
-          if (extname === '.js') {
-            const n = path.basename(filename, extname)
-            if (
-              [
-                'model',
-                'controller',
-                'service',
-                'validate',
-                'config',
-                'beforeValidate',
-                'afterValidate',
-                'afterExecute',
-              ].includes(n)
-            ) {
-              if (n === 'model') {
-                const defaultModelPath = path.resolve(
-                  __dirname,
-                  `./file/${PLUGINS_DIR}/${folder}`,
-                  `${filename}`
-                )
-                const defaultModelExist = fs.existsSync(defaultModelPath)
-                const currentAttributes = require(path.resolve(
-                  pluginDir,
-                  folder,
-                  filename
-                ))
-                const _attributes =
-                  Object.keys(currentAttributes).length === 0 &&
-                  defaultModelExist
-                    ? require(defaultModelPath)
-                    : currentAttributes
-
-                const belongs = _.get(
-                  this.app[appName].config[folder],
-                  'belongs',
-                  'page'
-                )
+    // O(1) 直接挂载，替代对整个 app 对象反复 defaultsDeep（O(n²)）
+    const mount = (n, folder, value) => {
+      const target = this.app[appName]
+      target[n] = target[n] || {}
+      target[n][folder] = value
+    }
 
-                const idType = _.get(
-                  this.app[appName].config[folder],
-                  'idType',
-                  belongs === 'setting' ? 'TINYINT' : 'MEDIUMINT'
-                )
+    for (const [folder, folderResult] of folderFileList) {
+      for (const filename of folderResult) {
+        const extname = path.extname(filename)
+        if (extname === '.js') {
+          const n = path.basename(filename, extname)
+          if (
+            [
+              'model',
+              'controller',
+              'service',
+              'validate',
+              'config',
+              'beforeValidate',
+              'afterValidate',
+              'afterExecute',
+            ].includes(n)
+          ) {
+            if (n === 'model') {
+              const defaultModelPath = path.resolve(
+                __dirname,
+                `./file/${PLUGINS_DIR}/${folder}`,
+                `${filename}`
+              )
+              const defaultModelExist = fs.existsSync(defaultModelPath)
+              const currentAttributes = require(path.resolve(
+                pluginDir,
+                folder,
+                filename
+              ))
+              const _attributes =
+                Object.keys(currentAttributes).length === 0 &&
+                defaultModelExist
+                  ? require(defaultModelPath)
+                  : currentAttributes
+
+              const belongs = _.get(
+                this.app[appName].config[folder],
+                'belongs',
+                'page'
+              )
 
-                const _id = {
-                  id: {
-                    type: Sequelize[idType].UNSIGNED,
-                    allowNull: false,
-                    primaryKey: true,
-                    autoIncrement: true,
-                  },
-                }
+              const idType = _.get(
+                this.app[appName].config[folder],
+                'idType',
+                belongs === 'setting' ? 'TINYINT' : 'MEDIUMINT'
+              )
 
-                const attributes = _.defaultsDeep(_.cloneDeep(_attributes), {
-                  ..._id,
-                  createdid: {
-                    type: Sequelize.MEDIUMINT.UNSIGNED,
-                    allowNull: false,
-                    defaultValue: 0,
-                  },
-                  created_at: {
-                    type: Sequelize.DATE,
-                    allowNull: false,
-                    // defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
-                    comment: '生成时间',
-                  },
-                  updated_at: {
-                    type: Sequelize.DATE,
-                    allowNull: false,
-                    // defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
-                    comment: '修改时间',
-                  },
-                })
+              const _id = {
+                id: {
+                  type: Sequelize[idType].UNSIGNED,
+                  allowNull: false,
+                  primaryKey: true,
+                  autoIncrement: true,
+                },
+              }
 
-                this.app[appName].attributes = {
-                  ...this.app[appName].attributes,
-                  [folder]: _attributes,
-                }
-                const indexes = _.cloneDeep(
-                  _.get(this.app[appName].config[folder], 'indexList', [])
-                )
-                let hookList = _.cloneDeep(
-                  _.get(this.app[appName].config[folder], 'hookList', [])
-                )
-                if (
-                  hookList.some((h) =>
-                    ['afterDestroy', 'beforeDestroy'].includes(h)
-                  ) &&
-                  !hookList.includes('beforeBulkDestroy')
-                ) {
-                  hookList = [...hookList, 'beforeBulkDestroy']
+              const attributes = _.defaultsDeep(_.cloneDeep(_attributes), {
+                ..._id,
+                createdid: {
+                  type: Sequelize.MEDIUMINT.UNSIGNED,
+                  allowNull: false,
+                  defaultValue: 0,
+                },
+                created_at: {
+                  type: Sequelize.DATE,
+                  allowNull: false,
+                  // defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
+                  comment: '生成时间',
+                },
+                updated_at: {
+                  type: Sequelize.DATE,
+                  allowNull: false,
+                  // defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
+                  comment: '修改时间',
+                },
+              })
+
+              this.app[appName].attributes = {
+                ...this.app[appName].attributes,
+                [folder]: _attributes,
+              }
+              const indexes = _.cloneDeep(
+                _.get(this.app[appName].config[folder], 'indexList', [])
+              )
+              let hookList = _.cloneDeep(
+                _.get(this.app[appName].config[folder], 'hookList', [])
+              )
+              if (
+                hookList.some((h) =>
+                  ['afterDestroy', 'beforeDestroy'].includes(h)
+                ) &&
+                !hookList.includes('beforeBulkDestroy')
+              ) {
+                hookList = [...hookList, 'beforeBulkDestroy']
+              }
+              let reduceHook = {}
+              for (const hook of hookList) {
+                reduceHook = {
+                  ...reduceHook,
+                  [hook]: (target, t) => {
+                    if (['beforeBulkDestroy'].includes(hook)) {
+                      target.individualHooks = true
+                    }
+                    try {
+                      this.app[appName].service &&
+                        this.app[appName].service[folder] &&
+                        this.app[appName].service[folder][hook] &&
+                        this.app[appName].service[folder][hook]({
+                          app: this.app[appName],
+                          model: folder,
+                          hook,
+                          ...(target.toJSON
+                            ? {
+                                target: target.toJSON(),
+                              }
+                            : {
+                                target,
+                              }),
+                          ...t,
+                        })
+                    } catch (e) {
+                      console.log(e)
+                    }
+
+                    if (['beforeBulkDestroy'].includes(hook)) {
+                      return target
+                    }
+                  },
                 }
-                let reduceHook = {}
-                for (const hook of hookList) {
-                  reduceHook = {
+              }
+              const instance = this.app[appName].sequelize.define(
+                folder,
+                attributes,
+                {
+                  freezeTableName: true,
+                  comment: folder,
+                  // timestamps: !modelConfig.belongs === 'setting',
+                  createdAt: 'created_at',
+                  updatedAt: 'updated_at',
+                  name: {
+                    singular: folder,
+                    plural: `${folder}s`,
+                  },
+                  hooks: {
                     ...reduceHook,
-                    [hook]: (target, t) => {
-                      if (['beforeBulkDestroy'].includes(hook)) {
-                        target.individualHooks = true
-                      }
+                    beforeCreate: (res, t) => {
                       try {
-                        this.app[appName].service &&
-                          this.app[appName].service[folder] &&
-                          this.app[appName].service[folder][hook] &&
-                          this.app[appName].service[folder][hook]({
-                            app: this.app[appName],
-                            model: folder,
-                            hook,
-                            ...(target.toJSON
-                              ? {
-                                  target: target.toJSON(),
-                                }
-                              : {
-                                  target,
-                                }),
-                            ...t,
-                          })
-                      } catch (e) {
-                        console.log(e)
-                      }
-
-                      if (['beforeBulkDestroy'].includes(hook)) {
-                        return target
-                      }
-                    },
-                  }
-                }
-                const instance = this.app[appName].sequelize.define(
-                  folder,
-                  attributes,
-                  {
-                    freezeTableName: true,
-                    comment: folder,
-                    // timestamps: !modelConfig.belongs === 'setting',
-                    createdAt: 'created_at',
-                    updatedAt: 'updated_at',
-                    name: {
-                      singular: folder,
-                      plural: `${folder}s`,
-                    },
-                    hooks: {
-                      ...reduceHook,
-                      beforeCreate: (res, t) => {
-                        try {
-                          if (folder === 'log') {
-                            if (this.is_dev && !this.app[appName].service.log) {
-                              console.error('缺少log/service.js,')
-                            }
-                            this.app[appName].service.log &&
-                              this.app[appName].service.log.push({
-                                app: this.app[appName],
-                                appName,
-                                message: res.toJSON().message,
-                                url: res.toJSON().url,
-                              })
+                        if (folder === 'log') {
+                          if (this.is_dev && !this.app[appName].service.log) {
+                            console.error('缺少log/service.js,')
                           }
-                          if (res.toJSON().user_id) {
-                            res.createdid = res.toJSON().user_id
-                          }
-                        } catch (e) {
-                          console.log(e)
+                          this.app[appName].service.log &&
+                            this.app[appName].service.log.push({
+                              app: this.app[appName],
+                              appName,
+                              message: res.toJSON().message,
+                              url: res.toJSON().url,
+                            })
                         }
-                      },
-                    },
-                    ...(indexes.length > 0
-                      ? {
-                          indexes,
+                        if (res.toJSON().user_id) {
+                          res.createdid = res.toJSON().user_id
                         }
-                      : {}),
-                  }
-                )
-                instance.getName = function () {
-                  return folder
-                }
-                this.app[appName] = _.defaultsDeep(
-                  {
-                    [n]: {
-                      [folder]: instance,
+                      } catch (e) {
+                        console.log(e)
+                      }
                     },
                   },
-                  this.app[appName]
-                )
-                if (is_dev) {
-                  const mockObj = _.pickBy(
-                    _attributes,
-                    (item) => item.mock && typeof item.mock === 'function'
-                  )
-                  this.app[appName] = _.defaultsDeep(
-                    {
-                      mock: {
-                        [folder]: () =>
-                          _.zipObject(
-                            Object.keys(mockObj),
-                            Object.keys(mockObj).map((key) =>
-                              _.result(mockObj, `${key}.mock`)
-                            )
-                          ),
-                      },
-                    },
-                    this.app[appName]
-                  )
+                  ...(indexes.length > 0
+                    ? {
+                        indexes,
+                      }
+                    : {}),
                 }
-              } else if (
-                [
-                  'config',
-                  'controller',
-                  'validate',
-                  'afterExecute',
-                  'service',
-                ].includes(n)
-              ) {
-                const defaultPath = path.resolve(
-                  __dirname,
-                  `./file/${PLUGINS_DIR}/${folder}`,
-                  `${filename}`
-                )
-                const defaultExist = fs.existsSync(defaultPath)
-                const defaultN = !defaultExist
-                  ? Object.create(null)
-                  : {
-                      [n]: {
-                        [folder]: defaultExist
-                          ? require(path.resolve(
-                              __dirname,
-                              `./file/${PLUGINS_DIR}/${folder}`,
-                              `${filename}`
-                            ))
-                          : null,
-                      },
-                    }
-                this.app[appName] = _.defaultsDeep(
-                  {
-                    [n]: {
-                      [folder]: require(path.resolve(
-                        pluginDir,
-                        `${folder}`,
-                        `${filename}`
-                      )),
-                    },
-                  },
-                  defaultN,
-                  this.app[appName]
+              )
+              instance.getName = function () {
+                return folder
+              }
+              mount(n, folder, instance)
+              if (is_dev) {
+                const mockObj = _.pickBy(
+                  _attributes,
+                  (item) => item.mock && typeof item.mock === 'function'
                 )
-              } else {
-                this.app[appName] = _.defaultsDeep(
-                  {
-                    [n]: {
-                      [folder]: require(path.resolve(
-                        pluginDir,
-                        `${folder}`,
-                        `${filename}`
-                      )),
-                    },
-                  },
-                  this.app[appName]
+                mount(
+                  'mock',
+                  folder,
+                  () =>
+                    _.zipObject(
+                      Object.keys(mockObj),
+                      Object.keys(mockObj).map((key) =>
+                        _.result(mockObj, `${key}.mock`)
+                      )
+                    )
                 )
               }
+            } else if (
+              [
+                'config',
+                'controller',
+                'validate',
+                'afterExecute',
+                'service',
+              ].includes(n)
+            ) {
+              const defaultPath = path.resolve(
+                __dirname,
+                `./file/${PLUGINS_DIR}/${folder}`,
+                `${filename}`
+              )
+              const userModule = require(path.resolve(
+                pluginDir,
+                `${folder}`,
+                `${filename}`
+              ))
+              // 用户模块缺失的方法/配置由框架内置同名模块补齐（仅合并当前模块，不波及整个 app）
+              if (
+                fs.existsSync(defaultPath) &&
+                _.isPlainObject(userModule)
+              ) {
+                _.defaultsDeep(userModule, require(defaultPath))
+              }
+              mount(n, folder, userModule)
+            } else {
+              mount(
+                n,
+                folder,
+                require(path.resolve(pluginDir, `${folder}`, `${filename}`))
+              )
             }
           }
         }

package/core/file/plugins/weixin/controller.js

@@ -1673,7 +1673,12 @@ exports.union_notify = async (ctx) => {
     }
 
     // 通联回调报文字段为全小写 signtype；兼容大小写两种 + 配置 union_signType；末位回退 RSA
-    const rawSignType = (notifyData.signtype || notifyData.signType || union_signType || 'RSA').toUpperCase()
+    const rawSignType = (
+      notifyData.signtype ||
+      notifyData.signType ||
+      union_signType ||
+      'RSA'
+    ).toUpperCase()
     const hasSign = notifyData.sign !== undefined && notifyData.sign !== ''
     const trxstatus = notifyData.trxstatus
 
@@ -1698,22 +1703,17 @@ exports.union_notify = async (ctx) => {
       if (!signOk) {
         app.service.log.push({
           app,
-          message: `通联回调验签失败(type=${rawSignType}): ${JSON.stringify(notifyData)}`,
+          message: `通联回调验签失败(type=${rawSignType}): ${JSON.stringify(
+            notifyData
+          )}`,
         })
         ctx.body = 'FAIL'
         return
       }
     }
 
-    const {
-      trxcode,
-      cusorderid,
-      acct,
-      trxid,
-      trxamt,
-      srctrxid,
-      trxreserved,
-    } = notifyData
+    const { trxcode, cusorderid, acct, trxid, trxamt, srctrxid, trxreserved } =
+      notifyData
 
     if (trxstatus === '0000') {
       if (['VSP501', 'VSP681'].includes(trxcode)) {
@@ -2439,6 +2439,7 @@ exports.union_checkPay = async (ctx) => {
   const payResult = await allinpay.checkOrder(out_trade_no)
 
   if (payResult) {
+    console.log(payResult)
     if (payResult.trxstatus === '0000' && payResult.trxcode === 'VSP501') {
       const order_price = Number(payResult.trxamt) / 100
 
@@ -2477,12 +2478,8 @@ exports.union_check_balance = async (ctx) => {
   } = ctx.request.body
 
   const appConfig = getConfig(app)
-  const {
-    union_mchId,
-    union_appid,
-    union_privateKey,
-    union_publicKey,
-  } = await appConfig.getObject(pay_config)
+  const { union_mchId, union_appid, union_privateKey, union_publicKey } =
+    await appConfig.getObject(pay_config)
 
   const allinpay = new AllinPay({
     cusid: mch_id || union_mchId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "13.8.57",
+  "version": "13.8.58",
   "description": "",
   "main": "index.js",
   "scripts": {