q-koa 9.8.1 → 9.9.9

package/core/app.js

@@ -21,7 +21,8 @@ const util = require('util')
 const jwt = require('jsonwebtoken')
 const verify = util.promisify(jwt.verify)
 const fsExtra = require('fs-extra')
-const { getObject } = require('./file/utils')
+const { getObject, getAppConfig } = require('./file/utils')
+
 const restc = require('./restc')
 const APP_DIR = 'app'
 const PLUGINS_DIR = 'plugins'
@@ -2001,4 +2002,6 @@ APP.getConfig = (app) => ({
   },
 })
 
+APP.getAppConfig = getAppConfig
+
 module.exports = APP

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

@@ -950,7 +950,7 @@ exports.mp_pay = async (ctx) => {
       throw new Error(
         payResult.return_msg === '签名错误，请检查后再试'
           ? payResult.return_msg + '（商户号/APIv2/关联）'
-          : payResult.return_msg
+          : payResult.err_code_des + '（商户号/APIv2/关联）'
       )
     }
     throw new Error(`支付失败，请重试`)

package/core/file/utils/index.js

@@ -1,5 +1,12 @@
 const { lodash } = require('q-koa')
 
+const findConfig = (type) => (item) =>
+  item.key === type ||
+  item.config === type ||
+  item.pay_config === type ||
+  (item.ToUserName && item.ToUserName === type) ||
+  (item.appId && item.appId === type)
+
 exports.getSetting = (config) => (type) =>
   config.find((i) => i.key === type).value
 
@@ -34,18 +41,12 @@ exports.getObject = (config, app) => async (type) => {
     flag = true
   }
 
-  const findConfig = (item) =>
-    item.key === type ||
-    item.config === type ||
-    item.pay_config === type ||
-    (item.ToUserName && item.ToUserName === type) ||
-    (item.appId && item.appId === type)
   if (app) {
     const applicationList = app.cache.get('application')
-    if (applicationList && applicationList.find(findConfig)) {
+    if (applicationList && applicationList.find(findConfig(type))) {
       flag = true
       return {
-        ...applicationList.find(findConfig),
+        ...applicationList.find(findConfig(type)),
         ...temObj,
       }
     }
@@ -58,7 +59,7 @@ exports.getObject = (config, app) => async (type) => {
           const formatData = JSON.parse(JSON.stringify(result))
           app.cache.set('application', formatData)
 
-          const target = formatData.find(findConfig)
+          const target = formatData.find(findConfig(type))
           if (target) {
             flag = true
             return {
@@ -159,12 +160,12 @@ exports.getImageType = (fileBuffer) => {
   return ''
 }
 
-exports.getAppConfig = async ({ app, config }) => {
-  if (!config || !app) return null
+exports.getAppConfig = async ({ app, config, key }) => {
+  if (!(app && (config || key))) return null
   const application =
     app.cache.get('application') || (await app.model.application.findAll())
 
-  const target = application.find((a) => a.config === config)
+  const target = application.find(findConfig(config || key))
 
-  return target
+  return target || null
 }

package/package.json

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