q-koa 10.7.1 → 10.7.4

package/core/file/plugins/log/model.js

@@ -32,13 +32,15 @@ exports.header = {
     }
   },
   get: function () {
+    const value = this.getDataValue('header')
     try {
-      const value = this.getDataValue('header')
       const dataValue =
         typeof value === 'object' ? value || {} : JSON.parse(value)
       return dataValue
     } catch {
-      return {}
+      return {
+        text: value,
+      }
     }
   },
   extra: {
@@ -56,17 +58,21 @@ exports.body = {
       const dataValue = typeof value === 'object' ? value : JSON.parse(value)
       this.setDataValue('body', dataValue)
     } catch {
-      throw new Error('body值不合法')
+      this.setDataValue('body', {
+        text: value,
+      })
     }
   },
   get: function () {
+    const value = this.getDataValue('body')
     try {
-      const value = this.getDataValue('body')
       const dataValue =
         typeof value === 'object' ? value || {} : JSON.parse(value)
       return dataValue
     } catch {
-      return {}
+      return {
+        text: value,
+      }
     }
   },
   extra: {

package/core/file/plugins/setting/model.js

@@ -29,7 +29,8 @@ exports.type = {
     'rich-text',
     'date',
     'datetime',
-    'list'
+    'list',
+    'json'
   ),
   comment: 'type类型',
   allowNull: true,
@@ -50,6 +51,15 @@ exports.value = {
     switch (type) {
       case 'switch':
         return Boolean(Number(this.getDataValue('value')))
+      case 'json':
+        try {
+          const value = JSON.parse(this.getDataValue('value'))
+          return value
+        } catch (e) {
+          return {
+            text: this.getDataValue('value'),
+          }
+        }
       case 'list':
         try {
           const value = JSON.parse(this.getDataValue('value'))

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

@@ -47,23 +47,6 @@ exports.refund = async ({
     }/${appName}/toutiao/refund_notify`,
   }
 
-  const signResult = (params, salt) => {
-    var skip_arr = ['thirdparty_id', 'app_id', 'sign']
-    var paramArray = new Array()
-    for (var k in params) {
-      if (skip_arr.indexOf(k) != -1) {
-        continue
-      }
-      if (params[k] == '') {
-        continue
-      }
-      paramArray.push(params[k])
-    }
-    paramArray.push(salt)
-    paramArray.sort()
-    var signStr = paramArray.join('&')
-    return md5(signStr)
-  }
   const res = await axios
     .post(url, {
       ...data,

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

@@ -862,6 +862,85 @@ exports.pc_pay = async (ctx) => {
   return ctx.SUCCESS(result)
 }
 
+exports.app_pay = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const {
+    name,
+    order_id,
+    price,
+    return_url,
+    prefix = '',
+    type,
+    out_trade_no: _out_trade_no,
+    is_admin = false,
+    config = 'weixin_mp',
+    pay_config = 'weixin_pay',
+  } = ctx.request.body
+
+  if (price === 0) throw new Error('价格不能为0')
+
+  if (
+    !ctx.request[`${appName}-user`] ||
+    !ctx.request[`${appName}-user`].open_user
+  ) {
+    throw new Error('请先微信登录')
+  }
+  const appConfig = getConfig(app)
+
+  const { mchId, key, partner_key, appId: appid } = await appConfig.getObject(
+    pay_config
+  )
+
+  if (!appid) throw new Error(`appId不能存在`)
+
+  const { is_dev, site_host } = await appConfig.getObject('base')
+
+  const wxpay = WXPay({
+    appid,
+    mch_id: mchId,
+    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
+  })
+
+  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}`
+
+  const notify_url = `https://${
+    site_host || 'api.kuashou.com'
+  }/${appName}/weixin/notify`
+
+  const result = await wxpay.getBrandWCPayRequestParamsSync({
+    trade_type: 'APP',
+    body: name,
+    detail: '公众号支付测试',
+    out_trade_no,
+    total_fee: is_admin || is_dev ? 1 : Math.round(price * 100),
+    spbill_create_ip: '192.168.2.210',
+    notify_url,
+  })
+
+  const {
+    nonceStr: nonce_str,
+    package: prepay_id,
+    paySign: sign,
+    timeStamp: timestamp,
+  } = result
+
+  const returnObj = {
+    appid,
+    partnerid: mchId,
+    nonce_str,
+    prepay_id,
+    sign,
+    return_url,
+    timestamp,
+  }
+
+  return ctx.SUCCESS(returnObj)
+}
+
 exports.mp_pay = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const {

package/core/file/utils/index.js

@@ -18,7 +18,15 @@ exports.getName = (config) => (type) => {
 
 exports.getList = (config) => (type) => {
   const obj = config.find((i) => i.code === type)
-  if (!obj) throw new Error(`找不到${type}相关设置`)
+  if (!obj) {
+    if (process.env.NODE_ENV === 'production') {
+      throw new Error(`找不到${type}相关设置`)
+    } else {
+      console.error(`找不到${type}相关设置`)
+    }
+    return []
+  }
+
   const list = config.filter((i) => i.parent_id === obj.id)
   return list
 }
@@ -72,7 +80,14 @@ exports.getObject = (config, app) => async (type) => {
       }
     }
   }
-  if (!flag) throw new Error(`找不到${type}相关设置`)
+  if (!flag) {
+    if (process.env.NODE_ENV === 'production') {
+      throw new Error(`找不到${type}相关设置`)
+    } else {
+      console.error(`找不到${type}相关设置`)
+    }
+    return temObj
+  }
   return temObj
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "10.7.1",
+  "version": "10.7.4",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -52,7 +52,7 @@
     "sequelize": "^5.21.3",
     "static-koa-router": "^1.0.3",
     "wechat-oauth": "^1.5.0",
-    "weixin-pay-fork": "^1.0.4",
+    "weixin-pay-fork": "^1.0.5",
     "node-uuid": "^1.4.8",
     "sha1": "^1.1.1",
     "redis": "^4.0.3",