q-koa 8.4.3 → 8.5.0

package/core/app.js

@@ -68,6 +68,7 @@ const connectDatabase = (database) => (config) => {
 
 const defaultConfig = require('./config')
 
+const is_dev = process.env.NODE_ENV !== 'production'
 class APP {
   constructor(_config) {
     const config = _.defaultsDeep(_config, defaultConfig)
@@ -299,7 +300,7 @@ class APP {
           appName: appName,
         })
       }
-      if (process.env.NODE_ENV === 'production') {
+      if (!is_dev) {
         process.on('SIGINT', () => {
           console.log('Closing server...')
           this.server.close(() => {
@@ -338,7 +339,7 @@ class APP {
 
       try {
         const db = connectDatabase(appName)(this.config.db)
-        if (process.env.NODE_ENV === 'production') {
+        if (!is_dev) {
           if (!dbFlag) {
             console.log(chalk.green(`检查${appName}数据库`))
             await db.authenticate()
@@ -1082,6 +1083,8 @@ class APP {
                           [controller + '_id']: idList,
                           ...myInclude[j].where,
                         },
+                        order: myInclude[j].order,
+                        limit: myInclude[j].limit,
                         include: myInclude[j].include,
                       })
                       objList = {
@@ -1741,7 +1744,9 @@ class APP {
         if (_.get(app, `${appName}.afterExecute.${controller}.${fn}`)) {
           app[appName].afterExecute[controller][fn](ctx)
             .then((res) => {
-              console.log('afterUpdate', res)
+              if (is_dev) {
+                console.log('afterUpdate', res)
+              }
             })
             .catch((e) => {
               console.log('错误', e)

package/core/config.js

@@ -5,6 +5,7 @@ module.exports = {
   static: {
     dir: 'public',
   },
+  is_check_admin: false,
   log: {
     request: true,
   },

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

@@ -12,6 +12,7 @@ exports.login = async (ctx) => {
   const { host, header } = ctx.request
   const is_dev =
     host.startsWith('localhost') ||
+    !app.appConfig.is_check_admin ||
     (header.referer && header.referer.includes('is_dev=true'))
   const permissionList = await app.model.permission.findAll({
     attributes: {

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

@@ -107,7 +107,7 @@ exports.loadModel = async ({ app, appName }) => {
               defaultValue = `${model[name].defaultValue}`
             }
             if (Array.isArray(model[name].defaultValue)) {
-              defaultValue = '[]'
+              defaultValue = JSON.stringify(model[name].defaultValue)
             }
             if (
               Object.prototype.toString.call(model[name].defaultValue) ===

package/package.json

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