q-koa 8.3.1 → 8.4.0

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/service.js

@@ -70,7 +70,7 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
 
           if (app.controller[model] && app.controller[model][fn]) {
             return app.controller[model][fn](ctx, data).then((result) => {
-              if (!result) {
+              if (!result && process.env.NODE_ENV !== 'production') {
                 console.log(`需要在控制器${fn}中返回`)
               }
               return {

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

@@ -918,7 +918,7 @@ exports.notify = async (ctx) => {
     transactionid = result.xml.transaction_id
   } catch (e) {}
 
-  console.log(order_id, '微信支付回调-----', model, order_price, transactionid)
+  // console.log(order_id, '微信支付回调-----', model, order_price, transactionid)
   if (app.service[model] && app.service[model].notify) {
     await app.service[model].notify({
       app,
@@ -1094,9 +1094,9 @@ exports.refund_notify = async (ctx) => {
     : Number(out_refund_no)
   const type = out_refund_no.includes('_') ? out_refund_no.split('_')[1] : ''
   const model = prefix ? `${prefix}_order` : 'order'
-  console.log(
-    `微信退款回调 prefix:${prefix}/model:${model}/order_id:${order_id}/type:${type}`
-  )
+  // console.log(
+  //   `微信退款回调 prefix:${prefix}/model:${model}/order_id:${order_id}/type:${type}`
+  // )
   if (app.service[model] && app.service[model].refund_notify) {
     await app.service[model].refund_notify({
       app,

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.1",
+  "version": "8.4.0",
   "description": "",
   "main": "index.js",
   "scripts": {