Skip to content
This repository has been archived by the owner on Sep 25, 2023. It is now read-only.

Master #785

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: node_js
node_js:
- "0.10"
- "5.1.0"
before_script:
- npm install -g grunt-cli
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"server"
],
"dependencies": {
"socket.io": "0.9.16",
"socket.io": "1.3.7",
"async": "0.2.5",
"seq-queue": "0.0.5",
"crc": "0.2.0",
Expand All @@ -52,7 +52,7 @@
"devDependencies": {
"should": "3.3.1",
"mocha": ">=0.0.1",
"socket.io-client": "0.9.16",
"socket.io-client": "1.3.7",
"muk": ">=0.0.1",
"grunt": "~0.4.2",
"grunt-mocha-test": "0.8.x",
Expand Down
45 changes: 24 additions & 21 deletions template/web-server/app.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,30 @@
var express = require('express');
var app = express.createServer();
var path = require('path');
var favicon = require('serve-favicon');
var logger = require('morgan');
var errorHandler = require('errorHandler');
var cookieParser = require('cookie-parser');
var bodyParser = require('body-parser');
var app = express();

app.configure(function(){
app.use(express.methodOverride());
app.use(express.bodyParser());
app.use(app.router);
app.set('view engine', 'jade');
app.set('views', __dirname + '/public');
app.set('view options', {layout: false});
app.set('basepath',__dirname + '/public');
});
app.use(logger('dev'));
app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ extended: false }));
app.use(cookieParser());

app.configure('development', function(){
app.use(express.static(__dirname + '/public'));
app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
});

app.configure('production', function(){
app.set('view engine', 'jade');
app.set('views', path.join(__dirname, 'public'));
// 只用于开发环境
if ('development' == app.get('env')) {
app.use(express.static(path.join(__dirname, 'public')));
app.use(errorHandler({ dumpExceptions: true, showStack: true }));
}
// 只用于生产环境
if ('production' == app.get('env')) {
var oneYear = 31557600000;
app.use(express.static(__dirname + '/public', { maxAge: oneYear }));
app.use(express.errorHandler());
});

app.use(express.static(path.join(__dirname, 'public'), { maxAge: oneYear }));
app.use(errorHandler());
}
console.log("Web server has started.\nPlease log on http://127.0.0.1:3001/index.html");

app.listen(3001);
app.listen(3001);
9 changes: 8 additions & 1 deletion template/web-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
"version": "0.0.1",
"private": false,
"dependencies": {
"express": "3.4.8"
"body-parser": "~1.13.2",
"cookie-parser": "~1.3.5",
"debug": "~2.2.0",
"errorhandler": "^1.4.2",
"express": "~4.13.1",
"jade": "~1.11.0",
"morgan": "~1.6.1",
"serve-favicon": "~2.3.0"
}
}
Loading