* 增加Docker开发环境

* 更新Dockerfile构建文件,升级NodeJS依赖版本。
 * 遵循ESLint重新格式化代码,修复部分警告
 * 登录Token失效增加登出提示
 * 网络请求问题增加错误错误提示
 * 升级UI依赖库
This commit is contained in:
yaziming
2020-06-19 16:57:00 +08:00
parent e7ff02589b
commit aeaa4493a7
129 changed files with 18222 additions and 14180 deletions

View File

@@ -1,10 +1,11 @@
import request from '../../api/request'
import { getToken, setToken, removeToken } from '@/utils/auth'
const user = {
namespaced: true,
state: {
// token: getToken(),
token: getToken(),
name: '',
avatar: '',
roles: [],
@@ -22,13 +23,13 @@ const user = {
},
getters: {
userInfo (state) {
userInfo(state) {
if (state.userInfo) return state.userInfo
const userInfoStr = window.localStorage.getItem('user_info')
if (!userInfoStr) return {}
return JSON.parse(userInfoStr)
},
token () {
token() {
return window.localStorage.getItem('token')
}
},
@@ -71,43 +72,41 @@ const user = {
actions: {
// 登录
async login ({ commit }, userInfo) {
async login({ commit }, userInfo) {
const username = userInfo.username.trim()
let res
res = await request.post('/login', { username, password: userInfo.password })
const res = await request.post('/login',
{ username, password: userInfo.password })
if (res.status === 200) {
const token = res.data.data
commit('SET_TOKEN', token)
window.localStorage.setItem('token', token)
setToken(token)
}
return res
},
// 获取用户信息
getInfo ({ commit, state }) {
return request.get('/me')
.then(response => {
// ensure compatibility
if (!response.data.data.setting.max_error_log) {
response.data.data.setting.max_error_log = 1000
}
if (!response.data.data.setting.log_expire_duration) {
response.data.data.setting.log_expire_duration = 3600 * 24
}
commit('SET_USER_INFO', response.data.data)
window.localStorage.setItem('user_info', JSON.stringify(response.data.data))
})
async getInfo({ commit, state }) {
const response = await request.get('/me')
// ensure compatibility
if (!response.data.data.setting.max_error_log) {
response.data.data.setting.max_error_log = 1000
}
commit('SET_USER_INFO', response.data.data)
window.localStorage.setItem('user_info',
JSON.stringify(response.data.data))
},
// 修改用户信息
postInfo ({ commit }, form) {
postInfo({ commit }, form) {
return request.post('/me', form)
},
// 注册
register ({ dispatch, commit, state }, userInfo) {
register({ dispatch, commit, state }, userInfo) {
return new Promise((resolve, reject) => {
request.put('/users', { username: userInfo.username, password: userInfo.password })
request.put('/users',
{ username: userInfo.username, password: userInfo.password })
.then(() => {
resolve()
})
@@ -118,7 +117,7 @@ const user = {
},
// 登出
logout ({ commit, state }) {
logout({ commit, state }) {
return new Promise((resolve, reject) => {
window.localStorage.removeItem('token')
window.localStorage.removeItem('user_info')
@@ -128,9 +127,13 @@ const user = {
resolve()
})
},
async resetToken({ commit }) {
commit('SET_TOKEN', '')
commit('SET_ROLES', [])
removeToken()
},
// 获取用户列表
getUserList ({ commit, state }) {
getUserList({ commit, state }) {
return new Promise((resolve, reject) => {
request.get('/users', {
page_num: state.pageNum,
@@ -144,34 +147,34 @@ const user = {
},
// 删除用户
deleteUser ({ state }, id) {
deleteUser({ state }, id) {
return request.delete(`/users/${id}`)
},
// 编辑用户
editUser ({ state }) {
editUser({ state }) {
return request.post(`/users/${state.userForm._id}`, state.userForm)
},
// 添加用户
addUser ({ dispatch, commit, state }) {
addUser({ dispatch, commit, state }) {
return request.put('/users-add', state.userForm)
},
// 新增全局变量
addGlobalVariable ({ commit, state }) {
addGlobalVariable({ commit, state }) {
return request.put(`/variable`, state.globalVariableForm)
.then(() => {
state.globalVariableForm = {}
})
},
// 获取全局变量列表
getGlobalVariable ({ commit, state }) {
getGlobalVariable({ commit, state }) {
request.get('/variables').then((response) => {
commit('SET_GLOBAL_VARIABLE_LIST', response.data.data)
})
},
// 删除全局变量
deleteGlobalVariable ({ commit, state }, id) {
deleteGlobalVariable({ commit, state }, id) {
return request.delete(`/variable/${id}`)
}
}