q-koa 8.6.1 → 8.6.2

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

@@ -743,12 +743,14 @@ exports.h5_pay = async (ctx) => {
   } = ctx.request.body
 
   const appConfig = getConfig(app)
-  const { appId, key, mchId } = await appConfig.getObject(pay_config)
+  const { appId, key, mchId, partner_key } = await appConfig.getObject(
+    pay_config
+  )
   const { is_dev, site_host } = await appConfig.getObject('base')
 
   const payObj = new WeixinPay({
     appId,
-    key,
+    key: key.length > 10 ? key : partner_key,
     mchId,
   })
   const result = await payObj.run({
@@ -803,7 +805,7 @@ exports.mp_pay = async (ctx) => {
   }
   const appConfig = getConfig(app)
 
-  const { mchId, key } = await appConfig.getObject(pay_config)
+  const { mchId, key, partner_key } = await appConfig.getObject(pay_config)
   const { is_dev, site_host } = await appConfig.getObject('base')
   // 公众号支付用 服务号 appid，其他用小程序 appid
   const app_id =
@@ -814,7 +816,7 @@ exports.mp_pay = async (ctx) => {
   const wxpay = WXPay({
     appid: app_id,
     mch_id: mchId,
-    partner_key: key, // 微信商户平台API密钥
+    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
   })
 
   const pay = (options) =>
@@ -1152,12 +1154,12 @@ exports.checkPay = async (ctx) => {
 
   const appConfig = getConfig(app)
   const app_id = (await appConfig.getObject(config)).app_id
-  const { mchId, key } = await appConfig.getObject(pay_config)
+  const { mchId, key, partner_key } = await appConfig.getObject(pay_config)
 
   const wxpay = WXPay({
     appid: app_id,
     mch_id: mchId,
-    partner_key: key, // 微信商户平台API密钥
+    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
   })
 
   const checkOrder = (obj) => {

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

@@ -18,13 +18,15 @@ exports.refund = async ({
 }) => {
   const { app, appName } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
-  const { mchId, key, appId } = await appConfig.getObject(pay_config)
+  const { mchId, key, appId, partner_key } = await appConfig.getObject(
+    pay_config
+  )
   const { site_host } = await appConfig.getObject('base')
 
   const payObj = new Pay({
     appId: appId,
     mchId: mchId,
-    key: key, // 微信商户平台API密钥,
+    key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥,
     pfx: await fsPromise.readFile(
       path.resolve(
         __dirname,
@@ -72,14 +74,16 @@ exports.cash = async ({
 }) => {
   const { app, appName } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
-  const { mchId, key, appId } = await appConfig.getObject(pay_config)
+  const { mchId, key, appId, partner_key } = await appConfig.getObject(
+    pay_config
+  )
 
   const { is_dev } = await appConfig.getObject('base')
 
   const payObj = new Pay({
     appId: appId,
     mchId: mchId,
-    key: key, // 微信商户平台API密钥,
+    key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥,
     pfx: await fsPromise.readFile(
       path.resolve(
         __dirname,

package/package.json

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