q-koa 8.0.5 → 8.1.1

package/core/app.js

@@ -70,16 +70,7 @@ class APP {
   constructor(_config) {
     const config = _.defaultsDeep(_config, defaultConfig)
     const { port } = config
-    this.config = {
-      ...config,
-      includes: config.includes.map((item) => {
-        return typeof item === 'string'
-          ? {
-              item,
-            }
-          : item
-      }),
-    }
+    this.config = config
     this.port = port
     this.app = new Koa()
     this.server = null
@@ -142,6 +133,12 @@ class APP {
     this.app.use(async (ctx, next) => {
       const verify = util.promisify(jwt.verify)
       const { url, host, ip, method } = ctx.request
+      if (this.config.blackList.includes(ip)) {
+        if (this.config.log.request) {
+          console.log('IP==>', ip)
+        }
+        return ctx.ERROR('error')
+      }
       const appName = url.split('/')[1]
       const { secret, whiteList, _whiteList, tokenKey, expiresIn } =
         ctx.app[appName] && ctx.app[appName].appConfig
@@ -188,7 +185,7 @@ class APP {
         ctx.cookies.get(`${appName}-${tokenKey}`) ||
         ctx.query[`${appName}-${tokenKey}`]
 
-      if (url.length > 2) {
+      if (url.length > 2 && this.config.log.request) {
         console.log(
           moment().format('HH:mm:ss'),
           url,
@@ -200,7 +197,9 @@ class APP {
       try {
         const { user } = await verify(token, secret)
         if (user) {
-          console.log('user id ---> ', appName, '--->', user.id, user.name)
+          if (this.config.log.request) {
+            console.log('user id ---> ', appName, '--->', user.id, user.name)
+          }
           ctx.request[`${appName}-user`] = user
         }
       } catch (e) {
@@ -253,12 +252,11 @@ class APP {
     // });
 
     starter.on('loadAll', async () => {
-      const routerName = this.config.includes[0].routerName
-      const appName = this.config.includes[0].dirName
+      const appName = this.config.includes[0]
       this.server = this.app.listen(this.port, () => {
         console.log(`server is running at http://localhost:${this.port}`)
         console.log(
-          `first app is http://localhost:3001/${routerName}/setting/findOne`
+          `first app is http://localhost:3001/${appName}/setting/findOne`
         )
       })
 
@@ -305,17 +303,20 @@ class APP {
   }
 
   async initApp() {
-    if (this.config.includes.length === 0) throw new Error('请填入项目')
+    let dirList = await fsPromise.readdir(
+      path.resolve(__dirname, `${rootDirectory}/${APP_DIR}`)
+    )
+    dirList = dirList.filter((item) => this.config.includes.includes(item))
+
     let dbFlag = false
-    for (let i = 0; i < this.config.includes.length; i++) {
-      const routerName = this.config.includes[i].routerName
-      const appName = this.config.includes[i].dirName
+    for (let i = 0; i < dirList.length; i++) {
+      const appName = dirList[i]
 
       console.log(
         chalk.green(`==================== 启动 ${appName} ====================`)
       )
       const routerConfig = {
-        prefix: `/${routerName}`,
+        prefix: `/${appName}`,
       }
       const router = new Router(routerConfig)
       Serve(
@@ -351,9 +352,9 @@ class APP {
         }
 
         // const proxyConfig = _.get(this.app[appName], 'appConfig.proxy');
-        const taskConfig = _.get(this.app[appName], 'appConfig.task', {
-          is_available: false,
-        })
+        // const taskConfig = _.get(this.app[appName], 'appConfig.task', {
+        //   is_available: false,
+        // })
         // if (proxyConfig) {
         //   this.app.use(proxy(`/${appName}`, proxyConfig));
         // }
@@ -382,9 +383,9 @@ class APP {
 
         await this.initModel(appName)
         // const models = Object.keys(this.app[appName].model).join(' / ')
-        if (taskConfig.is_available) {
-          this.initTask(appName)
-        }
+        // if (taskConfig.is_available) {
+        //   this.initTask(appName)
+        // }
       } catch (e) {
         console.log(`${appName}数据库连接失败`)
         console.log(e)
@@ -791,10 +792,7 @@ class APP {
 
   initRouter(router) {
     router.post('/:controller', async (ctx, next) => {
-      const routerName = router.opts.prefix.substring(1)
-      const appName = this.config.includes.find(
-        (i) => i.routerName === routerName
-      )
+      const appName = router.opts.prefix.substring(1)
       const { app } = ctx
       const { controller } = ctx.params
       if (
@@ -806,10 +804,7 @@ class APP {
       await next()
     })
     const handleRouter = async (ctx) => {
-      const routerName = router.opts.prefix.substring(1)
-      const appName = this.config.includes.find(
-        (i) => i.routerName === routerName
-      ).dirName
+      const appName = router.opts.prefix.substring(1)
       const { app } = ctx
 
       const { controller, fn, sub } = ctx.params

package/core/config.js

@@ -5,6 +5,10 @@ module.exports = {
   static: {
     dir: 'public',
   },
+  log: {
+    request: true,
+  },
+  blackList: [],
   task: {
     dir: 'task',
   },

package/package.json

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