Compare commits

..

No commits in common. "master" and "2.0.1" have entirely different histories.

3 changed files with 16 additions and 23 deletions

View File

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

View File

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

View File

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