q-koa 8.8.1 → 8.8.4

package/core/app.js

@@ -426,6 +426,11 @@ class APP {
       ) {
         this.app[appName].appConfig.router(router)(this.app[appName])
       }
+
+      if (this.config.defaultRouter) {
+        this.config.defaultRouter(router)(this.app[appName])
+      }
+
       this.initRouter(router)
       this.app.use(router.routes()).use(router.allowedMethods())
     }

package/core/config.js

@@ -1,3 +1,4 @@
+const axios = require('axios')
 const { Sequelize } = require('sequelize')
 const db = new Map()
 module.exports = {
@@ -130,4 +131,29 @@ module.exports = {
     excludes: ['admin'],
   },
   cacheModel: [],
+  defaultRouter: (router) => (app) => {
+    router.get('/weixin/h5_login', app.controller.weixin.h5_login)
+    router.get(
+      '/weixin/h5_login_callback',
+      app.controller.weixin.h5_login_callback
+    )
+    router.get(
+      '/weixin/h5_login_info_callback',
+      app.controller.weixin.h5_login_info_callback
+    )
+    router.get('/common/getAppConfig', app.controller.common.getAppConfig)
+    router.get('/weixin/messagePush', app.controller.weixin.messagePush)
+    router.get('/common/createQr', app.controller.common.createQr)
+    router.get('/lanhu/:str', async (ctx) => {
+      const { str } = ctx.params
+      const url = `https://lanhu.oss-cn-beijing.aliyuncs.com/${str}`
+      const imgData = await axios
+        .get(url, {
+          responseType: 'arraybuffer',
+        })
+        .then((res) => res.data)
+      ctx.set('content-type', 'image')
+      ctx.body = imgData
+    })
+  },
 }

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

@@ -181,9 +181,10 @@ exports.email = async (ctx) => {
 exports.createQr = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
 
-  const { url } = ctx.request.query
+  const { url, size = 10 } = ctx.request.query
+  if (!url) return ctx.ERROR('?url')
   const img = qr.image(url, {
-    size: 10,
+    size: Number(size),
   })
   ctx.type = 'image/png'
   ctx.body = img
@@ -417,6 +418,24 @@ exports.express = async (ctx) => {
     .slice(express_mobile.length - 4, express_mobile.length)
     .join('')
 
+  let history = null
+  if (app.model.express_record) {
+    history = await app.model.express_record.findOne({
+      where: {
+        express_number,
+      },
+    })
+    if (history) {
+      const diffNoLong = moment().diff(moment(history.updated_at), 'hours') < 1
+      const isTooLong =
+        moment().diff(moment(history.result.updateTime), 'days') > 30
+
+      if (diffNoLong || isTooLong) {
+        return ctx.SUCCESS(history.result)
+      }
+    }
+  }
+
   try {
     const express = new Express({
       app_code,
@@ -427,6 +446,21 @@ exports.express = async (ctx) => {
         ? `${express_number}:${lastFour}`
         : express_number,
     })
+
+    if (app.model.express_record) {
+      if (!history) {
+        app.model.express_record.upsert({
+          express_number,
+          result,
+        })
+      } else {
+        app.model.express_record.upsert({
+          id: history.id,
+          result,
+        })
+      }
+    }
+
     ctx.SUCCESS(result)
   } catch (e) {
     return ctx.SUCCESS(null)
@@ -468,7 +502,6 @@ exports.urlToOss = async (ctx) => {
     .then((res) => res.data)
 
   const type = getImageType(buffer)
-  console.log('type', type)
   const fileName = `${
     String(new Date().getTime()).split('').reverse().join('') + Math.random()
   }${type}`
@@ -486,3 +519,12 @@ exports.urlToOss = async (ctx) => {
     throw new Error('上传失败')
   }
 }
+
+exports.getAppConfig = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const appConfig = getConfig(app)
+  if (!ctx.request.query.config) throw new Error('?config')
+  const result = await appConfig.getObject(ctx.request.query.config)
+
+  ctx.SUCCESS(result)
+}

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

@@ -14,6 +14,12 @@ const fxp = require('fast-xml-parser')
 const crypto = require('crypto')
 const OSS = require('ali-oss')
 
+const check = ({ timestamp, nonce, signature, token }) => {
+  const tmp = [token, timestamp, nonce].sort().join('')
+  const currSign = crypto.createHash('sha1').update(tmp).digest('hex')
+  return currSign === signature
+}
+
 exports.getConfig = async (ctx) => {
   const { app } = getAppByCtx(ctx)
 
@@ -1216,3 +1222,47 @@ exports.init_mp_openid = async (ctx) => {
 
   ctx.SUCCESS(result.length)
 }
+
+exports.messagePush = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+
+  const { echostr, nonce, signature, timestamp } = ctx.request.query
+
+  const token = appName
+
+  const checkResult = check({
+    nonce,
+    signature,
+    timestamp,
+    token,
+  })
+
+  if (!checkResult) {
+    return (ctx.body = 'It is not from weixin')
+  }
+
+  if (ctx.request.method === 'GET') {
+    ctx.body = echostr
+  } else {
+    const result = ctx.request.body
+    if (!lodash.isEmpty(result)) {
+      const event = result.Event
+      if (event) {
+        if (app.service.weixin[event]) {
+          await app.service.weixin[event]({
+            app,
+            result,
+          })
+        }
+      } else {
+        await app.service.weixin.handleUserMessage({
+          app,
+          result,
+        })
+      }
+    }
+
+    ctx.status = 200
+    ctx.body = 'success'
+  }
+}

package/package.json

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