q-koa 9.5.0 → 9.5.3

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

@@ -404,13 +404,9 @@ exports.verify = async (ctx) => {
   ctx.SUCCESS(result)
 }
 
-exports.express = async (ctx) => {
-  const { app } = getAppByCtx(ctx)
+const expressFn = async ({ app, express_number: _express_number }) => {
   const appConfig = getConfig(app)
   const { app_code, express_mobile } = await appConfig.getObject('express')
-
-  const { express_number: _express_number } = ctx.request.body
-
   const express_number = _express_number.replace(/\t/, '').trim()
 
   const lastFour = express_mobile
@@ -431,7 +427,7 @@ exports.express = async (ctx) => {
         moment().diff(moment(history.result.updateTime), 'days') > 30
 
       if (diffNoLong || isTooLong) {
-        return ctx.SUCCESS(history.result)
+        return history.result
       }
     }
   }
@@ -461,9 +457,34 @@ exports.express = async (ctx) => {
       }
     }
 
-    ctx.SUCCESS(result)
+    return result
   } catch (e) {
-    return ctx.SUCCESS(null)
+    return null
+  }
+}
+exports.express = async (ctx) => {
+  const { app } = getAppByCtx(ctx)
+
+  const { express_number } = ctx.request.body
+
+  if (Array.isArray(express_number)) {
+    const result = await Promise.all(
+      express_number.map((item) => {
+        return expressFn({
+          app,
+          express_number: item,
+        })
+      })
+    )
+
+    return ctx.SUCCESS(result)
+  } else {
+    const result = await expressFn({
+      app,
+      express_number,
+    })
+
+    return ctx.SUCCESS(result)
   }
 }
 
@@ -481,7 +502,11 @@ exports.urlToOss = async (ctx) => {
     oss_host,
   } = await appConfig.getObject('oss')
 
-  if (!url || ['aliyun', cdn_host, oss_host].some((i) => url.includes(i)))
+  if (
+    !url ||
+    (!url.includes('://lanhu') &&
+      ['aliyun', cdn_host, oss_host].some((i) => url.includes(i)))
+  )
     return ctx.SUCCESS(url)
 
   if (!(accessKeyId && accessKeySecret && bucket && region)) {

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

@@ -198,9 +198,13 @@ exports.showTables = async (ctx) => {
 exports.getTable = async (ctx) => {
   const { app } = getAppByCtx(ctx)
 
-  const { model: _model, show_virtual = false } = ctx.request.body
+  const {
+    model: _model,
+    show_virtual = false,
+    is_cache = true,
+  } = ctx.request.body
 
-  if (app.cache && app.cache.get(`${_model}-table`)) {
+  if (is_cache && app.cache && app.cache.get(`${_model}-table`)) {
     return ctx.SUCCESS(app.cache.get(`${_model}-table`))
   }
 

package/package.json

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