Skip to content

Commit 61475f9

Browse files
committed
add eslint and some optimizations
1 parent 40d9000 commit 61475f9

File tree

7 files changed

+44
-47
lines changed

7 files changed

+44
-47
lines changed

.eslintignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
public/*.js
2-
config/*.js
1+
# /node_modules ignored by default
2+
3+
public/*
4+
config/*
5+
test/*

.eslintrc

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

.eslintrc.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
module.exports = {
2+
// https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
3+
"extends": "standard",
4+
"plugins": [
5+
"standard",
6+
"promise"
7+
]
8+
}

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# node-server-project
2-
> 基于 node.js + express 技术栈,采用MVC结构设计、JWT + RESTful API、PM2服务监控的Node服务器端项目框架.
2+
> 基于 node.js + express 技术栈,采用MVC结构设计、JWT + RESTful API、PM2服务监控的Node服务器端项目框架
33
44
技术栈
55

6-
- node.js(>7.0 已原生支持绝大部分ES6/ES7语法)
7-
- express(成熟稳定的Web开发框架
8-
- hbs(handlebars后端模版引擎,语法简洁、实现模版继承和嵌套功能等
9-
- RESTful(API架构风格,包括统一的接口输出结构
10-
- JWT(Json Web Token 认证协议,用于页面和API的登录验证,包括token续期方案等)
6+
- node.js(>7.0已原生支持绝大部分ES6/ES7语法)
7+
- express(成熟稳定的Web框架
8+
- hbs(handlebars后端模版引擎,语法简洁高效、实现模版继承和内嵌功能等
9+
- RESTful(API架构风格,并提供统一的接口输出结构
10+
- JWT(Json Web Token 认证协议,用于页面和API的验证,包括token续期方案等)
1111
- ORM(数据库对象关系映射)
1212
- TEST(集成在线API文档生成和测试工具[Swagger-ui](https://github.com/swagger-api/swagger-ui),public/swagger目录下)
1313

1414

15-
## BUILD @see package.json#scripts
15+
## Build Setup @see package.json#scripts
1616

1717
### Install dependencies
1818

app.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1+
/**
2+
* 主入口程序
3+
*/
4+
15
var express = require('express')
2-
var path = require('path')
36
var favicon = require('serve-favicon')
47
var cookieParser = require('cookie-parser')
58
var bodyParser = require('body-parser')
69
var mountRoutes = require('mount-routes')
710
var cors = require('cors')
11+
var path = require('path')
812

913
var logger = require('./server/middlewares/logger')
1014
var authorization = require('./server/middlewares/auth')

package.json

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,44 +24,48 @@
2424
"debug": "node-debug ./bin/www",
2525
"live": "gulp browser-sync",
2626
"test": "./node_modules/mocha/bin/mocha",
27+
"lint": "./node_modules/.bin/eslint app.js server",
2728
"update": "ncu -u -a"
2829
},
2930
"dependencies": {
30-
"blueimp-md5": "^2.6.0",
31-
"body-parser": "~1.15.1",
31+
"blueimp-md5": "^2.7.0",
32+
"body-parser": "~1.17.1",
3233
"compression": "^1.6.2",
3334
"cookie-parser": "~1.4.3",
3435
"cors": "^2.8.1",
35-
"debug": "~2.2.0",
36-
"express": "~4.13.4",
36+
"debug": "~2.6.2",
37+
"express": "~4.15.2",
3738
"express-jwt": "^5.1.0",
38-
"file-stream-rotator": "0.0.7",
39-
"hbs": "~4.0.0",
39+
"file-stream-rotator": "0.1.0",
40+
"hbs": "~4.0.1",
4041
"jsonwebtoken": "^7.3.0",
4142
"lodash": "^4.17.4",
42-
"mongoose": "^4.8.3",
43+
"mongoose": "^4.8.6",
4344
"mongoosedao": "^1.0.13",
44-
"morgan": "~1.7.0",
45+
"morgan": "~1.8.1",
4546
"mount-routes": "^1.0.6",
4647
"mysql": "^2.13.0",
4748
"mysql2": "^1.2.0",
48-
"pg": "^6.1.2",
49+
"pg": "^6.1.4",
4950
"pg-hstore": "^2.3.2",
50-
"redis": "^2.6.5",
51-
"request": "^2.79.0",
51+
"redis": "^2.7.0",
52+
"request": "^2.81.0",
5253
"request-promise": "^4.1.1",
5354
"sequelize": "^3.30.2",
54-
"serve-favicon": "~2.3.0",
55+
"serve-favicon": "~2.4.1",
5556
"sqlite3": "^3.1.8"
5657
},
5758
"devDependencies": {
5859
"browser-sync": "^2.18.8",
59-
"eslint": "^3.15.0",
60+
"eslint": "^3.17.1",
61+
"eslint-config-standard": "^7.0.1",
62+
"eslint-plugin-promise": "^3.5.0",
63+
"eslint-plugin-standard": "^2.1.1",
6064
"gulp": "^3.9.1",
6165
"gulp-nodemon": "^2.2.1",
6266
"if-env": "^1.0.0",
6367
"mocha": "^3.2.0",
64-
"pm2": "^2.0.19",
68+
"pm2": "^2.4.2",
6569
"supertest": "^3.0.0",
6670
"supervisor": "^0.12.0"
6771
},

server/middlewares/interceptor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var tokenUtil = require('../utils/token')
77
module.exports = function (req, res, next) {
88
// 刷新页面Token(注:此处针对单一web项目)
99
var oldToken = tokenUtil.getToken(req)
10-
if (oldToken) {
10+
if (oldToken && tokenUtil.verifyToken(oldToken)) {
1111
var newTokent = tokenUtil.refreshToken(oldToken)
1212
res.cookie('token', newTokent)
1313
}

0 commit comments

Comments
 (0)