From 84ef53c807ec6dddf4a0226b11b0e0f9f6d9cec0 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 27 七月 2023 10:21:13 +0800
Subject: [PATCH] 1.项目优化
---
src/utils/request.js | 87 +++++++----------------------
src/permission.js | 12 +++-
src/store/modules/user.js | 28 --------
src/main.js | 17 -----
src/views/login/index.vue | 26 --------
src/layout/components/Sidebar/index.vue | 3
6 files changed, 33 insertions(+), 140 deletions(-)
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index acd2ac3..1cf2f64 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -42,7 +42,7 @@
<div v-if="!$store.state.settings.menuIsHorizontal" style="position: absolute;bottom: 20px;left: 30px;">
<div>
<el-button v-if="$store.state.app.sidebar.opened" type="text" style="font-size: 14px;cursor: pointer">
- 鏂板嚡杩埗閫燰1.6.53
+ 鏂板嚡杩埗閫燰2.0.0
</el-button>
<!-- <el-button type="text"><a href="http://www.ykxkd.com/" target="_blank">鏂板嚡杩埗閫燰1.0.01</a></el-button>-->
</div>
@@ -56,7 +56,6 @@
import Logo from './Logo'
import SidebarItem from './SidebarItem'
import variables from '@/styles/variables.scss'
-import { LoginMenu } from '@/api/user'
import { removeCookie, setCookie } from '@/utils/auth'
export default {
diff --git a/src/main.js b/src/main.js
index 0754da0..d918a7d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -70,23 +70,6 @@
// 寮曠敤淇敼杩囩殑gantt
Vue.use(vGanttChart)
-import { setCookie } from '@/utils/auth' // 寮曠敤淇敼杩囩殑gantt
-// 鍒ゆ柇鏄惁璧板師骞冲彴杩囨潵
-if (window.location.hash.indexOf('guid') !== -1) {
- setCookie('cloud', true)// 璧颁簯骞冲彴
-
- const url = window.location.hash.split('?')[1]
- const arr = url.split('&')
- setCookie('guid', arr[0].split('=')[1])
- setCookie('userid', arr[1].split('=')[1])
- setCookie('admin', arr[2].split('=')[1])
- setCookie('navTabId', arr[2].split('=')[1])
- setCookie('username', decodeURIComponent(arr[3].split('=')[1]))
- setCookie('password', arr[4].split('=')[1])
- setCookie('usertype', arr[5].split('=')[1])
- setCookie('rediskey', arr[6].split('=')[1])
-}
-
new Vue({
el: '#app',
router,
diff --git a/src/permission.js b/src/permission.js
index 8a798bb..4bf6ecc 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,8 +3,9 @@
import { Message } from 'element-ui'
import NProgress from 'nprogress' // progress bar
import 'nprogress/nprogress.css' // progress bar style
-import { getCookie, getToken } from '@/utils/auth' // get token from cookie
+import { getCookie, getToken, setCookie } from '@/utils/auth' // get token from cookie
import getPageTitle from '@/utils/get-page-title'
+import { decode } from 'jsonwebtoken'
NProgress.configure({ showSpinner: false }) // NProgress Configuration
@@ -27,15 +28,20 @@
next({ path: '/' })
NProgress.done()
} else {
- // const hasGetUserInfo = store.getters.name
const hasGetUserInfo = store.getters.name
- // const hasGetUserInfo = getCookie('usercode')
if (hasGetUserInfo) {
next()
} else {
try {
// 鎷夊彇info
// const info = await store.dispatch('user/getInfo')
+
+ // jwt瑙ｅ瘑鑾峰彇鐢ㄦ埛缂栫爜
+ const jwt = decode(localStorage.getItem('token'))
+ setCookie('usercode', jwt.usercode)
+ setCookie('stu_torgname', jwt.stu_torgname)
+ setCookie('username', jwt.username)
+
// 鎷夊彇鑿滃崟淇℃伅琛�
const menu = await store.dispatch('user/getMenu')
// 鐢熸垚鍙闂殑璺敱琛�
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 071da96..f4d9ffd 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -94,35 +94,15 @@
getMenu({ commit, state }) {
return new Promise((resolve, reject) => {
console.log('杩涙潵浜�11111')
- // if (getCookie('cloud')) { // 璧颁簯
- // LoginMenuCloud({ enterpriseUserName: getCookie('admin') }).then(res => {
- // if (res.code === 200) {
- // commit('SET_NAME', res.msg)
- // commit('SET_MENU', res.data)
- // resolve(res.data)
- // }
- // }).catch(error => {
- // reject(error)
- // })
- // } else {
- // debugger
- // 鏄庡ぉ鐨勭湅涓媢sercode缂栫爜鍔ㄦ��
- LoginMenu({ usertype: 'PC', usercode: '999' }).then(res => {
+ LoginMenu({ usertype: 'PC', usercode: getCookie('usercode') }).then(res => {
if (res.code === '200') {
commit('SET_NAME', res.message)
commit('SET_MENU', res.data)
resolve(res.data)
}
- // if (res.code === '303') {
- // debugger
- // localStorage.removeItem('token')
- // // window.location.reload()
- // // resolve(res.data)
- // }
}).catch(error => {
reject(error)
})
- // }
})
},
@@ -158,16 +138,12 @@
removeCookie('stu_torgcode')
removeCookie('stu_torgname')
removeCookie('description')
-
removeCookie('guid')
// reset visited views and cached views
dispatch('tagsView/delAllViews', null, { root: true })
+
sessionStorage.removeItem('tabViews')
- if (getCookie('cloud')) {
- removeCookie('cloud')
- window.location.href = 'http://182.61.13.206/choose'
- }
commit('RESET_STATE')
resolve()
diff --git a/src/utils/request.js b/src/utils/request.js
index d1eb8ba..3cb3d4e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,32 +1,18 @@
import axios from 'axios'
-import { MessageBox, Message } from 'element-ui'
+import { Message, Notification } from 'element-ui'
import store from '@/store'
-import { getCookie, getToken, removeCookie, setCookie } from '@/utils/auth'
-import { handleDatetime } from '@/utils/global'
-// create an axios instance
+import { removeCookie } from '@/utils/auth'
const service = axios.create({
baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
withCredentials: true, // send cookies when cross-domain requests
timeout: 10000 // request timeout
})
-// axios.defaults.withCredentials = true
// request interceptor
service.interceptors.request.use(
config => {
// do something before request is sent
-
- // if (getCookie('admin')) {
- // let each request carry token
- // ['X-Token'] is a custom headers key
- // please modify it according to the actual situation
- // config.headers['X-Token'] = getToken()
- // config.headers['Authorization'] = 'admin=' + getCookie('admin') + ';navTabId=' + getCookie('navTabId')
- // config.headers['Cookie'] = 'admin=' + getCookie('admin') + ';navTabId=' + getCookie('navTabId')
- // document.cookie = 'admin=' + getCookie('admin') + ';navTabId=' + getCookie('navTabId')
- // document.cookie = 'admin'
- // }
config.headers['Token'] = localStorage.getItem('token')
return config
},
@@ -54,39 +40,25 @@
// if the custom code is not 20000, it is judged as an error.
if (res.code === '300' || res.code === '303') {
- Message({
- message: res.Message || 'Error',
- type: 'error',
- duration: 5 * 1000
- })
+ if (res.code === '300') {
+ Message({
+ message: res.Message || 'Error',
+ type: 'error',
+ duration: 5 * 1000
+ })
+ }
if (res.code === '303') {
- removeCookie('ruleCode')
- removeCookie('username')
- removeCookie('admin')
- removeCookie('navTabId')
- removeCookie('usertype')
- removeCookie('userid')
- removeCookie('rediskey')
- removeCookie('code')
- removeCookie('guid')
-
- removeCookie('stu_torgcode')
- removeCookie('stu_torgname')
- removeCookie('description')
-
- // if (getCookie('cloud')) {
- // removeCookie('cloud')
- // setTimeout(() => {
- // sessionStorage.removeItem('tabViews')
- // window.location.href = 'http://182.61.13.206/choose'
- // }, 1000 * 2)
- // } else {
- setTimeout(() => {
- localStorage.removeItem('token')
- sessionStorage.removeItem('tabViews')
- window.location.reload()
- }, 1000 * 2)
- // }
+ // Notification({
+ // message: res.Message || 'Error',
+ // type: 'error',
+ // duration: 5 * 1000
+ // })
+ removeCookie('usercode')
+ localStorage.removeItem('token')
+ sessionStorage.removeItem('tabViews')
+ // setTimeout(() => {
+ // window.location.reload()
+ // }, 1000)
}
// 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
// if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
@@ -103,24 +75,7 @@
// }
store.state.app.buttonIsDisabled = false // 灏嗘寜閽彉鍥炲彲鐐瑰嚮
return Promise.reject(new Error(res.message || 'Error'))
- }
- // else if (res.code === '303') {
- // console.log(res.code, 888)
- // Message({
- // message: res.Message || 'Error',
- // type: 'error',
- // duration: 5 * 1000
- // })
- // removeCookie('ruleCode')
- // removeCookie('username')
- // removeCookie('admin')
- // removeCookie('navTabId')
- // removeCookie('usertype')
- // removeCookie('userid')
- // removeCookie('code')
- // this.$router.push({ path: this.redirect || '/' })
- // }
- else {
+ } else {
return res
}
},
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 65d42f8..0a0ff51 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -221,10 +221,6 @@
if (getCookie('code') === '302') {
this.dialogVisible = true
} else {
- // console.log(typeof getCookie('description'))
- // console.log(getCookie('description') === '')
- // this.$store.state.settings.orgType = getCookie('description')// 缁勭粐绫诲瀷
- // console.log(this.$store.state.settings.orgType, 88)
this.$router.push({ path: this.redirect || '/' })
}
this.loading = false
@@ -239,31 +235,9 @@
},
dialogVisibleCancel() {
- // removeCookie('username')
- // removeCookie('admin')
- // removeCookie('navTabId')
- // removeCookie('usertype')
- // removeCookie('userid')
- // removeCookie('code')
- // removeCookie('stu_torgcode')
- // removeCookie('stu_torgname')
- // removeCookie('description')
this.dialogVisible = false
},
async dialogVisibleConfirm() {
- // const usercode = getCookie('navTabId')
- // const username = getCookie('admin')
- // const usertype = getCookie('usertype')
- // const userid = getCookie('userid')
- // const stu_torgcode = getCookie('stu_torgcode')
- // const data = {
- // usercode,
- // username,
- // usertype,
- // userid,
- // rid: '',
- // stu_torgcode
- // }
const data = {
token: localStorage.getItem('token'),
rid: ''
--
Gitblit v1.9.3