q-koa 8.4.1 → 8.4.5

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)
@@ -290,16 +291,16 @@ class APP {
       process.on('exit', (code) => {
         console.log(`[exit custom], About to exit with code: ${code}`)
       })
-      if (process.env.NODE_ENV === 'production') {
-        if (
-          this.app[appName].service.cache &&
-          this.app[appName].service.cache.init
-        ) {
-          this.app[appName].service.cache.init({
-            app: this.app[appName],
-            appName: appName,
-          })
-        }
+      if (
+        this.app[appName].service.cache &&
+        this.app[appName].service.cache.init
+      ) {
+        this.app[appName].service.cache.init({
+          app: this.app[appName],
+          appName: appName,
+        })
+      }
+      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()
@@ -365,7 +366,7 @@ class APP {
               this.config.app
             ),
           }
-        }else{
+        } else {
           this.app[appName] = {
             sequelize: db,
             appConfig: _.defaultsDeep(
@@ -374,7 +375,6 @@ class APP {
             ),
           }
         }
-        
 
         // const proxyConfig = _.get(this.app[appName], 'appConfig.proxy');
         // const taskConfig = _.get(this.app[appName], 'appConfig.task', {
@@ -1742,7 +1742,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)
@@ -1876,11 +1878,11 @@ APP.getConfig = (app) => ({
         }))
       )
 
-      const result = getObject(configList)(type)
+      const result = getObject(configList, app)(type)
       if (!result) throw new Error('没有这个type')
       return result
     }
-    const result = getObject(configList)(type)
+    const result = getObject(configList, app)(type)
     if (!result) throw new Error('没有这个type')
     return result
   },

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

@@ -8,9 +8,11 @@ const superAdmin = {
 
 exports.login = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
-  const { host } = ctx.request
   const { name, password } = ctx.request.body
-  const is_dev = host.startsWith('localhost')
+  const { host, header } = ctx.request
+  const is_dev =
+    host.startsWith('localhost') ||
+    (header.referer && header.referer.includes('is_dev=true'))
   const permissionList = await app.model.permission.findAll({
     attributes: {
       exclude: ['createdid', 'updated_at', 'created_at', 'name'],

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/core/file/utils/index.js

@@ -16,6 +16,15 @@ exports.getList = (config) => (type) => {
 }
 
 exports.getObject = (config) => (type) => {
+  if (app) {
+    const applicationList = await app.cache.get('application')
+    if (
+      applicationList &&
+      applicationList.find((item) => item.config === type)
+    ) {
+      return applicationList.find((item) => item.config === type)
+    }
+  }
   const obj = config.find((i) => i.code === type)
   if (!obj) throw new Error(`找不到${type}相关设置`)
   const list = config.filter((i) => i.parent_id === obj.id)

package/package.json

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