Commit 5889b974 by ningjihai

退出登录

parent ac49d0ec
...@@ -6,3 +6,4 @@ VITE_APP_ENV = 'development' ...@@ -6,3 +6,4 @@ VITE_APP_ENV = 'development'
# 若依管理系统/开发环境 # 若依管理系统/开发环境
VITE_APP_BASE_API = '/dev-api' VITE_APP_BASE_API = '/dev-api'
VITE_APP_BASE_URL = '/'
\ No newline at end of file
...@@ -9,3 +9,5 @@ VITE_APP_BASE_API = '/prod-api' ...@@ -9,3 +9,5 @@ VITE_APP_BASE_API = '/prod-api'
# 是否在打包时开启压缩,支持 gzip 和 brotli # 是否在打包时开启压缩,支持 gzip 和 brotli
VITE_BUILD_COMPRESS = gzip VITE_BUILD_COMPRESS = gzip
VITE_APP_BASE_URL = '/'
\ No newline at end of file
...@@ -37,7 +37,7 @@ const { proxy } = getCurrentInstance() ...@@ -37,7 +37,7 @@ const { proxy } = getCurrentInstance()
const quillEditorRef = ref() const quillEditorRef = ref()
const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload") // 上传的图片服务器地址 const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload") // 上传的图片服务器地址
const headers = ref({ const headers = ref({
Authorization: "Bearer " + getToken() Token: getToken()
}) })
const props = defineProps({ const props = defineProps({
...@@ -189,7 +189,7 @@ function handlePasteCapture(e) { ...@@ -189,7 +189,7 @@ function handlePasteCapture(e) {
function insertImage(file) { function insertImage(file) {
const formData = new FormData() const formData = new FormData()
formData.append("file", file) formData.append("file", file)
axios.post(uploadUrl.value, formData, { headers: { "Content-Type": "multipart/form-data", Authorization: headers.value.Authorization } }).then(res => { axios.post(uploadUrl.value, formData, { headers: { "Content-Type": "multipart/form-data", Token: headers.value.Token } }).then(res => {
handleUploadSuccess(res.data) handleUploadSuccess(res.data)
}) })
} }
......
...@@ -93,7 +93,7 @@ const number = ref(0) ...@@ -93,7 +93,7 @@ const number = ref(0)
const uploadList = ref([]) const uploadList = ref([])
const baseUrl = import.meta.env.VITE_APP_BASE_API const baseUrl = import.meta.env.VITE_APP_BASE_API
const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + props.action) // 上传文件服务器地址 const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + props.action) // 上传文件服务器地址
const headers = ref({ Authorization: "Bearer " + getToken() }) const headers = ref({ Token: getToken() })
const fileList = ref([]) const fileList = ref([])
const showTip = computed( const showTip = computed(
() => props.isShowTip && (props.fileType || props.fileSize) () => props.isShowTip && (props.fileType || props.fileSize)
......
...@@ -103,7 +103,7 @@ const dialogImageUrl = ref("") ...@@ -103,7 +103,7 @@ const dialogImageUrl = ref("")
const dialogVisible = ref(false) const dialogVisible = ref(false)
const baseUrl = import.meta.env.VITE_APP_BASE_API const baseUrl = import.meta.env.VITE_APP_BASE_API
const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + props.action) // 上传的图片服务器地址 const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + props.action) // 上传的图片服务器地址
const headers = ref({ Authorization: "Bearer " + getToken() }) const headers = ref({ Token: getToken() })
const fileList = ref([]) const fileList = ref([])
const showTip = computed( const showTip = computed(
() => props.isShowTip && (props.fileType || props.fileSize) () => props.isShowTip && (props.fileType || props.fileSize)
......
...@@ -95,7 +95,17 @@ function logout() { ...@@ -95,7 +95,17 @@ function logout() {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
userStore.logOut().then(() => { userStore.logOut().then(() => {
location.href = '/index' // location.href = '/index'
appStore.signOut('logout')
appStore.setNavStatus({type: 'manage'})
appStore.setQueryData({
projectId: ''
})
window.location.replace(`${import.meta.env.BASE_URL}`)
}) })
}).catch(() => { }) }).catch(() => { })
} }
......
...@@ -15,7 +15,7 @@ export default { ...@@ -15,7 +15,7 @@ export default {
method: 'get', method: 'get',
url: url, url: url,
responseType: 'blob', responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() } headers: { 'Token': getToken() }
}).then((res) => { }).then((res) => {
const isBlob = blobValidate(res.data) const isBlob = blobValidate(res.data)
if (isBlob) { if (isBlob) {
...@@ -32,7 +32,7 @@ export default { ...@@ -32,7 +32,7 @@ export default {
method: 'get', method: 'get',
url: url, url: url,
responseType: 'blob', responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() } headers: { 'Token': getToken() }
}).then((res) => { }).then((res) => {
const isBlob = blobValidate(res.data) const isBlob = blobValidate(res.data)
if (isBlob) { if (isBlob) {
...@@ -50,7 +50,7 @@ export default { ...@@ -50,7 +50,7 @@ export default {
method: 'get', method: 'get',
url: url, url: url,
responseType: 'blob', responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() } headers: { 'Token': getToken() }
}).then((res) => { }).then((res) => {
const isBlob = blobValidate(res.data) const isBlob = blobValidate(res.data)
if (isBlob) { if (isBlob) {
......
...@@ -63,7 +63,7 @@ export const constantRoutes = [ ...@@ -63,7 +63,7 @@ export const constantRoutes = [
hidden: true hidden: true
}, },
{ {
// 项目管理 // 项目首页
path: '/projectManage', path: '/projectManage',
component: () => import('@/views/projectManage/index'), component: () => import('@/views/projectManage/index'),
hidden: true hidden: true
......
// import { defineStore } from 'pinia' // import { defineStore } from 'pinia'
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
const router = useRouter()
const useAppStore = defineStore('app', { const useAppStore = defineStore('app', {
state: () => ({ state: () => ({
// 新版基础状态 // 新版基础状态
...@@ -364,8 +365,10 @@ import { useRouter } from 'vue-router' ...@@ -364,8 +365,10 @@ import { useRouter } from 'vue-router'
sessionStorage.clear() sessionStorage.clear()
this.system = {} this.system = {}
if (status !== 'login') { if (status !== 'login') {
const router = useRouter()
await router.push("/login") await router.push({
path: '/login'
})
} }
} }
} }
......
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
const TokenKey = 'Admin-Token' const TokenKey = '__token'
export function getToken() { export function getToken() {
return Cookies.get(TokenKey) return sessionStorage.getItem(TokenKey) || Cookies.get(TokenKey)
} }
export function setToken(token) { export function setToken(token) {
......
...@@ -27,7 +27,7 @@ service.interceptors.request.use(config => { ...@@ -27,7 +27,7 @@ service.interceptors.request.use(config => {
// 是否需要防止数据重复提交 // 是否需要防止数据重复提交
const isRepeatSubmit = (config.headers || {}).repeatSubmit === false const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
if (getToken() && !isToken) { if (getToken() && !isToken) {
config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 config.headers['Token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
} }
// get请求映射params参数 // get请求映射params参数
if (config.method === 'get' && config.params) { if (config.method === 'get' && config.params) {
......
...@@ -252,7 +252,7 @@ const upload = reactive({ ...@@ -252,7 +252,7 @@ const upload = reactive({
// 是否更新已经存在的用户数据 // 是否更新已经存在的用户数据
updateSupport: 0, updateSupport: 0,
// 设置上传的请求头部 // 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() }, headers: { Token: getToken() },
// 上传的地址 // 上传的地址
url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData" url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
}) })
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论