合并分支
This commit is contained in:
@@ -32,7 +32,7 @@ const user = {
|
|||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
login(userInfo.username, userInfo.password, userInfo.code, userInfo.uuid).then(res => {
|
login(userInfo.username, userInfo.password, userInfo.code, userInfo.uuid).then(res => {
|
||||||
console.log('登录信息:', res)
|
console.log('登录信息:', res)
|
||||||
window.localStorage.setItem('sso_domain',res.domain);
|
window.localStorage.setItem('sso_domain', res.domain)
|
||||||
setToken(res.token, rememberMe)
|
setToken(res.token, rememberMe)
|
||||||
commit('SET_TOKEN', res.token)
|
commit('SET_TOKEN', res.token)
|
||||||
setUserInfo(res.user, commit)
|
setUserInfo(res.user, commit)
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ export function setToken(token, rememberMe) {
|
|||||||
const domain = window.localStorage.getItem('sso_domain')
|
const domain = window.localStorage.getItem('sso_domain')
|
||||||
if (rememberMe) {
|
if (rememberMe) {
|
||||||
return Cookies.set(TokenKey, token, { domain: domain, path: '/', expires: Config.tokenCookieExpires })
|
return Cookies.set(TokenKey, token, { domain: domain, path: '/', expires: Config.tokenCookieExpires })
|
||||||
} else return Cookies.set(TokenKey, { domain: domain, path: '/' })
|
} else return Cookies.set(TokenKey, token, { domain: domain, path: '/' })
|
||||||
}
|
}
|
||||||
|
|
||||||
export function removeToken() {
|
export function removeToken() {
|
||||||
|
|||||||
Reference in New Issue
Block a user