middleware/cors.js

@@ -11,15 +11,11 @@ export function createCors() {
     let opts = this.get('cors')
 
     if (opts.enabled) {
-      let origin = req.headers['origin'] || req.headers['referer'] || ''
-      let headers = req.headers['access-control-request-headers']
-
-      if (!origin) {
-        return next()
-      }
+      let origin = req.header('origin') || req.header('referer') || ''
+      let headers = req.header('access-control-request-headers')
       let { hostname, host, protocol } = parse(origin)
 
-      if (opts.origin.length) {
+      if (opts.origin.length && hostname) {
         let pass = false
         for (let it of opts.origin) {
           if (hostname.endsWith(it)) {
@@ -28,7 +24,7 @@ export function createCors() {
           }
         }
         if (pass === false) {
-          return (res.body = null)
+          return res.end('')
         }
       }
       if (opts.credentials) {
@@ -36,7 +32,7 @@ export function createCors() {
       }
 
       res.set('Access-Control-Allow-Origin', `${protocol}//${host}`)
-      res.set('Access-Control-Allow-Methods', '*')
+      res.set('Access-Control-Allow-Methods', req.method)
 
       if (headers) {
         res.set('Access-Control-Allow-Headers', headers)
@@ -47,7 +43,7 @@ export function createCors() {
       }
 
       if (req.method === 'OPTIONS') {
-        return (res.body = null)
+        return res.end('')
       }
     }
     next()

middleware/router.js

@@ -10,22 +10,19 @@ export function createRouter() {
   return function (req, res, next) {
     let debug = this.get('debug')
     let dynamic = this.get('dynamic')
-    let name = dynamic ? 'index' : req.controller
-    let _module = this.$load(name)
-    let paths = req.path.concat()
 
     // 1. 先判断控制器是否存在
-    if (!_module) {
-      return res.error(`Controller [${name}] not found`, 404)
+    if (!this.$load(dynamic ? 'index' : req.controller)) {
+      return res.error(`Controller [${req.controller}] not found`, 404)
     }
 
     // 2. 默认二级路由为index
-    if (paths.length < 1 && dynamic === false) {
-      paths.push('index')
+    if (req.path.length < 1 && dynamic === false) {
+      req.path.push('index')
     }
 
     // 3. 实例化控制器
-    _module
+    this.$load(dynamic ? 'index' : req.controller)
       .then(async ModuleController => {
         let ctrol, route, act
         let err = ''
@@ -51,20 +48,20 @@ export function createRouter() {
           }
 
           if (dynamic) {
-            return ctrol.indexAction.apply(ctrol, paths)
+            return ctrol.indexAction.apply(ctrol, req.path)
           } else {
-            route = paths.shift()
+            route = req.path.shift()
             act = route + 'Action'
 
             if (ctrol[act]) {
-              return ctrol[act].apply(ctrol, paths)
+              return ctrol[act].apply(ctrol, req.path)
             } else {
               err = new Error(`Action [${route}] not found`)
               err.status = 404
             }
           }
         } else {
-          err = new Error(`Controller [${name}] load error`)
+          err = new Error(`Controller [${req.controller}] load error`)
           err.status = 500
         }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm5/core",
-  "version": "2.0.4",
+  "version": "2.0.1",
   "type": "module",
   "description": "Five.js, 一个轻量级的nodejs mvc框架 旨在简单易用, 5分钟即可上手",
   "author": "yutent <yutent.io@gmail.com>",