合并分支

lms/nladmin-ui/src/store/modules/user.js

@@ -32,7 +32,7 @@ const user = {
       return new Promise((resolve, reject) => {
         login(userInfo.username, userInfo.password, userInfo.code, userInfo.uuid).then(res => {
           console.log('登录信息：', res)
-          window.localStorage.setItem('sso_domain',res.domain);
+          window.localStorage.setItem('sso_domain', res.domain)
           setToken(res.token, rememberMe)
           commit('SET_TOKEN', res.token)
           setUserInfo(res.user, commit)

lms/nladmin-ui/src/utils/auth.js

@@ -11,7 +11,7 @@ export function setToken(token, rememberMe) {
   const domain = window.localStorage.getItem('sso_domain')
   if (rememberMe) {
     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() {