Authored by 毕凯

增加默认主页

@@ -33,12 +33,12 @@ app.use(function(req, res, next) { @@ -33,12 +33,12 @@ app.use(function(req, res, next) {
33 app.use('/', require('./router')); 33 app.use('/', require('./router'));
34 34
35 // 未知路由转入 404 35 // 未知路由转入 404
36 -// app.use(function(req, res) {  
37 -// var err = new Error('Not Found');  
38 -//  
39 -// err.status = 404;  
40 -// res.send(404, err);  
41 -// }); 36 +app.use(function(req, res) {
  37 + var err = new Error('Not Found');
  38 +
  39 + err.status = 404;
  40 + res.status(404).send(err);
  41 +});
42 42
43 // 捕获全局错误, 开发环境返回错误详情 43 // 捕获全局错误, 开发环境返回错误详情
44 app.use(function(err, req, res) { 44 app.use(function(err, req, res) {
@@ -47,6 +47,7 @@ app.use(function(err, req, res) { @@ -47,6 +47,7 @@ app.use(function(err, req, res) {
47 } else { 47 } else {
48 err = {}; 48 err = {};
49 } 49 }
  50 +
50 res.status(err.status || 500); 51 res.status(err.status || 500);
51 res.render('error', { 52 res.render('error', {
52 message: err.message, 53 message: err.message,
@@ -54,5 +55,4 @@ app.use(function(err, req, res) { @@ -54,5 +55,4 @@ app.use(function(err, req, res) {
54 }); 55 });
55 }); 56 });
56 57
57 -  
58 module.exports = app; 58 module.exports = app;
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 "private": true, 4 "private": true,
5 "scripts": { 5 "scripts": {
6 "start": "node ./bin/www", 6 "start": "node ./bin/www",
7 - "lint": "eslint -c .eslintrc --fix --cache public/**/*.js", 7 + "lint": "eslint -c .eslintrc --fix --cache .",
8 "validate": "npm ls" 8 "validate": "npm ls"
9 }, 9 },
10 "dependencies": { 10 "dependencies": {
@@ -3,14 +3,15 @@ @@ -3,14 +3,15 @@
3 * @author: xuqi<qi.xu@yoho.cn> 3 * @author: xuqi<qi.xu@yoho.cn>
4 * @date: 2016/3/28 4 * @date: 2016/3/28
5 */ 5 */
6 -'use stricts';  
7 const express = require('express'); 6 const express = require('express');
8 7
9 const app = new express.Router(); 8 const app = new express.Router();
10 const routes = './routes'; 9 const routes = './routes';
11 10
  11 +var index = require(`${routes}/index`);
12 var wxLottery = require(`${routes}/wxLottery/index`); 12 var wxLottery = require(`${routes}/wxLottery/index`);
13 13
14 -app.get('/wxLottery', wxLottery.index); 14 +app.get('/', index.index); // 主页
  15 +app.get('/wxLottery', wxLottery.index); // 微信抽奖活动
15 16
16 module.exports = app; 17 module.exports = app;
  1 +/**
  2 + * 默认主页
  3 + */
  4 +
  5 +exports.index = (req, res) => {
  6 + res.send('Hello YOHO!');
  7 +};