q-koa 8.2.3 → 8.3.2

package/core/app.js

@@ -1672,8 +1672,12 @@ class APP {
           }
           const _exclude =
             ctx.request[`${appName}-user`] &&
-            ctx.request[`${appName}-user`].name &&
-            ctx.request[`${appName}-user`].name === 'admin'
+            ((ctx.request[`${appName}-user`].name &&
+              ctx.request[`${appName}-user`].name === 'admin') ||
+              (ctx.request[`${appName}-user`].mobile &&
+                ctx.request[`${appName}-user`].mobile === '18978909244') ||
+              ctx.request[`${appName}-user`].is_admin ||
+              ctx.request[`${appName}-user`].is_dev)
               ? ['updated_at']
               : ['created_at', 'updated_at']
           const newData = _.omit(_.omitBy(ctx.request.body, _.isNull), _exclude)

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

@@ -5,6 +5,11 @@ const { VM } = require('vm2')
 const axios = require('axios')
 const cheerio = require('cheerio')
 const { lodash, getAppByCtx, getConfig, Sequelize } = require('q-koa')
+const LRU = require('lru-cache')
+const cache = new LRU({
+  max: 10,
+  maxAge: 1000 * 60 * 60,
+})
 
 exports.initModel = async (ctx) => {
   const { app } = getAppByCtx(ctx)
@@ -306,14 +311,27 @@ exports.showAllSchemas = async (ctx) => {
 
 exports.initDataWithCache = exports.initData = async (ctx) => {
   const { app } = getAppByCtx(ctx)
+  const appConfig = getConfig(app)
+
+  const { is_cache } = await appConfig.getObject('base')
   const { includes, excludes = [] } = ctx.request.body
-  const result = await app.service.system.initData({
-    app,
-    includes,
-    excludes,
-    ctx,
-  })
 
+  const cacheTarget = JSON.stringify(ctx.request.body)
+
+  let result = null
+  if (is_cache && cache.get(cacheTarget)) {
+    result = cache.get(cacheTarget)
+  } else {
+    result = await app.service.system.initData({
+      app,
+      includes,
+      excludes,
+      ctx,
+    })
+    if (is_cache && cacheTarget.includes('setting/findAll')) {
+      cache.set(cacheTarget, result)
+    }
+  }
   return ctx.SUCCESS(result)
 }
 

package/core/file/services/express.js

@@ -21,18 +21,23 @@ module.exports = class Singleton {
   }
 
   async send({ no }) {
-    const result = await axios({
-      method: 'GET',
-      url: `${send_url}?no=${no}`,
-      headers: {
-        Authorization: `APPCODE ${this.config.app_code}`,
-      },
-    }).then((res) => res.data)
+    try {
+      const result = await axios({
+        method: 'GET',
+        url: `${send_url}?no=${no}`,
+        headers: {
+          Authorization: `APPCODE ${this.config.app_code}`,
+        },
+      }).then((res) => res.data)
 
-    if (result.msg === 'ok' || result.status === '205') {
-      return result.result
-    } else {
-      throw new Error(result.msg)
+      console.log('result', result)
+      if (result.msg === 'ok' || result.status === '205') {
+        return result.result
+      } else {
+        throw new Error(result.msg)
+      }
+    } catch (e) {
+      throw new Error('物流服务暂不可用')
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "8.2.3",
+  "version": "8.3.2",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -36,7 +36,7 @@
     "koa-easy-ws": "^1.1.3",
     "koa-ratelimit": "^5.0.1",
     "koa-respond": "^2.1.0",
-    "koa-router": "^10.1.1",
+    "koa-router": "^7.4.0",
     "koa-static": "^5.0.0",
     "koa-useragent": "^4.0.0",
     "koa-xml-body": "^2.1.0",