q-koa 8.0.4 → 8.0.5

package/core/app.js

@@ -70,7 +70,16 @@ class APP {
   constructor(_config) {
     const config = _.defaultsDeep(_config, defaultConfig)
     const { port } = config
-    this.config = config
+    this.config = {
+      ...config,
+      includes: config.includes.map((item) => {
+        return typeof item === 'string'
+          ? {
+              item,
+            }
+          : item
+      }),
+    }
     this.port = port
     this.app = new Koa()
     this.server = null
@@ -244,11 +253,12 @@ class APP {
     // });
 
     starter.on('loadAll', async () => {
-      const appName = this.config.includes[0]
+      const routerName = this.config.includes[0].routerName
+      const appName = this.config.includes[0].dirName
       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/${appName}/setting/findOne`
+          `first app is http://localhost:3001/${routerName}/setting/findOne`
         )
       })
 
@@ -295,20 +305,17 @@ class APP {
   }
 
   async initApp() {
-    let dirList = await fsPromise.readdir(
-      path.resolve(__dirname, `${rootDirectory}/${APP_DIR}`)
-    )
-    dirList = dirList.filter((item) => this.config.includes.includes(item))
-
+    if (this.config.includes.length === 0) throw new Error('请填入项目')
     let dbFlag = false
-    for (let i = 0; i < dirList.length; i++) {
-      const appName = dirList[i]
+    for (let i = 0; i < this.config.includes.length; i++) {
+      const routerName = this.config.includes[i].routerName
+      const appName = this.config.includes[i].dirName
 
       console.log(
         chalk.green(`==================== 启动 ${appName} ====================`)
       )
       const routerConfig = {
-        prefix: `/${appName}`,
+        prefix: `/${routerName}`,
       }
       const router = new Router(routerConfig)
       Serve(
@@ -784,7 +791,10 @@ class APP {
 
   initRouter(router) {
     router.post('/:controller', async (ctx, next) => {
-      const appName = router.opts.prefix.substring(1)
+      const routerName = router.opts.prefix.substring(1)
+      const appName = this.config.includes.find(
+        (i) => i.routerName === routerName
+      )
       const { app } = ctx
       const { controller } = ctx.params
       if (
@@ -796,7 +806,10 @@ class APP {
       await next()
     })
     const handleRouter = async (ctx) => {
-      const appName = router.opts.prefix.substring(1)
+      const routerName = router.opts.prefix.substring(1)
+      const appName = this.config.includes.find(
+        (i) => i.routerName === routerName
+      ).dirName
       const { app } = ctx
 
       const { controller, fn, sub } = ctx.params

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "8.0.4",
+  "version": "8.0.5",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -40,6 +40,7 @@
     "koa-static": "^5.0.0",
     "koa-useragent": "^4.0.0",
     "koa-xml-body": "^2.1.0",
+    "koa-proxies": "^0.12.2",
     "lodash": "^4.17.15",
     "lru-cache": "^5.1.1",
     "mockjs": "^1.0.1-beta3",