Skip to content

Commit 7b35470

Browse files
committed
chore: 先支持eslit
1 parent 30ce92e commit 7b35470

File tree

16 files changed

+1643
-304
lines changed

16 files changed

+1643
-304
lines changed

.eslintrc.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
module.exports = {
2+
env: {
3+
node: true
4+
},
5+
extends: 'standard-with-typescript',
6+
overrides: [
7+
],
8+
parserOptions: {
9+
ecmaVersion: 'latest'
10+
},
11+
rules: {
12+
camelcase: [0, { ignoreDestructuring: true }]
13+
}
14+
}

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
node_modules
22
.env
3-
logs
3+
logs

.prettierrc.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"tabWidth": 2,
3+
"useTabs": false,
4+
"endOfLine": "auto",
5+
"singleQuote": true,
6+
"semi": false,
7+
"trailingComma": "none",
8+
"bracketSpacing": true
9+
}

.vscode/settings.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"git.ignoreMissingGitWarning": true,
3+
"eslint.options": {
4+
"extensions": [
5+
".js"
6+
]
7+
},
8+
"emmet.syntaxProfiles": {
9+
"javascript": "js"
10+
},
11+
"editor.fontSize": 12,
12+
"editor.codeActionsOnSave": {
13+
"source.fixAll.eslint": true
14+
}
15+
}

app.js

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
const express = require('express');
2-
const app = express();
3-
const router = express.Router();
4-
const user = require('./router/user');
5-
const home = require('./router/home');
6-
const upload = require('./router/upload');
7-
const logger = require('./logger');
8-
app.use(express.json());
9-
10-
router.use(function timeLog(req, res, next) {
11-
console.log('Time: ', Date.now());
12-
next();
13-
});
14-
app.use('/api/user', user);
15-
app.use('/api/', upload);
16-
app.use('/', home);
1+
const express = require('express')
2+
const app = express()
3+
const router = express.Router()
4+
const user = require('./router/user')
5+
const home = require('./router/home')
6+
const upload = require('./router/upload')
7+
const logger = require('./logger')
8+
app.use(express.json())
179

10+
router.use(function timeLog (req, res, next) {
11+
console.log('Time: ', Date.now())
12+
next()
13+
})
14+
app.use('/api/user', user)
15+
app.use('/api/', upload)
16+
app.use('/', home)
1817

1918
app.listen('3000', () => {
20-
console.log(' serve is running at http://localhost:3000/');
21-
logger.info(' serve is restart')
22-
});
19+
console.log(' serve is running at http://localhost:3000/')
20+
logger.info(' serve is restart')
21+
})

db/mysql.js

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
const dotenv = require("dotenv");
2-
const mysql = require("mysql2");
3-
const logger = require("../logger");
4-
dotenv.config();
1+
const dotenv = require('dotenv')
2+
const mysql = require('mysql2')
3+
const logger = require('../logger')
4+
dotenv.config()
55
const {
66
DATABASE_MY_HOST,
77
DATABASE_MY_POST,
88
DATABASE_NAME,
99
DATABASE_MY_USERNAME,
10-
DATABASE_MY_PASSWORD,
11-
} = process.env;
12-
console.log(dotenv.config());
10+
DATABASE_MY_PASSWORD
11+
} = process.env
12+
console.log(dotenv.config())
1313
const connection = mysql.createConnection({
1414
host: DATABASE_MY_HOST,
1515
port: DATABASE_MY_POST,
@@ -19,24 +19,23 @@ const connection = mysql.createConnection({
1919
waitForConnections: true,
2020
connectionLimit: 20,
2121
queueLimit: 0
22-
});
22+
})
2323

24-
function handleError(err) {
24+
function handleError (err) {
2525
if (err) {
2626
// 如果是连接断开,自动重新连接
2727
if (err.code === 'PROTOCOL_CONNECTION_LOST') {
28-
logger.info('数据库连接断开,正在重新连接...');
29-
connection.connect();
28+
logger.info('数据库连接断开,正在重新连接...')
29+
connection.connect()
3030
} else {
31-
logger._log('数据🔗断开、重新连接失败', err);
32-
console.error(err.stack || err);
31+
logger._log('数据🔗断开、重新连接失败', err)
32+
console.error(err.stack || err)
3333
}
3434
}
3535
}
3636
connection.connect(handleError)
37-
connection.on('error', handleError);
38-
37+
connection.on('error', handleError)
3938

4039
module.exports = {
41-
connection,
42-
};
40+
connection
41+
}

