Readme.md

@@ -11,10 +11,6 @@
 
 框架要求 nodejs 版本在 12.0 或以上, 并且只支持使用`import/export`
 
-## 文档
-
-[文档](/gm5/core/wiki)
-
 ## 启用方法(步骤)
 
 **注**
@@ -51,7 +47,7 @@ app.preload('./apps/') // [必须], 预加载应用目录
 app.listen(3001) // 默认是3000
 ```
 
-其他的配置和功能, 请参考 [文档](/gm5/core/wiki)。
+其他的配置和功能, 请参考 [文档](/gm5/request/wiki)。
 
 
 3.  启动应用。在项目根目录打开终端, 输入以下命令 `npm create five`, 然后根据提示操作, 即可

config/index.js

@@ -8,8 +8,8 @@ const ENV_PROD = 'production'
 const ENV_DEV = 'development'
 
 export default {
-  // 动态路由模式, 即无论是访问路径是什么, 永远只会调用 \apps\index\index()
-  dynamic: false,
+  db: {},
+  spa: false, // 单路由模式, 即无论是访问路径是什么, 永远只会调用 \apps\index\index()
   port: 3000,
   env: process.env.NODE_ENV === ENV_PROD ? ENV_PROD : ENV_DEV,
   debug: process.env.NODE_ENV === ENV_DEV, // debug模式

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

@@ -9,23 +9,20 @@ import { readonlyProp } from '../lib.js'
 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()
+    let spa = this.get('spa')
 
     // 1. 先判断控制器是否存在
-    if (!_module) {
-      return res.error(`Controller [${name}] not found`, 404)
+    if (!this.$load(spa ? '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 && spa === false) {
+      req.path.push('index')
     }
 
     // 3. 实例化控制器
-    _module
+    this.$load(spa ? 'index' : req.controller)
       .then(async ModuleController => {
         let ctrol, route, act
         let err = ''
@@ -50,21 +47,21 @@ export function createRouter() {
             }
           }
 
-          if (dynamic) {
-            return ctrol.indexAction.apply(ctrol, paths)
+          if (spa) {
+            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.0",
   "type": "module",
   "description": "Five.js, 一个轻量级的nodejs mvc框架 旨在简单易用, 5分钟即可上手",
   "author": "yutent <yutent.io@gmail.com>",