q-koa 13.1.0 → 13.1.2

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

@@ -186,6 +186,16 @@ exports.showTables = async (ctx) => {
 
     if (!target) throw new Error(`检查是否有${_model}/config.js`)
     const model = target.model ? target.model : _model
+
+    function getValueByModelName(target, key, defaultValue, model, _model) {
+      return lodash.get(
+        target,
+        key,
+        model !== _model
+          ? lodash.get(app.config[model], key, defaultValue)
+          : defaultValue
+      )
+    }
     return {
       modelName: _model,
       model,
@@ -200,7 +210,7 @@ exports.showTables = async (ctx) => {
       // 默认排序
       defaultOrder: lodash.get(target, 'defaultOrder', []),
       // 下拉筛选
-      select: lodash.get(target, 'select', []),
+      select: getValueByModelName(target, 'select', [], model, _model),
       // 是否可以选择批量删除
       multiple: lodash.get(target, 'multiple', true),
       // 是否后台拆分sql
@@ -221,17 +231,9 @@ exports.showTables = async (ctx) => {
               lodash.get(target, 'order', [])
             ),
       // reference admin components
-      reference: lodash.get(
-        target,
-        'reference',
-        model !== _model ? lodash.get(app.config[model], 'reference', []) : []
-      ),
+      reference: getValueByModelName(target, 'reference', [], model, _model),
       // reference admin components
-      personal: lodash.get(
-        target,
-        'personal',
-        model !== _model ? lodash.get(app.config[model], 'personal', []) : []
-      ),
+      personal: getValueByModelName(target, 'personal', [], model, _model),
       // sortOrder router
       sortOrder: lodash.get(target, 'sortOrder', 1),
 
@@ -241,7 +243,7 @@ exports.showTables = async (ctx) => {
       ),
 
       // include for admin
-      include: lodash.get(target, 'include', ''),
+      include: getValueByModelName(target, 'include', '', model, _model),
       // only include exsit， and for custom like user_distribute has two user model
       relate: lodash.get(target, 'relate', ''),
       // can be mock boolean

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

@@ -1,4 +1,10 @@
-const { lodash, getAppByCtx, getConfig, moment } = require('q-koa')
+const {
+  lodash,
+  getAppByCtx,
+  getConfig,
+  moment,
+  ServiceError,
+} = require('q-koa')
 
 const axios = require('axios')
 const OAuth = require('wechat-oauth')
@@ -1269,10 +1275,10 @@ exports.short_link = async (ctx) => {
   ctx.SUCCESS(result)
 }
 
-exports.url_scheme = async (ctx) => {
+exports.url_scheme = async (ctx, _data) => {
   const { app } = getAppByCtx(ctx)
 
-  const { page, scene, config = 'weixin_mp' } = ctx.request.body
+  const { page, scene, config = 'weixin_mp' } = _data || ctx.request.body
   const appConfig = getConfig(app)
   const { app_id, app_secrect } = await appConfig.getObject(config)
   const weixinMp = new WeixinMp({
@@ -1285,9 +1291,32 @@ exports.url_scheme = async (ctx) => {
     scene,
   })
   ctx.SUCCESS(result)
+  return result
 }
 
-exports.qr_code = async (ctx) => {
+exports.query_url_link = async (ctx, _data) => {
+  const { app } = getAppByCtx(ctx)
+
+  const { url_link, config = 'weixin_mp' } = _data || ctx.request.body
+  if (!url_link) throw new ServiceError(`url_link?`)
+  const appConfig = getConfig(app)
+  const { app_id, app_secrect } = await appConfig.getObject(config)
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+  })
+  weixinMp.init()
+  const result = await weixinMp.queryUrlLink(url_link)
+  const payLoad = {
+    ...result,
+    is_out: result.expire_time * 1000 - moment().valueOf() < 0,
+  }
+
+  ctx.SUCCESS(payLoad)
+  return payLoad
+}
+
+exports.qr_code = async (ctx, _data) => {
   const { app } = getAppByCtx(ctx)
 
   const {
@@ -1297,7 +1326,7 @@ exports.qr_code = async (ctx) => {
     is_oss = false,
     config = 'weixin_mp',
     width,
-  } = ctx.request.body
+  } = _data || ctx.request.body
 
   if (!app.service.weixin) throw new Error(`weixin可能没有service.js`)
   const result = await app.service.weixin.qr_code({
@@ -1309,8 +1338,8 @@ exports.qr_code = async (ctx) => {
     config,
     width,
   })
-
-  return ctx.SUCCESS(result)
+  ctx.SUCCESS(result)
+  return result
 }
 
 exports.sendMessage = async (ctx) => {

package/core/file/services/weixinMP.js

@@ -12,6 +12,8 @@ const createUrlschemeUrl =
   'https://api.weixin.qq.com/wxa/generatescheme?access_token=%s'
 const createUrlLinkUrl =
   'https://api.weixin.qq.com/wxa/generate_urllink?access_token=%s'
+const queryUrlLinkUrl =
+  'https://api.weixin.qq.com/wxa/query_urllink?access_token=%s'
 const createShortLinkUrl =
   'https://api.weixin.qq.com/wxa/genwxashortlink?access_token=%s'
 const sendMessageUrl =
@@ -374,6 +376,26 @@ module.exports = class Singleton {
     return result.url_link
   }
 
+  async queryUrlLink(url_link) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(queryUrlLinkUrl, access_token)
+
+    const result = await axios
+      .post(url, {
+        url_link,
+      })
+      .then((res) => res.data)
+
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.queryUrlLink(url_link)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result.url_link_info
+  }
+
   async createShortLink(options) {
     const { page, scene, title, ...rest } = options
     const access_token = await this.getAccessToken()

package/package.json

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