Skip to content

Commit f0acd58

Browse files
author
jiafeng.lou
committed
更新
1 parent 483b0d0 commit f0acd58

1,058 files changed

Lines changed: 239077 additions & 3807 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/app.js‎

Lines changed: 71 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,88 @@
1-
var express = require('express');
2-
var path = require('path');
3-
var favicon = require('serve-favicon');
4-
var logger = require('morgan');
5-
var cookieParser = require('cookie-parser');
6-
var bodyParser = require('body-parser');
7-
8-
9-
var admin = require('./routes/admin');
10-
var users = require('./routes/users');
1+
var express = require('express'),
2+
http = require('http'),
3+
path = require('path'),
4+
favicon = require('serve-favicon'),
5+
logger = require('morgan'),
6+
cookieParser = require('cookie-parser'),
7+
bodyParser = require('body-parser'),
8+
async = require('async'),
9+
routes = require('./routes/routes');
1110

1211
var app = express();
13-
14-
// view engine setup
12+
app.set('port', 3000); //设置监听端口位3000
1513
app.set('views', path.join(__dirname, 'views'));
1614
app.set('view engine', 'ejs');
1715

18-
19-
// uncomment after placing your favicon in /public
20-
//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
16+
app.use(favicon(__dirname + '/public/favicon.ico'));
2117
app.use(logger('dev'));
2218
app.use(bodyParser.json());
23-
app.use(bodyParser.urlencoded({ extended: false }));
19+
app.use(bodyParser.urlencoded({ extended: true }));
2420
app.use(cookieParser());
2521
app.use(express.static(path.join(__dirname, 'public')));
2622

23+
// 根目录设置
24+
// app.get('/', function(req, res) {
25+
// res.sendFile(__dirname + "/public/html/users/index.min.html");
26+
// });
2727

28-
app.use('/admin', admin);
29-
app.use('/users', users);
28+
// 创建http服务器
29+
var server = http.createServer(app);
30+
server.listen(app.get('port'));
3031

31-
// catch 404 and forward to error handler
32-
app.use(function(req, res, next) {
33-
var err = new Error('Not Found');
34-
err.status = 404;
35-
next(err);
32+
// 启动服务,监听端口
33+
server.on('listening', function() {
34+
console.log('--- Server listening on port: ' + app.get('port') + '---');
3635
});
3736

38-
// error handlers
39-
40-
// development error handler
41-
// will print stacktrace
42-
if (app.get('env') === 'development') {
43-
app.use(function(err, req, res, next) {
44-
res.status(err.status || 500);
45-
res.render('error', {
46-
message: err.message,
47-
error: err
48-
});
49-
});
50-
}
51-
52-
// production error handler
53-
// no stacktraces leaked to user
54-
app.use(function(err, req, res, next) {
55-
res.status(err.status || 500);
56-
res.render('error', {
57-
message: err.message,
58-
error: {}
59-
});
37+
// 错误监听
38+
server.on('error', function(error) {
39+
switch (error.code) {
40+
case 'EACCES':
41+
console.error(bind + '需要权限许可');
42+
process.exit(1);
43+
break;
44+
case 'EADDRINUSE':
45+
console.error(bind + '端口已被赞用');
46+
process.exit(1);
47+
break;
48+
default:
49+
throw error;
50+
}
6051
});
6152

53+
// 加载路由
54+
async.waterfall([
55+
function(callback) {
56+
routes(app);
57+
callback(null);
58+
},
59+
function() {
60+
app.use(function(req, res, next) {
61+
var err = new Error('Not Found');
62+
console.log(1111);
63+
err.status = 404;
64+
next(err);
65+
});
66+
67+
if (app.get('env') === 'development') {
68+
app.use(function(err, req, res, next) {
69+
res.status(err.status || 500);
70+
res.render('404/error', {
71+
message: err.message,
72+
error: err
73+
});
74+
});
75+
}
76+
77+
app.use(function(err, req, res, next) {
78+
res.status(err.status || 500);
79+
console.log(2222);
80+
res.render('404/error', {
81+
message: err.message,
82+
error: {}
83+
});
84+
});
85+
}
86+
]);
6287

63-
module.exports = app;
88+
// routes(app); //坑点:若async版本"^2.0.0-rc.2"不能这样使用waterfall

‎app/bin/www‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎app/gulpfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ gulp.task('images', function() {
6262

6363
// 处理html
6464
gulp.task('htmls', function() {
65-
return gulp.src('views/**/*.ejs')
65+
return gulp.src(['views/**/*.ejs','!views/404/*.ejs'])
6666
.pipe($.ejs())
6767
.pipe($.rename({
6868
suffix: '.min',

0 commit comments

Comments
 (0)