usersinfo.js del localuserinfo.js

.env.development

@@ -3,7 +3,7 @@ ENV = 'development'
 
 # base api
 VUE_APP_BASE_CDN = 'http://16.163.228.151:8036'
-VUE_APP_BASE_API = 'http://172.30.40.148:9968'
+VUE_APP_BASE_API = 'http://172.24.222.9:9968'
 VUE_APP_ACCESS_TOKEN_PREFIX = 'Bearer '
 
 

src/layout/components/Sidebar/index.vue

@@ -37,7 +37,6 @@ export default {
     if (this.permission_routes.length <= 0) {
       store.dispatch('permission/generateRoutes', [])
     }
-    console.log('permission_routes---->', this.permission_routes)
   },
   methods: {
   },

src/permission.js

@@ -5,7 +5,8 @@ import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
 import { getToken } from '@/utils/auth' // get token from cookie
 import getPageTitle from '@/utils/get-page-title'
-
+import usersInfo from '@/utils/usersInfo'
+ 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
 const whiteList = ['/login', '/auth-redirect'] // no redirect whitelist
@@ -18,8 +19,7 @@ router.beforeEach(async(to, from, next) => {
   document.title = getPageTitle(to.meta.title)
 
   // determine whether the user has logged in
-  const hasToken = getToken()
-
+  const hasToken = usersInfo.hasLogin() //getToken()
   if (hasToken) {
     if (to.path === '/login') {
       // if is logged in, redirect to the home page
@@ -45,9 +45,9 @@ router.beforeEach(async(to, from, next) => {
           // set the replace: true, so the navigation will not leave a history record
           next({ ...to, replace: true })
         } catch (error) {
-          console.log('------>', error, '<------')
+          usersInfo.clear()
           // remove token and go to login page to re-login
-          await store.dispatch('user/resetToken')
+          // await store.dispatch('user/resetToken')
           // Message.error(error || 'Has Error')
           next(`/login?redirect=${to.path}`)
           NProgress.done()

src/store/modules/user.js

@@ -1,16 +1,7 @@
 import { login, logout, getInfo, isLoginVerify, getUserInfo, getBaseInfo, getMessageData } from '@/api/user'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import router, { resetRouter } from '@/router'
-import { 
-  updateLoginAllInfo, 
-  clear as localClear, 
-  accessToken, 
-  userId as localUserId, 
-  userName as localUserName, 
-  baseData as localBaseData, 
-  clearBaseInfo,
-  setBaseInfo
-} from '@/utils/localUserInfo'
+import usersInfo from '@/utils/usersInfo'
 
 const state = {
   token: getToken(),
@@ -55,16 +46,16 @@ const actions = {
     return new Promise((resolve, reject) => {
       login(requestData, pageId).then(response => {
         // 更新本地accessToken
-        updateLoginAllInfo(response.data)
+        usersInfo.updateLoginAllInfo(response.data)
         commit('SET_TOKEN', response.data.accessToken)
-        setToken(response.data.accessToken)
+        // setToken(response.data.accessToken)
         commit('SET_ROLES', ['admin'])
         commit('SET_NAME', 'userName')
         commit('SET_AVATAR', 'avatar')
         commit('SET_INTRODUCTION', 'introduction')
         resolve()
       }).catch(error => {
-        localClear()
+        usersInfo.clear()
         reject(error)
       })
     })
@@ -82,9 +73,9 @@ const actions = {
     return new Promise((resolve, reject) => {
       getUserInfo(data).then(response => {
         let ret = response.data
-        localUserId(ret.ID)
-        localUserName(ret.USER_NAME)
-        localBaseData({
+        usersInfo.userId(ret.ID)
+        usersInfo.userName(ret.USER_NAME)
+        usersInfo.baseData({
           AVATAR: ret.AVATAR,
           VERIFIED: ret.VERIFIED,
           DEC_LV: ret.DEC_LV,
@@ -103,8 +94,8 @@ const actions = {
     return new Promise((resolve, reject) => {
       getBaseInfo(data).then(response => {
         let ret = response.data
-        clearBaseInfo()
-        setBaseInfo(ret)
+        usersInfo.clearBaseInfo()
+        usersInfo.setBaseInfo(ret)
         resolve(response)
       }).catch(error => {
         reject(error)
@@ -115,8 +106,8 @@ const actions = {
     return new Promise((resolve, reject) => {
       getMessageData(data).then(response => {
         let ret = response.data
-        clearBaseInfo()
-        setBaseInfo(ret)
+        usersInfo.clearBaseInfo()
+        usersInfo.setBaseInfo(ret)
         resolve(response)
       }).catch(error => {
         reject(error)
@@ -129,8 +120,8 @@ const actions = {
     return new Promise((resolve, reject) => {
       commit('SET_TOKEN', '')
       commit('SET_ROLES', [])
-      localClear()
-      localBaseData()
+      usersInfo.clear()
+      usersInfo.baseData()
       removeToken()
       resetRouter()
       // reset visited views and cached views
@@ -194,7 +185,7 @@ const actions = {
     return new Promise(resolve => {
       commit('SET_TOKEN', '')
       commit('SET_ROLES', [])
-      localClear()
+      usersInfo.clear()
       removeToken()
       resolve()
     })

src/utils/localUserInfo.js

@@ -1,192 +0,0 @@
-import tool from './tool'
-import router from '@/router'
-
-export function refreshToken (...arg) {
-  if (arg.length === 0) {
-    return localStorage.getItem('refreshToken')
-  }
-  if (arg[0] === '') {
-    localStorage.removeItem('refreshToken')
-    return
-  }
-  localStorage.setItem('refreshToken', arg[0])
-}
-
-export function accessToken (...arg) {
-  if (arg.length === 0) {
-    return localStorage.getItem('accessToken')
-  }
-  if (arg[0] === '') {
-    localStorage.removeItem('accessToken')
-    return
-  }
-  localStorage.setItem('accessToken', arg[0])
-}
-
-export function accessTokenUpdateAt (...arg) {
-  if (arg.length === 0) {
-    return localStorage.getItem('accessTokenUpdateAt')
-  }
-  if (arg[0] === '') {
-    localStorage.removeItem('accessTokenUpdateAt')
-    return
-  }
-  localStorage.setItem('accessTokenUpdateAt', arg[0])
-}
-
-export function accessTokenExpiresIn (...arg) {
-  if (arg.length === 0) {
-    return localStorage.getItem('accessTokenExpiresIn')
-  }
-  if (arg[0] === '') {
-    localStorage.removeItem('accessTokenExpiresIn')
-    return
-  }
-  localStorage.setItem('accessTokenExpiresIn', arg[0])
-}
-
-export function refreshTokenUpdateAt (...arg) {
-  if (arg.length === 0) {
-    return localStorage.getItem('refreshTokenUpdateAt')
-  }
-  if (arg[0] === '') {
-    localStorage.removeItem('refreshTokenUpdateAt')
-    return
-  }
-  localStorage.setItem('refreshTokenUpdateAt', arg[0])
-}
-
-export function refreshTokenExpiresIn (...arg) {
-  if (arg.length === 0) {
-    return localStorage.getItem('refreshTokenExpiresIn')
-  }
-  if (arg[0] === '') {
-    localStorage.removeItem('refreshTokenExpiresIn')
-    return
-  }
-  localStorage.setItem('refreshTokenExpiresIn', arg[0])
-}
-
-export function loginTimestamp (...arg) {
-  if (arg.length === 0) {
-    return localStorage.getItem('loginTimestamp')
-  }
-  if (arg[0] === '') {
-    localStorage.removeItem('loginTimestamp')
-    return
-  }
-  localStorage.setItem('loginTimestamp', arg[0])
-}
-
-export function baseData (...arg) {
-  if (arg.length === 0) {
-    return JSON.parse(localStorage.getItem('baseData'))
-  }
-  if (arg[0] === '') {
-    localStorage.removeItem('baseData')
-    return
-  }
-  localStorage.setItem('baseData', JSON.stringify(arg[0]))
-}
-
-export function clear() {
-  localStorage.removeItem('userId')
-  localStorage.removeItem('userName')
-  localStorage.removeItem('accessToken')
-  localStorage.removeItem('accessTokenExpiresIn')
-  localStorage.removeItem('accessTokenUpdateAt')
-  localStorage.removeItem('refreshToken')
-  localStorage.removeItem('refreshTokenExpiresIn')
-  localStorage.removeItem('refreshTokenUpdateAt')
-  localStorage.removeItem('loginTimestamp')
-  localStorage.removeItem('baseData')
-  localStorage.removeItem('baseInfo')
-  localStorage.removeItem('MenuPrmStore')
-  localStorage.removeItem('roleList')
-}
-
-export function clearBaseInfo() {
-  localStorage.removeItem('baseInfo')
-}
-
-export function setBaseInfo (info) {
-  localStorage.setItem('baseInfo', JSON.stringify(info))
-}
-export function getBaseInfo (...arg) {
-  let baseInfo = null
-  try {
-    baseInfo = JSON.parse(localStorage.getItem('baseInfo'))
-  } catch(err) {
-    return null
-  }
-  if (baseInfo === null) {
-    return null
-  }
-  if (arg.length === 0 || arg[0] === '') {
-    return baseInfo
-  } else {
-    return baseInfo[arg[0]]
-  }
-}
-
-export function userId(...arg) {
-  if (arg.length === 0) {
-    return localStorage.getItem('userId')
-  }
-  if (arg[0] === '') {
-    localStorage.removeItem('userId')
-    return
-  }
-  localStorage.setItem('userId', arg[0])
-}
-
-export function userName (...arg) {
-  if (arg.length === 0) {
-    return localStorage.getItem('userName')
-  }
-  if (arg[0] === '') {
-    localStorage.removeItem('userName')
-    return
-  }
-  localStorage.setItem('userName', arg[0])
-}
-
-export function updateLoginAllInfo (response) {
-  // 更新本地accessToken
-  accessToken(response.accessToken)
-  accessTokenExpiresIn(response.accessTokenExpiresIn)
-  accessTokenUpdateAt(response.accessTokenUpdateAt)
-  refreshToken(response.refreshToken)
-  refreshTokenExpiresIn(response.refreshTokenExpiresIn)
-  refreshTokenUpdateAt(response.refreshTokenUpdateAt)
-  loginTimestamp(response.accessTokenUpdateAt)
-}
-
-export function hasLogin() {
-  let accessToken = accessToken()
-  if (!accessToken) {
-    return false
-  }
-  // 检测会员的refreshToken是否已经失效，如果已经失效，那么则清空登录信息，返回失败
-  let refreshToken = refreshToken()
-  let refreshTokenExpiresIn = refreshTokenExpiresIn()
-  let refreshTokenUpdateAt = refreshTokenUpdateAt()
-  if (refreshToken && refreshTokenExpiresIn && parseInt(refreshTokenExpiresIn) - 30 + parseInt(refreshTokenUpdateAt) > parseInt(tool.getTimestamp())) {
-    return true
-  } else {
-    clear()
-    // 跳转到登录页
-    if (router.currentRoute.path !== '/login') {
-      router.push('/login')
-    }
-    return false
-  }
-}
-
-export function logout() {
-  clear()
-  // 跳转到登录页
-  if (router.currentRoute.path !== '/login') {
-    router.push('/login')
-  }
-}

src/utils/request.js

@@ -1,8 +1,7 @@
 import axios from 'axios'
 import { MessageBox, Message } from 'element-ui'
 import store from '@/store'
-import { getToken } from '@/utils/auth'
-import { accessToken } from '@/utils/localUserInfo'
+import usersInfo from './usersInfo'
 
 // create an axios instance
 const service = axios.create({
@@ -22,8 +21,8 @@ service.interceptors.request.use(
     //   // please modify it according to the actual situation
     //   config.headers['X-Token'] = getToken()
     // }
-    if (accessToken()) {
-      config.headers['Authorization'] = process.env.VUE_APP_ACCESS_TOKEN_PREFIX + accessToken()
+    if (usersInfo.accessToken()) {
+      config.headers['Authorization'] = process.env.VUE_APP_ACCESS_TOKEN_PREFIX + usersInfo.accessToken()
     }
     return config
   },
@@ -52,6 +51,7 @@ service.interceptors.response.use(
     })
     return
   } else {
+    console.log(responseData)
     if (!data) {
       return {data: responseData}
     }

src/utils/tool.js

@@ -1,7 +1,7 @@
 // import errorCode from './errorCode'
 // import baseInfo from './baseInfo'
 // import {PRICE_IS_ROUND,SERVER_API_HTTP_TYPE,SERVER_API_DOMAIN,CDN_BASE_URL} from './config'
-import localUserInfo from "@/utils/localUserInfo";
+import usersInfo from '@/utils/usersInfo'
 
 let tool = {
   /**
@@ -32,7 +32,7 @@ let tool = {
    * @returns {number}
    */
   getTimestamp(date = null) {
-    let days = baseInfo.daysDiff()
+    let days = usersInfo.daysDiff()
     let dateObj
     if (date !== null) {
       dateObj = new Date(date)
@@ -79,11 +79,11 @@ let tool = {
     }
     if (todo || status === 401) {
       message = todo?'未获得授权，请重新登录':(message==='Your request was made with invalid credentials.'?'未获得授权，请重新登录':message)
-      localUserInfo.logout()
+      usersInfo.logout()
     }
     if (todo || status === 402) {
       message = todo?'长时间未进行操作，请重新登录':(message==='Connection not operated for too long' ?'长时间未进行操作，请重新登录' :message)
-      localUserInfo.logout()
+      usersInfo.logout()
     }
     return {message, todo, status}
   },

src/utils/usersInfo.js

@@ -0,0 +1,208 @@
+import tool from './tool'
+import router from '@/router'
+
+let usersInfo = {
+    refreshToken (...arg) {
+        if (arg.length === 0) {
+            return localStorage.getItem('refreshToken')
+        }
+        if (arg[0] === '') {
+            localStorage.removeItem('refreshToken')
+            return
+        }
+        localStorage.setItem('refreshToken', arg[0])
+    },
+    accessToken (...arg) {
+        if (arg.length === 0) {
+          return localStorage.getItem('accessToken')
+        }
+        if (arg[0] === '') {
+          localStorage.removeItem('accessToken')
+          return
+        }
+        localStorage.setItem('accessToken', arg[0])
+    },
+    accessTokenUpdateAt (...arg) {
+        if (arg.length === 0) {
+            return localStorage.getItem('accessTokenUpdateAt')
+        }
+        if (arg[0] === '') {
+            localStorage.removeItem('accessTokenUpdateAt')
+            return
+        }
+        localStorage.setItem('accessTokenUpdateAt', arg[0])
+    },
+    accessTokenExpiresIn (...arg) {
+        if (arg.length === 0) {
+            return localStorage.getItem('accessTokenExpiresIn')
+        }
+        if (arg[0] === '') {
+            localStorage.removeItem('accessTokenExpiresIn')
+            return
+        }
+        localStorage.setItem('accessTokenExpiresIn', arg[0])
+    },
+    refreshTokenUpdateAt (...arg) {
+        if (arg.length === 0) {
+          return localStorage.getItem('refreshTokenUpdateAt')
+        }
+        if (arg[0] === '') {
+          localStorage.removeItem('refreshTokenUpdateAt')
+          return
+        }
+        localStorage.setItem('refreshTokenUpdateAt', arg[0])
+      },
+      refreshTokenExpiresIn (...arg) {
+        if (arg.length === 0) {
+          return localStorage.getItem('refreshTokenExpiresIn')
+        }
+        if (arg[0] === '') {
+          localStorage.removeItem('refreshTokenExpiresIn')
+          return
+        }
+        localStorage.setItem('refreshTokenExpiresIn', arg[0])
+      },
+      loginTimestamp (...arg) {
+        if (arg.length === 0) {
+          return localStorage.getItem('loginTimestamp')
+        }
+        if (arg[0] === '') {
+          localStorage.removeItem('loginTimestamp')
+          return
+        }
+        localStorage.setItem('loginTimestamp', arg[0])
+      },
+      baseData (...arg) {
+        if (arg.length === 0) {
+          return JSON.parse(localStorage.getItem('baseData'))
+        }
+        if (arg[0] === '') {
+          localStorage.removeItem('baseData')
+          return
+        }
+        localStorage.setItem('baseData', JSON.stringify(arg[0]))
+      },
+      clear() {
+        localStorage.removeItem('userId')
+        localStorage.removeItem('userName')
+        localStorage.removeItem('accessToken')
+        localStorage.removeItem('accessTokenExpiresIn')
+        localStorage.removeItem('accessTokenUpdateAt')
+        localStorage.removeItem('refreshToken')
+        localStorage.removeItem('refreshTokenExpiresIn')
+        localStorage.removeItem('refreshTokenUpdateAt')
+        localStorage.removeItem('loginTimestamp')
+        localStorage.removeItem('baseData')
+        localStorage.removeItem('baseInfo')
+        localStorage.removeItem('MenuPrmStore')
+        localStorage.removeItem('roleList')
+      },
+      clearBaseInfo() {
+        localStorage.removeItem('baseInfo')
+      },
+      setBaseInfo (info) {
+        localStorage.setItem('baseInfo', JSON.stringify(info))
+      },
+      getBaseInfo (...arg) {
+        let baseInfo = null
+        try {
+          baseInfo = JSON.parse(localStorage.getItem('baseInfo'))
+        } catch(err) {
+          return null
+        }
+        if (baseInfo === null) {
+          return null
+        }
+        if (arg.length === 0 || arg[0] === '') {
+          return baseInfo
+        } else {
+          return baseInfo[arg[0]]
+        }
+      },
+      userId(...arg) {
+        if (arg.length === 0) {
+          return localStorage.getItem('userId')
+        }
+        if (arg[0] === '') {
+          localStorage.removeItem('userId')
+          return
+        }
+        localStorage.setItem('userId', arg[0])
+      },
+      userName (...arg) {
+        if (arg.length === 0) {
+          return localStorage.getItem('userName')
+        }
+        if (arg[0] === '') {
+          localStorage.removeItem('userName')
+          return
+        }
+        localStorage.setItem('userName', arg[0])
+      },
+      updateLoginAllInfo (response) {
+        // 更新本地accessToken
+        this.accessToken(response.accessToken)
+        this.accessTokenExpiresIn(response.accessTokenExpiresIn)
+        this.accessTokenUpdateAt(response.accessTokenUpdateAt)
+        this.refreshToken(response.refreshToken)
+        this.refreshTokenExpiresIn(response.refreshTokenExpiresIn)
+        this.refreshTokenUpdateAt(response.refreshTokenUpdateAt)
+        this.loginTimestamp(response.accessTokenUpdateAt)
+      },
+      hasLogin() {
+        let accessToken = this.accessToken()
+        if (!accessToken) {
+          return false
+        }
+        // 检测会员的refreshToken是否已经失效，如果已经失效，那么则清空登录信息，返回失败
+        let refreshToken = this.refreshToken()
+        let refreshTokenExpiresIn = this.refreshTokenExpiresIn()
+        let refreshTokenUpdateAt = this.refreshTokenUpdateAt()
+        if (refreshToken && refreshTokenExpiresIn && parseInt(refreshTokenExpiresIn) - 30 + parseInt(refreshTokenUpdateAt) > parseInt(tool.getTimestamp())) {
+          return true
+        } else {
+            this.clear()
+          // 跳转到登录页
+          if (router.currentRoute.path !== '/login') {
+            router.push('/login')
+          }
+          return false
+        }
+      },
+      logout() {
+        this.clear()
+        // 跳转到登录页
+        if (router.currentRoute.path !== '/login') {
+          router.push('/login')
+        }
+      },
+      daysDiff() {
+        return this.get('daysDiff')
+      },
+      get(...arg) {
+        let baseInfo = null
+        try {
+          baseInfo = JSON.parse(localStorage.getItem('baseInfo'))
+        } catch(err) {
+          return null
+        }
+        if (baseInfo === null) {
+          return null
+        }
+        if (arg.length === 0 || arg[0] === '') {
+          return baseInfo
+        } else {
+          return baseInfo[arg[0]]
+        }
+      }
+}
+
+export default usersInfo
+
+
+
+
+
+
+
+

src/views/dashboard/admin/index.vue

@@ -156,7 +156,6 @@ export default {
       this.rmBv = ret.myRemainPv
       this.endTime = ret.activeEnd
       this.imgLoad();
-      console.log(this.news)
     })
     .catch((error) => {
     })

src/views/dashboard/index.vue

@@ -25,7 +25,6 @@ export default {
     ])
   },
   created() {
-    // console.log(this.roles)
     if (!this.roles.includes('admin')) {
       this.currentRole = 'adminDashboard'
     }

src/views/login/index.vue

@@ -93,6 +93,7 @@
 import { validUsername } from '@/utils/validate'
 import LangSelect from '@/components/LangSelect'
 import SocialSign from './components/SocialSignin'
+import usersInfo from '@/utils/usersInfo'
 
 export default {
   name: 'Login',
@@ -204,6 +205,7 @@ export default {
               this.loading = false
               this.$router.push({ path: this.redirect || '/', query: this.otherQuery })
             }).catch(error => {
+              usersInfo.clear()
               this.refreshLoginVerifyStatus();
               if( this.isLoginVerify ) {
                 this.changeCaptcha()

vue.config.js

@@ -38,7 +38,7 @@ module.exports = {
     },
     proxy: {
       [process.env.VUE_APP_BASE_API]:{
-        target:"http://172.18.219.250:9968",
+        target:"http://172.30.40.148:9968",
         changeOrigin:true,
         pathRewrite:{
           ["^" + process.env.VUE_APP_BASE_API] : ""