From a9ff576958d0eb973a4e270e4e0e1223a4fbed6f Mon Sep 17 00:00:00 2001 From: zuiidea Date: Mon, 10 Apr 2017 23:33:10 +0800 Subject: [PATCH] login --- package.json | 5 +++-- src/mock/app.js | 28 ++++++++++++++++++---------- src/routes/request/index.js | 9 +++++++++ 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 306ad85..9fe2c29 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "recharts": "^0.19.0" }, "devDependencies": { + "antd": "^2.9.1", "atool-build": "^0.7.6", "axios": "^0.15.3", "babel-eslint": "^6.1.2", @@ -43,14 +44,14 @@ "mockjs": "^1.0.1-beta3", "rc-tween-one": "^1.0.0", "redbox-react": "^1.2.10", - "roadhog": "0.6.0-beta.3", + "roadhog": "^0.6.0-beta.3", "watchjs": "^0.0.0" }, "pre-commit": [ "lint" ], "scripts": { - "dev": "roadhog server --open=fasle", + "dev": "set BROWSER=none&&roadhog server", "lint": "eslint --fix --ext .js src", "build": "roadhog build" }, diff --git a/src/mock/app.js b/src/mock/app.js index 0ad9e8f..37973d6 100644 --- a/src/mock/app.js +++ b/src/mock/app.js @@ -29,16 +29,23 @@ const adminUsers = [ module.exports = { 'POST /api/login' (req, res) { - const now = new Date() - now.setDate(now.getDate() + 1) - res.cookie('token', JSON.stringify({ - id: 2, - deadline: now.getTime(), - }), { maxAge: 900000, httpOnly: true }) - res.json({ - success: true, - message: '登录成功', - }) + const { username, password } = req.body + + const user = adminUsers.filter((item) => item.username === username) + if (user && user[0].password === password) { + const now = new Date() + now.setDate(now.getDate() + 1) + res.cookie('token', JSON.stringify({ + id: 2, + deadline: now.getTime(), + }), { maxAge: 900000, httpOnly: true }) + res.json({ + success: true, + message: '登录成功', + }) + } else { + res.status(400).send({ message: 'Bad Request' }) + } }, 'GET /api/userInfo' (req, res) { @@ -60,6 +67,7 @@ module.exports = { response.userPermissions = userItem[0].permissions } } + console.log(response) res.json(response) }, diff --git a/src/routes/request/index.js b/src/routes/request/index.js index 5fb497b..26c8e5a 100644 --- a/src/routes/request/index.js +++ b/src/routes/request/index.js @@ -16,6 +16,15 @@ const requestOptions = [ url: `${location.origin}/api/users`, desc: 'intercept request by mock.js', }, + { + url: `${location.origin}/api/login`, + method: 'post', + data: { + username: 'admin', + password: 'admin6', + }, + desc: 'intercept request by mock.js', + }, { url: `${location.origin}/api/users`, desc: 'intercept request by mock.js',