q-koa 11.0.0 → 11.0.2

package/core/app.js

@@ -254,7 +254,7 @@ class APP {
       ) {
         this.app[appName].model.log.upsert(errorData)
       }
-      if (process.env.NODE_ENV !== 'production') {
+      if (is_dev) {
         console.log(err.stack)
       }
       throw new Error(err.message)
@@ -265,7 +265,10 @@ class APP {
     // });
 
     starter.on('loadAll', async () => {
-      const appName = this.config.includes[0]
+      const appName =
+        typeof this.config.includes[0] === 'string'
+          ? this.config.includes[0]
+          : this.config.includes[0].app
       if (!this.app[appName])
         throw new Error(
           `没有生成应用${this.config.includes[0]}，请检查config includes`
@@ -276,12 +279,17 @@ class APP {
             'HH:mm:ss'
           )} server is running at http://localhost:${this.port}`
         )
-        console.log(
-          `first app is http://localhost:3001/${appName}/setting/findOne`
-        )
+        if (is_dev) {
+          console.log(
+            `first app is http://localhost:3001/${appName}/setting/findOne`
+          )
+        }
+
+        const version = require('q-koa/package.json').version
+        console.log(chalk.green(`version: ${version}`))
       })
 
-      if (process.env.NODE_ENV !== 'production') {
+      if (is_dev) {
         if (
           this.app[appName].service.model &&
           this.app[appName].service.model.loadModel
@@ -337,9 +345,6 @@ class APP {
   }
 
   async initApp() {
-    const version = require('q-koa/package.json').version
-    console.log(chalk.green(`version: ${version}`))
-
     let dirList = await fsPromise.readdir(
       path.resolve(__dirname, `${rootDirectory}/${APP_DIR}`)
     )
@@ -452,9 +457,6 @@ class APP {
 
         await this.initModel(appName)
         // const models = Object.keys(this.app[appName].model).join(' / ')
-        // if (taskConfig.is_available) {
-        //   this.initTask(appName)
-        // }
       } catch (e) {
         console.log(`${appName}数据库连接失败`)
         console.log(e)
@@ -506,38 +508,6 @@ class APP {
     }
   }
 
-  async initTask(appName) {
-    console.log(chalk.red(`启动任务${appName}`))
-    const taskDir = path.resolve(
-      __dirname,
-      `${rootDirectory}/${APP_DIR}/${appName}/task`
-    )
-    const publicExist = fs.existsSync(taskDir)
-    if (!publicExist) await fsPromise.mkdir(taskDir)
-    const list = await fsPromise.readdir(taskDir)
-    for (let i = 0; i < list.length; i++) {
-      const folder = list[i]
-      const isFolder = fs.lstatSync(path.resolve(taskDir, folder)).isDirectory()
-      if (isFolder) {
-        const folderDir = await fsPromise.readdir(path.resolve(taskDir, folder))
-        folderDir.forEach((filename) => {
-          if (filename === 'index.js') {
-            const task = require(path.resolve(
-              __dirname,
-              `${rootDirectory}/${APP_DIR}/${appName}/task/${folder}`
-            ))
-            this.app[appName] = _.defaultsDeep(
-              {
-                task,
-              },
-              this.app[appName]
-            )
-          }
-        })
-      }
-    }
-  }
-
   async initPlugin(appName) {
     const pluginDir = path.resolve(
       __dirname,

package/package.json

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