q-koa 10.6.9 → 10.7.3

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/controller.js

@@ -5,8 +5,7 @@ const axios = require('axios')
 const qr = require('qr-image')
 const path = require('path')
 const TOUTIAO = getService('toutiao')
-const md5 = require('md5')
-const utils = require('../../utils')
+const { signResult, hashFn } = require('../../utils')
 
 exports.initData = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
@@ -36,7 +35,7 @@ exports.qr_code = async (ctx) => {
   const result = await toutiaoService.createQR({
     path: encodeURIComponent(page),
     appname: type,
-    filename: utils.hashFn(item.key + page + type),
+    filename: hashFn(item.key + page + type),
   })
   console.log(`qr,${item.key},${page},${type}`)
   const qr_image = `https://${site_host || 'api.kuashou.com'}/upload/${result}`
@@ -195,24 +194,6 @@ exports.login = async (ctx) => {
   })
 }
 
-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)
-}
-
 exports.pay = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
@@ -384,3 +365,20 @@ exports.checkPay = async (ctx) => {
     order_id: res.order_id,
   })
 }
+
+exports.refund = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const appConfig = getConfig(app)
+  const { id, prefix = '', price, out_trade_no, type } = ctx.request.body
+
+  if (!app.service.toutiao) throw new Error(`toutiao可能没有service.js`)
+  const res = await app.service.toutiao.refund({
+    ctx,
+    id,
+    prefix,
+    price,
+    out_trade_no,
+    type,
+  })
+  ctx.SUCCESS(res)
+}

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

@@ -0,0 +1,61 @@
+const { getAppByCtx, getUserByCtx, getConfig } = require('q-koa')
+const axios = require('axios')
+const { signResult } = require('../../utils')
+
+exports.refund = async ({
+  ctx,
+  id,
+  prefix = '',
+  total_fee,
+  refund_fee,
+  price,
+  out_trade_no: _out_trade_no,
+  type = 'TOUTIAO-DOUYIN',
+  ...rest
+}) => {
+  if (!ctx) throw new Error('?ctx')
+  const { app, appName } = getAppByCtx(ctx)
+  const appConfig = getConfig(app)
+  const { app_id, salt, key, is_sandbox } = await appConfig.getObject('toutiao')
+  const { site_host } = await appConfig.getObject('base')
+
+  const orderModel = prefix ? `${prefix}_order` : 'order'
+  const out_trade_no = _out_trade_no
+    ? _out_trade_no
+    : prefix
+    ? `${key}_${prefix}-${id}_${type}`
+    : `${key}_${id}_${type}`
+  const orderDetail = await app.model[orderModel].findOne({
+    where: {
+      id,
+    },
+  })
+  if (!orderDetail) throw new Error('不存在该订单')
+
+  const url = `https://${
+    is_sandbox ? 'open-sandbox.douyin.com' : 'developer.toutiao.com'
+  }/api/apps/ecpay/v1/create_refund`
+
+  const data = {
+    app_id,
+    out_order_no: out_trade_no,
+    out_refund_no: `${prefix}-${id}_${type}`,
+    reason: rest.remark || '退款',
+    refund_amount: Math.round((refund_fee || price) * 100),
+    notify_url: `https://${
+      site_host || 'api.kuashou.com'
+    }/${appName}/toutiao/refund_notify`,
+  }
+
+  const res = await axios
+    .post(url, {
+      ...data,
+      sign: signResult(data, salt),
+    })
+    .then((res) => res.data)
+  if (res.err_no) {
+    throw new Error(res.err_tips)
+  }
+
+  return res
+}

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

@@ -51,29 +51,21 @@ exports.refund = async ({
   })
   if (!orderDetail) throw new Error('不存在该订单')
   try {
-    const { result_code, err_code_des } = await payObj.refund({
+    const data = {
       ...rest,
       out_trade_no,
-      out_refund_no: id + '_' + type,
+      out_refund_no: `${prefix}-${id}_${type}`,
       total_fee: Math.round((total_fee || refund_fee || price) * 100),
       refund_fee: Math.round((refund_fee || price) * 100),
       notify_url: `https://${
         site_host || 'api.kuashou.com'
       }/${appName}/weixin/refund_notify/${pay_config}`,
-    })
+    }
+    const { result_code, err_code_des } = await payObj.refund(data)
     if (result_code === 'SUCCESS') {
       return true
     } else {
-      console.error({
-        ...rest,
-        out_trade_no,
-        out_refund_no: id + '_' + type,
-        total_fee: Math.round((total_fee || refund_fee || price) * 100),
-        refund_fee: Math.round((refund_fee || price) * 100),
-        notify_url: `https://${
-          site_host || 'api.kuashou.com'
-        }/${appName}/weixin/refund_notify/${pay_config}`,
-      })
+      console.error(data)
       throw new Error(err_code_des)
     }
   } catch (e) {

package/core/file/utils/index.js

@@ -1,4 +1,5 @@
 const { lodash } = require('q-koa')
+const md5 = require('md5')
 
 const findConfig = (type) => (item) =>
   item.key === type ||
@@ -17,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
 }
@@ -71,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
 }
 
@@ -169,3 +185,21 @@ exports.getAppConfig = async ({ app, config, key, app_id }) => {
 
   return target || null
 }
+
+exports.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)
+}

package/package.json

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