q-koa 8.7.2 → 8.8.2

package/core/app.js

@@ -146,6 +146,9 @@ class APP {
         return ctx.ERROR('error')
       }
       const appName = url.split('/')[1]
+      if (!appName || !(ctx.app[appName] && ctx.app[appName].appConfig)) {
+        return ctx.ERROR('error')
+      }
       const { secret, whiteList, _whiteList, tokenKey, expiresIn } =
         ctx.app[appName] && ctx.app[appName].appConfig
           ? ctx.app[appName].appConfig.jwt

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

@@ -406,19 +406,64 @@ exports.verify = async (ctx) => {
 exports.express = async (ctx) => {
   const { app } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
-  const { app_code } = await appConfig.getObject('express')
+  const { app_code, express_mobile } = await appConfig.getObject('express')
 
-  const express = new Express({
-    app_code,
-  })
+  const { express_number: _express_number } = ctx.request.body
 
-  const { id, express_number } = ctx.request.body
+  const express_number = _express_number.replace(/\t/, '').trim()
 
-  const result = await express.send({
-    no: express_number,
-  })
+  const lastFour = express_mobile
+    .split('')
+    .slice(express_mobile.length - 4, express_mobile.length)
+    .join('')
 
-  ctx.SUCCESS(result)
+  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,
+    })
+
+    const result = await express.send({
+      no: express_number.startsWith('SF')
+        ? `${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)
+  }
 }
 
 exports.urlToOss = async (ctx) => {

package/package.json

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