q-koa 11.4.4 → 11.4.6

package/core/app.js

@@ -42,6 +42,7 @@ const {
   miLimit,
 } = require('./middlewares')
 const Validator = require('./validator')
+const { ServiceError } = require('./errors')
 
 let spinner
 
@@ -1826,7 +1827,20 @@ class APP {
               ? ['updated_at']
               : ['created_at', 'updated_at']
 
-          const newData = _.omit(_.omitBy(ctx.request.body, _.isNull), _exclude)
+          const newData = _.omit(
+            _.omitBy(
+              ctx.request.body,
+              (value, key) =>
+                _.isNull(value) &&
+                !(
+                  ctx.app[appName].attributes &&
+                  ctx.app[appName].attributes[controller] &&
+                  ctx.app[appName].attributes[controller][key] &&
+                  ctx.app[appName].attributes[controller][key].allowNull
+                )
+            ),
+            _exclude
+          )
 
           const flag = await app[appName].model[controller][fn]({
             createdid: ctx.request[`${appName}-user`]
@@ -1917,6 +1931,7 @@ APP.Sequelize = Sequelize
 APP.lodash = _
 APP.Random = Random
 APP.Validator = Validator
+APP.ServiceError = ServiceError
 APP.moment = moment
 global.moment = moment
 global.Sequelize = Sequelize

package/core/errors.js

@@ -0,0 +1,8 @@
+class ServiceError extends Error {
+  constructor(message) {
+    super(message)
+    this.type = 'service'
+  }
+}
+
+exports.ServiceError = ServiceError

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

@@ -6,6 +6,7 @@ const axios = require('axios')
 exports.initData = async ({ includes, excludes, app, ctx }) => {
   const appConfig = getConfig(app)
   const { version: cacheVersion } = await appConfig.getObject('base')
+
   const apiVersion = ctx.request.header.version
   const config = ctx.request.header.config
 
@@ -275,6 +276,9 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
     }),
     {}
   )
+  if (obj.setting && apiVersion && !cacheVersion) {
+    console.log(`version没有后端缓存`)
+  }
   if (obj.setting && apiVersion && cacheVersion) {
     let target = null
     if (config) {

package/core/middlewares.js

@@ -30,7 +30,7 @@ exports.miErrors = () => async (ctx, next) => {
       content: e.stack,
       header: ctx.request.header,
     }
-    if (app && app.model && app.model.log) {
+    if (['service'].includes(e.type) && app && app.model && app.model.log) {
       app.model.log.upsert(errorData)
     }
 

package/package.json

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