q-koa 10.1.4 → 10.2.1

package/core/app.js

@@ -266,6 +266,7 @@ class APP {
 
     starter.on('loadAll', async () => {
       const appName = this.config.includes[0]
+      if (!this.app[appName]) throw new Error(`没有生成应用${this.config.includes[0]}，请检查config includes`)
       this.server = this.app.listen(this.port, () => {
         console.log(
           `${moment().format(
@@ -996,7 +997,7 @@ class APP {
 
             if (!Array.isArray(strInclude))
               throw new Error(`可能include不是一个数组`)
-              
+
             myInclude =
               app[appName] &&
               app[appName].include &&

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

@@ -1,4 +1,4 @@
-const { getAppByCtx, getConfig, lodash } = require('q-koa')
+const { getAppByCtx, getAppConfig, getConfig, lodash } = require('q-koa')
 const { Pay } = require('@sigodenjs/wechatpay')
 const path = require('path')
 const fsPromise = require('fs/promises')
@@ -174,9 +174,10 @@ exports.cash = async ({
   if (!user) throw new Error('找不到该用户')
   if (!user.mp_user.openid) throw new Error('找不到该用户openid')
 
-  const { mchId, key, appId, partner_key } = await appConfig.getObject(
-    user.mp_user.appid || pay_config
-  )
+  const { mchId, key, appId, partner_key } = await getAppConfig({
+    app,
+    app_id: user.mp_user.appid,
+  })
 
   const { is_dev } = await appConfig.getObject('base')
 

package/core/file/utils/index.js

@@ -160,12 +160,12 @@ exports.getImageType = (fileBuffer) => {
   return ''
 }
 
-exports.getAppConfig = async ({ app, config, key }) => {
-  if (!(app && (config || key))) return null
+exports.getAppConfig = async ({ app, config, key, app_id }) => {
+  if (!(app && (config || key || app_id))) return null
   const application =
     app.cache.get('application') || (await app.model.application.findAll())
 
-  const target = application.find(findConfig(config || key))
+  const target = application.find(findConfig(config || key || app_id))
 
   return target || null
 }

package/core/validator.js

@@ -1,15 +1,22 @@
-const { default: Schema } = require('async-validator');
+const { default: Schema } = require('async-validator')
 
 module.exports = class Validator {
   constructor(descriptor) {
-    this.validator = new Schema(descriptor);
+    this.validator = new Schema(descriptor)
   }
 
   async validate(data) {
     try {
-      return await this.validator.validate(data);
+      return await this.validator.validate(data)
     } catch (e) {
-      throw new Error(e.errors.map(item => `${item.field}:${item.message}`));
+      throw new Error(
+        e.errors.map(
+          (item) =>
+            `${process.env.NODE_ENV === 'production' ? '' : item.field + ':'}${
+              item.message
+            }`
+        )
+      )
     }
   }
-};
+}

package/package.json

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