q-koa 8.3.0 → 8.3.3

package/core/app.js

@@ -1671,11 +1671,17 @@ class APP {
             throw new Error('新增不能为空')
           }
           const _exclude =
-            ctx.request[`${appName}-user`] &&
-            ctx.request[`${appName}-user`].name &&
-            ctx.request[`${appName}-user`].name === 'admin'
+            ctx.request.clientType === 1 ||
+            (ctx.request[`${appName}-user`] &&
+              ((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)
 
           const flag = await app[appName].model[controller][fn]({

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

@@ -317,6 +317,8 @@ exports.initDataWithCache = exports.initData = async (ctx) => {
   const { includes, excludes = [] } = ctx.request.body
 
   const cacheTarget = JSON.stringify(ctx.request.body)
+
+  let result = null
   if (is_cache && cache.get(cacheTarget)) {
     result = cache.get(cacheTarget)
   } else {

package/core/file/services/express.js

@@ -21,18 +21,22 @@ 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)
+      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.3.0",
+  "version": "8.3.3",
   "description": "",
   "main": "index.js",
   "scripts": {