q-koa 13.8.28 → 13.8.30

package/core/app.js

@@ -143,22 +143,36 @@ class APP {
     // }));
     const { is_off = false } = this.config.restc
     if (!is_off) {
-      this.app.use((ctx, next) => {
-        const { url } = ctx.request
-        const appName = url.split('/')[1]
-        const excludes = [
-          ...this.config.restc.excludes,
-          ..._.get(ctx.app[appName], 'appConfig.restc.excludes', []).map(
-            (item) => `/${appName}/${item}`
-          ),
-        ]
-        this.app.use(
-          restc.koa2({
-            excludes,
-          })
-        )
-        return next()
-      })
+      /**
+       *  restc中间件
+       *  注意：这里只构建不注册。实例按 appName 惰性创建并缓存（app 数量有限），
+       *  避免在中间件内部调用 app.use() 导致 middleware 数组每个请求增长一个实例。
+       *  实际注册在 initApp() 中路由注册之后，保持"兜底生效"的原有顺序。
+       */
+      const globalExcludes = [...this.config.restc.excludes]
+      // 兜底实例：无法识别 appName 时使用原始全局 excludes（不含 appName 前缀）
+      const fallbackRestc = restc.koa2({ excludes: globalExcludes })
+      const restcCache = new Map()
+      this.restcMiddleware = async (ctx, next) => {
+        const appName = ctx.request.url.split('/')[1]
+        const app = this.app[appName]
+        // 未注册应用统一走兜底实例，保证缓存有界（避免随机 appName 撑爆内存）
+        if (!app || !app.appConfig) {
+          return await fallbackRestc(ctx, next)
+        }
+        if (!restcCache.has(appName)) {
+          const excludes = [
+            // 全局 excludes 也必须拼 /${appName}/ 前缀，
+            // 否则 Gateway.test 做 indexOf(rule) === 0 前缀匹配时永远不命中
+            ...globalExcludes.map((item) => `/${appName}/${item}`),
+            ..._.get(app, 'appConfig.restc.excludes', []).map(
+              (item) => `/${appName}/${item}`
+            ),
+          ]
+          restcCache.set(appName, restc.koa2({ excludes }))
+        }
+        return await restcCache.get(appName)(ctx, next)
+      }
     }
 
     /**
@@ -217,6 +231,7 @@ class APP {
        *  挂在jwt解密方法
        */
       if (this.app[appName]) {
+        console.time('ss')
         this.app[appName].sign = async (user) => {
           const result = await jwt.sign(user, secret, {
             expiresIn,
@@ -224,6 +239,7 @@ class APP {
           })
           return result
         }
+        console.timeEnd('ss')
       }
       // eslint-disable-next-line no-nested-ternary
       ctx.request.clientType = ctx.header['client-type']
@@ -612,6 +628,11 @@ class APP {
     })
     this.app.use(router.routes()).use(router.allowedMethods())
 
+    // restc 排在路由之后注册：仅当没有其他中间件响应时才兜底生效（保持原有行为）
+    if (this.restcMiddleware) {
+      this.app.use(this.restcMiddleware)
+    }
+
     spinner.stop()
 
     console.log(chalk.green('==================== end ===================='))

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

@@ -6,6 +6,33 @@ const path = require('path')
 const fs = require('fs')
 const AlipaySdk = require('alipay-sdk').default
 
+// 按 appId+appName+环境 缓存 AlipaySdk 实例，避免每请求重复读私钥文件 + 实例化
+const alipaySdkCache = new Map()
+function getAlipaySdk({ app_id, alipay_public_key, is_sandbox, appName, site_host }) {
+  const cacheKey = `${app_id}_${appName}_${is_sandbox ? 'sandbox' : 'prod'}_${site_host || ''}`
+  if (alipaySdkCache.has(cacheKey)) return alipaySdkCache.get(cacheKey)
+  const gateway = is_sandbox
+    ? 'https://openapi.alipaydev.com/gateway.do'
+    : 'https://openapi.alipay.com/gateway.do'
+  const notify_url = `https://${site_host || 'api.kuashou.com'}/${appName}/alipay/notify`
+  const sdk = new AlipaySdk({
+    appId: app_id,
+    signType: 'RSA2',
+    gateway,
+    alipayPublicKey: alipay_public_key,
+    privateKey: fs.readFileSync(
+      path.resolve(
+        __dirname,
+        `${process.cwd()}/app/${appName}/plugins/alipay/private-key.pem`
+      ),
+      'ascii'
+    ),
+    notify_url,
+  })
+  alipaySdkCache.set(cacheKey, sdk)
+  return sdk
+}
+
 exports.h5_pay = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
 
@@ -95,27 +122,12 @@ exports.mp_pay = async (ctx) => {
     buyer_id = '2088722007804916',
   } = ctx.request.body
 
-  const gateway = is_sandbox
-    ? `https://openapi.alipaydev.com/gateway.do`
-    : 'https://openapi.alipay.com/gateway.do'
-
-  const notify_url = `https://${
-    site_host || 'api.kuashou.com'
-  }/${appName}/alipay/notify`
-
-  const alipaySdk = new AlipaySdk({
-    appId: app_id,
-    signType: 'RSA2', // 签名算法,默认 RSA2
-    gateway, // 支付宝网关地址 ，沙箱环境下使用时需要修改
-    alipayPublicKey: alipay_public_key,
-    privateKey: fs.readFileSync(
-      path.resolve(
-        __dirname,
-        `${process.cwd()}/app/${appName}/plugins/alipay/private-key.pem`
-      ),
-      'ascii'
-    ),
-    notify_url,
+  const alipaySdk = getAlipaySdk({
+    app_id,
+    alipay_public_key,
+    is_sandbox,
+    appName,
+    site_host,
   })
 
   const out_trade_no = _out_trade_no

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

@@ -160,11 +160,10 @@ exports.login = async (ctx) => {
       app,
       config,
     })
-    const include = includeDefault.filter((i) => {
-      return loginData.excludeInclude.every((m) => {
-        return app.model[m] !== i.model
-      })
-    })
+    const excludeModels = new Set(
+      (loginData.excludeInclude || []).map((m) => app.model[m])
+    )
+    const include = includeDefault.filter((i) => !excludeModels.has(i.model))
 
     const attributes = {
       exclude: Array.from(

package/core/file/services/weixin.js

@@ -51,12 +51,15 @@ module.exports = class Singleton {
   }
 
   async getTicket() {
+    const { appid } = this.config
+    const ticketKey = `ticket_${appid}`
+    if (cache.has(ticketKey)) return cache.get(ticketKey)
     const access_token = await this.getAccessToken()
     const url = util.format(getTicketUrl, access_token)
     const result = await axios.get(url).then((res) => res.data)
     if (result.errcode) throw new Error(result.errmsg)
 
-    cache.set('ticket', result.ticket)
+    cache.set(ticketKey, result.ticket)
     return result.ticket
   }
 

package/package.json

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