logger/index.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
const log4js = require("log4js");
1+
const log4js = require('log4js')
22
log4js.configure({
33
appenders: {
44
dateFile: {
5-
type: "dateFile",
6-
filename: "logs/logs.log",
7-
pattern: "-yyyy-MM-dd",
5+
type: 'dateFile',
6+
filename: 'logs/logs.log',
7+
pattern: '-yyyy-MM-dd',
88
alwaysIncludePattern: true,
9-
compress: true,
9+
compress: true
1010
},
1111
console: {
12-
type: "console",
13-
},
12+
type: 'console'
13+
}
1414
},
1515
categories: {
1616
default: {
17-
appenders: ["dateFile", 'console'],
18-
level: "info",
19-
},
20-
},
21-
});
17+
appenders: ['dateFile', 'console'],
18+
level: 'info'
19+
}
20+
}
21+
})
2222

23-
const logger = log4js.getLogger();
24-
logger.level = "debug";
23+
const logger = log4js.getLogger()
24+
logger.level = 'debug'
2525

26-
module.exports = logger;
26+
module.exports = logger

middleware/auth.js

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
const tokenSalt = 'token_secret';
2-
const jwt = require('jsonwebtoken');
3-
const { connection } = require('../db/mysql');
1+
const tokenSalt = 'token_secret'
2+
const jwt = require('jsonwebtoken')
3+
const { connection } = require('../db/mysql')
44

55
const auth = (req, res, next) => {
6-
const raw = String(req.headers.authorization).split(' ').pop();
7-
let tokenData = {};
8-
try {
9-
tokenData = jwt.verify(raw, tokenSalt);
10-
} catch (e) {
11-
res.send({
12-
code: 0,
13-
msg: '无效token',
14-
});
6+
const raw = String(req.headers.authorization).split(' ').pop()
7+
let tokenData = {}
8+
try {
9+
tokenData = jwt.verify(raw, tokenSalt)
10+
} catch (e) {
11+
res.send({
12+
code: 0,
13+
msg: '无效token'
14+
})
15+
}
16+
const { id } = tokenData
17+
const sql = `select * from user where id = ${id}`
18+
connection.query(sql, (err, data) => {
19+
if (err) {
20+
res.send({
21+
code: 0,
22+
msg: '系统错误'
23+
})
24+
return
1525
}
16-
const { id } = tokenData;
17-
const sql = `select * from user where id = ${id}`;
18-
connection.query(sql, (err, data) => {
19-
if (err) {
20-
res.send({
21-
code: 0,
22-
msg: '系统错误',
23-
});
24-
return;
25-
}
26-
req.user = data[0];
27-
next();
28-
});
29-
};
26+
req.user = data[0]
27+
next()
28+
})
29+
}
3030

31-
module.exports = auth;
31+
module.exports = auth

mock/user.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
const Mock = require("mockjs");
1+
const Mock = require('mockjs')
22

3-
var data = Mock.mock({
3+
const data = Mock.mock({
44
// 属性 list 的值是一个数组,其中含有 1 到 10 个元素
5-
"list|100": [
5+
'list|100': [
66
{
77
// 属性 id 是一个自增数,起始值为 1,每次增 1
8-
"id|+1": 1,
9-
name: "@first",
10-
"age|18-28": 25,
11-
"staff|1": ["前端", "后端", "测试", "运维", "产品", "设计"],
12-
},
13-
],
14-
});
8+
'id|+1': 1,
9+
name: '@first',
10+
'age|18-28': 25,
11+
'staff|1': ['前端', '后端', '测试', '运维', '产品', '设计']
12+
}
13+
]
14+
})
1515

1616
module.exports = {
17-
data,
18-
};
17+
data
18+
}

package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,13 @@
2121
"multiparty": "^4.2.3",
2222
"mysql2": "^2.3.3",
2323
"nodemon": "^2.0.20"
24+
},
25+
"devDependencies": {
26+
"@typescript-eslint/eslint-plugin": "^5.0.0",
27+
"eslint": "^8.0.1",
28+
"eslint-config-standard-with-typescript": "^34.0.0",
29+
"eslint-plugin-import": "^2.25.2",
30+
"eslint-plugin-n": "^15.0.0",
31+
"eslint-plugin-promise": "^6.0.0"
2432
}
2533
}

0 commit comments

Comments
 (0)