q-koa 13.3.3 → 13.3.5

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

@@ -23,6 +23,20 @@ exports.clear = async (ctx) => {
   const key =
     ctx.request.method === 'POST' ? ctx.request.body.key : ctx.query.key
 
+  if (!key) return ctx.ERROR('缺key')
+  app.cache.set(key, '')
+  app.service.cache.init({ app, appName, model: key })
+  const url = `${app.appConfig.ip}:${app.appConfig.port}`
+  app.service.log.push({ app, message: `${url}缓存${key}清除` })
+
+  ctx.SUCCESS('ok')
+}
+
+exports.init = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const key =
+    ctx.request.method === 'POST' ? ctx.request.body.key : ctx.query.key
+
   if (!key) return ctx.ERROR('缺key')
   app.cache.set(key, '')
 

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

@@ -1,4 +1,10 @@
+const axios = require('axios')
+
 exports.init = async ({ app, appName, model = '' }) => {
+  const hasCache = app.cache.get(model) || ''
+  if (!hasCache) {
+    console.log('hear clear cache', model)
+  }
   const cacheModel = app.appConfig.cacheModel.filter((m) =>
     model ? m === model : true
   )
@@ -15,4 +21,28 @@ exports.init = async ({ app, appName, model = '' }) => {
       return promiseFn(model)
     })
   )
+
+  if (model && app.appConfig.appName && app.appConfig.productionHost) {
+    const ipHost = (
+      Array.isArray(app.appConfig.productionHost)
+        ? app.appConfig.productionHost
+        : [app.appConfig.productionHost]
+    )
+      .filter((url) => {
+        return url.match(
+          /^(http:\/\/|https:\/\/)?(\d{1,3}\.){3}\d{1,3}:\d{1,5}/
+        )
+      })
+      .filter((host) =>
+        app.appConfig.ip ? !host.includes(app.appConfig.ip) : false
+      )
+
+    Promise.all(
+      ipHost.map((host) => {
+        return axios
+          .get(`${host}/${app.appConfig.appName}/cache/init?key=${model}`)
+          .then((res) => res.data)
+      })
+    )
+  }
 }

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

@@ -1012,7 +1012,6 @@ exports.mp_pay = async (ctx) => {
     pay_config = 'weixin_pay',
     profit_sharing = 'N',
   } = ctx.request.body
-
   if (price === 0) throw new Error('价格不能为0')
 
   if (type === 'H5-WEIXIN') {
@@ -1030,8 +1029,14 @@ exports.mp_pay = async (ctx) => {
   }
   const appConfig = getConfig(app)
 
-  const { mchId, key, partner_key } = await appConfig.getObject(pay_config)
+  const {
+    mchId,
+    key,
+    pay_key: _pay_key,
+    partner_key,
+  } = await appConfig.getObject(pay_config)
 
+  const pay_key = _pay_key || key || appName
   const { is_dev, site_host } = await appConfig.getObject('base')
   // 公众号支付用 服务号 appid，其他用小程序 appid
   const app_id =
@@ -1042,7 +1047,7 @@ exports.mp_pay = async (ctx) => {
   const wxpay = WXPay({
     appid: app_id,
     mch_id: mchId,
-    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
+    partner_key, // 微信商户平台API密钥
   })
 
   const userDetail =
@@ -1053,13 +1058,12 @@ exports.mp_pay = async (ctx) => {
   const out_trade_no = _out_trade_no
     ? _out_trade_no
     : prefix
-    ? `${key.length > 10 ? appName : key}_${prefix}-${order_id}_${type}`
-    : `${key.length > 10 ? appName : key}_${order_id}_${type}`
+    ? `${pay_key}_${prefix}-${order_id}_${type}`
+    : `${pay_key}_${order_id}_${type}`
 
   const notify_url = `https://${
     site_host || 'api.kuashou.com'
   }/${appName}/weixin/notify`
-
   const prePayResult = await wxpay.getBrandWCPayRequestParamsSync({
     openid: userDetail.openid,
     body: name,
@@ -1113,6 +1117,12 @@ exports.mp_pay = async (ctx) => {
       return ctx.SUCCESS('ok')
     }
     if (payResult.return_msg) {
+      consoleconsole.log({
+        mchId,
+        key,
+        pay_key: _pay_key,
+        partner_key,
+      })
       throw new Error(
         payResult.return_msg === '签名错误，请检查后再试'
           ? payResult.return_msg + '（商户号/APIv2/关联）'

package/package.json

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