diff --git a/rtsp-vue/src/layout/components/Navbar.vue b/rtsp-vue/src/layout/components/Navbar.vue
index e555871..5f2c124 100644
--- a/rtsp-vue/src/layout/components/Navbar.vue
+++ b/rtsp-vue/src/layout/components/Navbar.vue
@@ -17,7 +17,7 @@
-
+
@@ -48,10 +48,7 @@ import Breadcrumb from '@/components/Breadcrumb'
import TopNav from '@/components/TopNav'
import Hamburger from '@/components/Hamburger'
import Screenfull from '@/components/Screenfull'
-import SizeSelect from '@/components/SizeSelect'
import HeaderSearch from '@/components/HeaderSearch'
-import RuoYiGit from '@/components/RuoYi/Git'
-import RuoYiDoc from '@/components/RuoYi/Doc'
import useAppStore from '@/store/modules/app'
import useUserStore from '@/store/modules/user'
import useSettingsStore from '@/store/modules/settings'
diff --git a/rtsp-vue/src/utils/request.js b/rtsp-vue/src/utils/request.js
index 00b910f..f7c1808 100644
--- a/rtsp-vue/src/utils/request.js
+++ b/rtsp-vue/src/utils/request.js
@@ -1,5 +1,5 @@
import axios from 'axios'
-import { ElNotification , ElMessageBox, ElMessage, ElLoading } from 'element-plus'
+import { ElNotification, ElMessageBox, ElMessage, ElLoading } from 'element-plus'
import { getToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
import { tansParams, blobValidate } from '@/utils/ruoyi'
@@ -67,46 +67,53 @@ service.interceptors.request.use(config => {
}
return config
}, error => {
- console.log(error)
- Promise.reject(error)
+ console.log(error)
+ Promise.reject(error)
})
// 响应拦截器
service.interceptors.response.use(res => {
- // 未设置状态码则默认成功状态
- const code = res.data.code || 200;
- // 获取错误信息
- const msg = errorCode[code] || res.data.msg || errorCode['default']
- // 二进制数据则直接返回
- if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
- return res.data
+ // 未设置状态码则默认成功状态
+ const code = res.data.code || 200;
+ // 获取错误信息
+ const msg = errorCode[code] || res.data.msg || errorCode['default']
+ // 二进制数据则直接返回
+ if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
+ return res.data
+ }
+ if (code === 401) {
+ if (!isRelogin.show) {
+ // isRelogin.show = true;
+ // ElMessageBox.confirm(
+ // '登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示',
+ // { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }
+ // ).then(() => {
+ // isRelogin.show = false;
+ // useUserStore().logOut().then(() => {
+ // location.href = '/index';
+ // })
+ // }).catch(() => {
+ // isRelogin.show = false;
+ // });
+ // 直接重新登录
+ useUserStore().login({ username: 'admin', password: 'admin123' }).then(() => {
+ location.href = '/index';
+ })
}
- if (code === 401) {
- if (!isRelogin.show) {
- isRelogin.show = true;
- ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
- isRelogin.show = false;
- useUserStore().logOut().then(() => {
- location.href = '/index';
- })
- }).catch(() => {
- isRelogin.show = false;
- });
- }
- return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
- } else if (code === 500) {
- ElMessage({ message: msg, type: 'error' })
- return Promise.reject(new Error(msg))
- } else if (code === 601) {
- ElMessage({ message: msg, type: 'warning' })
- return Promise.reject(new Error(msg))
- } else if (code !== 200) {
- ElNotification.error({ title: msg })
- return Promise.reject('error')
- } else {
- return Promise.resolve(res.data)
- }
- },
+ return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+ } else if (code === 500) {
+ ElMessage({ message: msg, type: 'error' })
+ return Promise.reject(new Error(msg))
+ } else if (code === 601) {
+ ElMessage({ message: msg, type: 'warning' })
+ return Promise.reject(new Error(msg))
+ } else if (code !== 200) {
+ ElNotification.error({ title: msg })
+ return Promise.reject('error')
+ } else {
+ return Promise.resolve(res.data)
+ }
+},
error => {
console.log('err' + error)
let { message } = error;
diff --git a/rtsp-vue/src/views/login.vue b/rtsp-vue/src/views/login.vue
index 086b4e2..fdec9f4 100644
--- a/rtsp-vue/src/views/login.vue
+++ b/rtsp-vue/src/views/login.vue
@@ -18,10 +18,10 @@
密码不能为空
-