zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Token conflict issue between two different applications embedded in the same system(#2753)

Browse Source
This commit is contained in:
wangdan-fit2cloud 2025-04-01 16:19:13 +08:00 committed by GitHub
parent 0e98c7783b
commit 081fcab7eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/stores/modules/application.ts
View File

@ -97,8 +97,8 @@ const useApplicationStore = defineStore({
applicationApi applicationApi
.postAppAuthentication(token, loading, authentication_value) .postAppAuthentication(token, loading, authentication_value)
.then((res) => { .then((res) => {
localStorage.setItem('accessToken', res.data) localStorage.setItem(`${token}accessToken`, res.data)
sessionStorage.setItem('accessToken', res.data) sessionStorage.setItem(`${token}accessToken`, res.data)
resolve(res) resolve(res)
}) })
.catch((error) => { .catch((error) => {

14
ui/src/stores/modules/user.ts
View File

@ -13,7 +13,7 @@ export interface userStateTypes {
userInfo: User | null userInfo: User | null
token: any token: any
version?: string version?: string
accessToken?: string userAccessToken?: string
XPACK_LICENSE_IS_VALID: false XPACK_LICENSE_IS_VALID: false
isXPack: false isXPack: false
themeInfo: any themeInfo: any
@ -26,6 +26,7 @@ const useUserStore = defineStore({
userInfo: null, userInfo: null,
token: '', token: '',
version: '', version: '',
userAccessToken: '',
XPACK_LICENSE_IS_VALID: false, XPACK_LICENSE_IS_VALID: false,
isXPack: false, isXPack: false,
themeInfo: null themeInfo: null
@ -60,11 +61,11 @@ const useUserStore = defineStore({
return this.userType === 1 ? localStorage.getItem('token') : this.getAccessToken() return this.userType === 1 ? localStorage.getItem('token') : this.getAccessToken()
}, },
getAccessToken() { getAccessToken() {
const accessToken = sessionStorage.getItem('accessToken') const token = sessionStorage.getItem(`${this.userAccessToken}accessToken`)
if (accessToken) { if (token) {
return accessToken return token
} }
return localStorage.getItem('accessToken') return localStorage.getItem(`${this.userAccessToken}accessToken`)
}, },
getPermissions() { getPermissions() {
@ -83,8 +84,9 @@ const useUserStore = defineStore({
return '' return ''
} }
}, },
changeUserType(num: number) { changeUserType(num: number, token?: string) {
this.userType = num this.userType = num
this.userAccessToken = token
}, },
async asyncGetProfile() { async asyncGetProfile() {

2
ui/src/views/chat/index.vue
View File

@ -92,7 +92,7 @@ function getAccessToken(token: string) {
}) })
} }
onBeforeMount(() => { onBeforeMount(() => {
user.changeUserType(2) user.changeUserType(2, accessToken)
Promise.all([user.asyncGetProfile(), getAccessToken(accessToken)]) Promise.all([user.asyncGetProfile(), getAccessToken(accessToken)])
.catch(() => { .catch(() => {
applicationAvailable.value = false applicationAvailable.value = false