Commit 1f5e5949 authored by 智勇's avatar 智勇

登录

parent 1d9982ae
module.exports = { module.exports = {
NODE_ENV: '"development"', NODE_ENV: '"development"',
ENV_CONFIG: '"dev"', ENV_CONFIG: '"dev"',
QA_API: '"http://127.0.0.1:3003"', QA_API: '"http://172.30.220.22:3003"',
TESTDATA_API: '"http://127.0.0.1:3333"' TESTDATA_API: '"http://172.30.220.22:3333"'
} }
import request from '@/utils/request' import request from '@/utils/request'
export function loginByUsername(username, password) { export function loginByUsername(username, password) {
const data = { let authStr = window.btoa(
username, `user=${username}@quantgroup.cn&password=${password}`
password )
} authStr = encodeURIComponent(authStr)
return request({ return request({
url: '/login/login', url: '/user/login',
method: 'post', method: 'post',
data data: { auth: authStr }
}) })
} }
...@@ -21,9 +21,8 @@ export function logout() { ...@@ -21,9 +21,8 @@ export function logout() {
export function getUserInfo(token) { export function getUserInfo(token) {
return request({ return request({
url: '/user/info', url: '/user/check_token',
method: 'get', method: 'get',
params: { token } params: { token }
}) })
} }
...@@ -49,11 +49,14 @@ const user = { ...@@ -49,11 +49,14 @@ const user = {
const username = userInfo.username.trim() const username = userInfo.username.trim()
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
loginByUsername(username, userInfo.password).then(response => { loginByUsername(username, userInfo.password).then(response => {
const data = response.data if (response.data.code !== '0000') {
console.log(1, response.data.msg)
reject(`${response.data.msg}`)
}
const data = response.data.data
commit('SET_TOKEN', data.token) commit('SET_TOKEN', data.token)
// setToken('14d64dde-13d6-4af3-8654-31d4100eb616') setToken(data.token)
setToken(response.data.token) resolve(response)
resolve()
}).catch(error => { }).catch(error => {
reject(error) reject(error)
}) })
...@@ -64,21 +67,20 @@ const user = { ...@@ -64,21 +67,20 @@ const user = {
GetUserInfo({ commit, state }) { GetUserInfo({ commit, state }) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getUserInfo(state.token).then(response => { getUserInfo(state.token).then(response => {
// 由于mockjs 不支持自定义状态码只能这样hack if (response.data.code !== '0000') {
if (!response.data) {
reject('Verification failed, please login again.') reject('Verification failed, please login again.')
} }
const data = response.data const data = response.data
data.roles = ['admin']
if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组 if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', data.roles) commit('SET_ROLES', data.roles)
} else { } else {
reject('getInfo: roles must be a non-null array!') reject('getInfo: roles must be a non-null array!')
} }
commit('SET_NAME', data.name) commit('SET_NAME', data.name)
commit('SET_AVATAR', data.avatar) // commit('SET_AVATAR', data.avatar)
commit('SET_INTRODUCTION', data.introduction) // commit('SET_INTRODUCTION', data.introduction)
resolve(response) resolve(response)
}).catch(error => { }).catch(error => {
reject(error) reject(error)
......
...@@ -3,8 +3,10 @@ ...@@ -3,8 +3,10 @@
*/ */
export function isvalidUsername(str) { export function isvalidUsername(str) {
const valid_map = ['admin', 'editor'] // const valid_map = ['admin', 'editor']
return valid_map.indexOf(str.trim()) >= 0 // return valid_map.indexOf(str.trim()) >= 0
const reg = /^[A-Za-z0-9.]+$/
return reg.test(str)
} }
/* 合法uri*/ /* 合法uri*/
......
...@@ -98,8 +98,8 @@ export default { ...@@ -98,8 +98,8 @@ export default {
} }
return { return {
loginForm: { loginForm: {
username: 'admin', username: 'qahome',
password: '1111111' password: 'Quantgroup123'
}, },
loginRules: { loginRules: {
username: [{ required: true, trigger: 'blur', validator: validateUsername }], username: [{ required: true, trigger: 'blur', validator: validateUsername }],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment