q-koa 12.5.6 → 12.5.8

package/core/config.js

@@ -107,7 +107,7 @@ module.exports = {
     jwt: {
       secret: 'token',
       tokenKey: 'token',
-      expiresIn: '60480000',
+      expiresIn: '172800000',
       whiteList: [], // 应用覆盖
       _whiteList: [
         '/',

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

@@ -1,5 +1,4 @@
-const { Sequelize, Random } = require('q-koa');
-
+const { Sequelize, Random } = require('q-koa')
 
 exports.name = {
   type: Sequelize.STRING,
@@ -31,7 +30,7 @@ exports.desc = {
   defaultValue: '',
   sortOrder: 3,
   mock: () => Random.csentence(),
-  extra: {"type":"markdown"},
+  extra: { type: 'markdown' },
 }
 
 exports.role_id = {
@@ -54,7 +53,6 @@ exports.sortOrder = {
   is_mock: false,
   defaultValue: 0,
   sortOrder: 5,
-  
 }
 
 exports.is_on = {
@@ -65,5 +63,36 @@ exports.is_on = {
   defaultValue: true,
   sortOrder: 6,
   mock: () => Random.boolean(),
-  extra: {"controlInline":true},
+  extra: { controlInline: true },
+}
+
+exports.extra = {
+  type: Sequelize.JSON,
+  comment: '额外数据',
+  allowNull: true,
+  is_mock: false,
+  defaultValue: {},
+  sortOrder: 7,
+  set: function (value) {
+    try {
+      const dataValue = typeof value === 'object' ? value : JSON.parse(value)
+      this.setDataValue('extra', dataValue)
+    } catch {
+      throw new Error('extra值不合法')
+    }
+  },
+  get: function () {
+    const value = this.getDataValue('extra')
+    try {
+      const dataValue =
+        typeof value === 'object' ? value || {} : JSON.parse(value)
+
+      return dataValue
+    } catch {
+      return {
+        text: value,
+      }
+    }
+  },
+  extra: { type: 'json-editor' },
 }

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

@@ -4,7 +4,7 @@ const fsPromise = require('fs/promises')
 const { VM } = require('vm2')
 const axios = require('axios')
 const cheerio = require('cheerio')
-const { lodash, getAppByCtx, getConfig, Sequelize } = require('q-koa')
+const { lodash, getAppByCtx, getConfig, Sequelize, moment } = require('q-koa')
 const LRU = require('lru-cache')
 const cache = new LRU({
   max: 10,
@@ -687,6 +687,11 @@ exports.mockPay = async (ctx) => {
     order: model,
     order_price,
     ...rest,
+    ...(rest.transactionid
+      ? {}
+      : {
+          transactionid: moment().valueOf() + '',
+        }),
   })
   ctx.SUCCESS('ok')
 }

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

@@ -1864,3 +1864,46 @@ exports.getVisitTrend = async (ctx) => {
   await app.model.weixin_visit.create(result.list[0])
   ctx.SUCCESS(result)
 }
+
+exports.getCommentInfo = async (ctx, _data) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const user_id = getUserByCtx(ctx)
+  const appConfig = getConfig(app)
+  const { is_dev } = await appConfig.getObject('base')
+  const { comment_id } = _data || ctx.request.body
+
+  if (!comment_id) throw new ServiceError('comment_id?')
+
+  const { app_id, app_secrect } = await appConfig.getObject('weixin_mp')
+
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+  })
+  weixinMp.init()
+
+  const { info } = await weixinMp.getCommentInfo(comment_id)
+
+  const {
+    content: {
+      orderInfo: { busiOrderId },
+    },
+  } = info
+
+  let prefix = ''
+  let order_id = busiOrderId.split('_')[1]
+  if (order_id.includes('-')) {
+    const arr = order_id.split('-')
+    order_id = Number(arr[1])
+    ;[prefix] = arr
+  } else {
+    order_id = Number(order_id)
+  }
+
+  const result = {
+    prefix,
+    order_id,
+  }
+  ctx.SUCCESS(result)
+  return result
+}

package/core/file/services/weixinMP.js

@@ -68,6 +68,9 @@ const getDeliveryListUrl =
 const getUserPortraitUrl =
   'https://api.weixin.qq.com/datacube/getweanalysisappiduserportrait?access_token=%s'
 
+const getCommentInfoUrl =
+  'https://api.weixin.qq.com/wxaapi/comment/commentinfo/get?commentId=%s&access_token=%s'
+
 const fsPromise = require('fs/promises')
 const LRU = require('lru-cache')
 const request = require('request')
@@ -813,6 +816,24 @@ module.exports = class Singleton {
     return result
   }
 
+  async getCommentInfo(commentId) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(getCommentInfoUrl, commentId, access_token)
+
+    const result = await axios.get(url).then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.getCommentInfo(commentId)
+      }
+      if (result.errcode === 61503) {
+        return null
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result
+  }
+
   getConfig() {
     return this.config
   }

package/package.json

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