diff --git a/src/views/Discover/Conformance/index.vue b/src/views/Discover/Conformance/index.vue index 8900fb0..932f55d 100644 --- a/src/views/Discover/Conformance/index.vue +++ b/src/views/Discover/Conformance/index.vue @@ -15,6 +15,7 @@ import ConformanceStore from '@/stores/conformance.js'; import StatusBar from '@/components/Discover/StatusBar.vue'; import ConformanceResults from '@/components/Discover/Conformance/ConformanceResults.vue'; import ConformanceSidebar from '@/components/Discover/Conformance/ConformanceSidebar.vue'; +import { getCookie } from "@/utils/cookieUtil.js"; export default { setup() { @@ -99,7 +100,7 @@ export default { // .*$:匹配剩餘的字符,確保完整的提取。 // |^.*$:在找不到 "luciaToken" 的情況下,匹配整個字符串。 // 實際應用 - const token = document.cookie.replace(/(?:(?:^|.*;\s*)luciaToken\s*=\s*([^;]*).*$)|^.*$/, "$1"); + const token = getCookie('luciaToken'); axios.defaults.headers.common['Authorization'] = `Bearer ${token}`; switch (to.params.type) { diff --git a/src/views/Discover/Map/Map.vue b/src/views/Discover/Map/Map.vue index 154c402..9460d4f 100644 --- a/src/views/Discover/Map/Map.vue +++ b/src/views/Discover/Map/Map.vue @@ -57,6 +57,7 @@ import { onBeforeMount, computed } from 'vue'; import { storeToRefs } from 'pinia'; import { useRoute } from 'vue-router'; import axios from 'axios'; +import { getCookie } from "@/utils/cookieUtil.js"; import LoadingStore from '@/stores/loading.js'; import AllMapDataStore from '@/stores/allMapData.js'; import ConformanceStore from '@/stores/conformance.js'; @@ -468,7 +469,7 @@ export default { if (isCheckPage) { const conformanceStore = ConformanceStore(); // Save token in Headers. - const token = document.cookie.replace(/(?:(?:^|.*;\s*)luciaToken\s*=\s*([^;]*).*$)|^.*$/, "$1"); + const token = getCookie('luciaToken'); axios.defaults.headers.common['Authorization'] = `Bearer ${token}`; switch (to.params.type) { diff --git a/src/views/Discover/Performance/index.vue b/src/views/Discover/Performance/index.vue index 3eaf897..4e7d312 100644 --- a/src/views/Discover/Performance/index.vue +++ b/src/views/Discover/Performance/index.vue @@ -152,6 +152,7 @@ import { simpleTimeLabel, followTimeLabel, } from '@/module/timeLabel.js'; import FreqChart from './FreqChart.vue'; import { PRIME_VUE_TICKS_LIMIT } from '../../../constants/constants.js'; +import { getCookie } from "@/utils/cookieUtil.js"; const primeVueTicksLimit = PRIME_VUE_TICKS_LIMIT; @@ -928,7 +929,7 @@ export default { if (isCheckPage) { const conformanceStore = ConformanceStore(); // Save token in Headers. - const token = document.cookie.replace(/(?:(?:^|.*;\s*)luciaToken\s*=\s*([^;]*).*$)|^.*$/, "$1"); + const token = getCookie('luciaToken'); axios.defaults.headers.common['Authorization'] = `Bearer ${token}`; switch (to.params.type) { diff --git a/src/views/MainContainer.vue b/src/views/MainContainer.vue index 68956a4..a8ce860 100644 --- a/src/views/MainContainer.vue +++ b/src/views/MainContainer.vue @@ -23,7 +23,7 @@ import Loading from '@/components/Loading.vue'; import { leaveFilter, leaveConformance } from '@/module/alertModal.js'; import PageAdminStore from '@/stores/pageAdmin.js'; import LoginStore from "@/stores/login.ts"; -import { getCookie } from "../utils/cookieUtil.js"; +import { getCookie } from "@/utils/cookieUtil.js"; import ModalContainer from './AccountManagement/ModalContainer.vue'; export default { @@ -87,7 +87,7 @@ export default { }, created() { // Save token in Headers. - const token = document.cookie.replace(/(?:(?:^|.*;\s*)luciaToken\s*=\s*([^;]*).*$)|^.*$/, "$1"); + const token = getCookie('luciaToken'); this.$http.defaults.headers.common['Authorization'] = `Bearer ${token}`; }, // 重新整理畫面以及第一次進入網頁時,beforeRouteEnter這個hook會被執行,然而beforeRouteUpdate不會被執行