From d25b1cb5dcc34e0a77f4df95cfba1a5fea0e91a4 Mon Sep 17 00:00:00 2001 From: zuiidea Date: Sat, 1 Apr 2017 14:47:42 +0800 Subject: [PATCH] mock login --- package.json | 5 +-- src/components/Layout/Sider.js | 4 +-- src/mock/app.js | 63 ++++++++++++++-------------------- src/mock/users.js | 1 - src/routes/login/index.js | 4 +-- src/utils/config.js | 9 ++--- 6 files changed, 32 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index 9550420..ef0816e 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,5 @@ { "private": true, - "entry": { - "index": "./src/index.js" - }, "dependencies": { "antd": "^2.7.3", "classnames": "^2.2.5", @@ -53,7 +50,7 @@ "lint" ], "scripts": { - "dev": "set BROWSER=none&&roadhog server", + "dev": "roadhog server --open=fasle", "lint": "eslint --fix --ext .js src", "build": "atool-build" }, diff --git a/src/components/Layout/Sider.js b/src/components/Layout/Sider.js index a143ef5..0c7ae2e 100644 --- a/src/components/Layout/Sider.js +++ b/src/components/Layout/Sider.js @@ -15,8 +15,8 @@ function Sider ({ siderFold, darkTheme, location, changeTheme, navOpenKeys, chan return (
- {'logo'} - {siderFold ? '' : {config.logoText}} + {'logo'} + {siderFold ? '' : {config.name}}
{!siderFold ?
diff --git a/src/mock/app.js b/src/mock/app.js index 2e40bbb..4daeb43 100644 --- a/src/mock/app.js +++ b/src/mock/app.js @@ -1,3 +1,5 @@ +const qs = require('qs') + const userPermission = { DEFAULT: ['dashboard', 'chart'], ADMIN: ['dashboard', 'users', 'UIElement', 'UIElementIconfont', 'chart'], @@ -6,16 +8,19 @@ const userPermission = { const adminUsers = [ { + id: 0, username: 'admin', password: 'admin', permissions: userPermission.ADMIN, }, { + id: 1, username: 'guest', password: 'guest', permissions: userPermission.DEFAULT, }, { + id: 2, username: '吴彦祖', password: '123456', permissions: userPermission.DEVELOPER, @@ -24,55 +29,37 @@ const adminUsers = [ module.exports = { 'POST /api/login' (req, res) { - console.log(req.query) - console.log(req.params) console.log(req.body) - // console.log(req.baseUrl) - // console.log(req.cookies) - // console.log(req.hostname) - // console.log(req.fresh) - // const userItem = JSON.parse(req.body) - // const response = { - // success: false, - // message: '', - // } - // const currentUser = AdminUsers.filter((item) => { - // return item.username === userItem.username - // }) - // if (currentUser.length) { - // if (currentUser[0].password === userItem.password) { - // const now = new Date() - // now.setDate(now.getDate() + 1) - // // Cookie.set('user_session', now.getTime(), { path: '/' }) - // // Cookie.set('user_name', userItem.username, { path: '/' }) - // response.message = '登录成功' - // response.success = true - // response.userPermissions = AdminUsers.filter(_ => _.username === userItem.username)[0].permissions - // } else { - // response.message = '密码不正确' - // } - // } else { - // response.message = '用户不存在' - // } - // res.json(req) - // res.end({ success: true }) const now = new Date() now.setDate(now.getDate() + 1) - res.cookie('user_session', now.getTime(), { maxAge: 900000, httpOnly: true }) + res.cookie('token', JSON.stringify({ + id: 2, + deadline: now.getTime(), + }), { maxAge: 900000, httpOnly: true }) res.json({ success: true, - message: '登录', + message: '登录成功', }) }, 'GET /api/userInfo' (req, res) { - const response = { - // success: Cookie.get('user_session') && Cookie.get('user_session') > new Date().getTime(), - // username: Cookie.get('user_name') || '', - message: '', + const cookies = qs.parse(req.headers.cookie, { delimiter: ';' }) + const response = {} + if (!cookies.token) { + res.json({ + success: false, + }) + return + } + const token = JSON.parse(cookies.token) + if (token) { + response.success = token.deadline > new Date().getTime() } if (response.success) { - // response.userPermissions = AdminUsers.filter(_ => _.username === Cookie.get('user_name'))[0].permissions + const userItem = adminUsers.filter(_ => _.id === token.id) + if (userItem.length > 0) { + response.userPermissions = userItem[0].permissions + } } res.json(response) }, diff --git a/src/mock/users.js b/src/mock/users.js index b0fbf62..2f156a8 100644 --- a/src/mock/users.js +++ b/src/mock/users.js @@ -30,7 +30,6 @@ let usersListData = antdAdminUsersList module.exports = { 'GET /api/users' (req, res) { - console.log(req.query) const page = qs.parse(req.query) const pageSize = page.pageSize || 10 const currentPage = page.page || 1 diff --git a/src/routes/login/index.js b/src/routes/login/index.js index 4875ebc..0cdf353 100644 --- a/src/routes/login/index.js +++ b/src/routes/login/index.js @@ -25,8 +25,8 @@ const login = ({ return (
- {'logo'} - Ant Design + {'logo'} + {config.name}
diff --git a/src/utils/config.js b/src/utils/config.js index f2f023b..49cbf49 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -1,15 +1,10 @@ module.exports = { - name: 'Ant Design Admin', + name: 'AntD Admin', prefix: 'antdAdmin', footerText: 'Ant Design Admin 版权所有 © 2016 由 zuiidea 支持', - logoSrc: 'https://t.alipayobjects.com/images/T1QUBfXo4fXXXXXXXX.png', - logoText: 'Antd Admin', - needLogin: true, + logo: 'https://t.alipayobjects.com/images/T1QUBfXo4fXXXXXXXX.png', iconFontUrl: '//at.alicdn.com/t/font_c4y7asse3q1cq5mi.js', baseURL: 'http://47.92.30.98:7001/api', - crossDomains: [ - 'http://www.zuimeitianqi.com', - ], YQL: ['http://www.zuimeitianqi.com'], CORS: ['http://localhost:7001'], }