Merge branch 'dev'

@@ -68,7 +68,7 @@
           if (process.env.NODE_ENV === 'development') {
             localStorage.removeItem('token')
           } else {
-            Cookies.remove('ACCESS_TOKEN')
+            Cookies.remove('ACCESS-TOKEN')
           }
           if (window._config.casEnable) {
             window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(window.location.href);

 /*
  * @Description: 项目权限
  * @Autor: renchao
- * @LastEditTime: 2023-06-13 15:50:18
+ * @LastEditTime: 2023-06-13 16:23:56
  */
 import Vue from 'vue'
 import axios from 'axios'
@@ -23,7 +23,7 @@ router.beforeEach(async (to, from, next) => {
   let hasAddDict = store.state.dict.addDict
   let hasAddRoute = store.state.permission.addRoutes
   // cas操作
-  const token = localStorage.getItem("token") || Cookies.get('ACCESS_TOKEN');
+  const token = localStorage.getItem("token") || Cookies.get('ACCESS-TOKEN');
   if (to.path === '/login') {
     if (token) {
       next('/')
@@ -46,7 +46,7 @@ router.beforeEach(async (to, from, next) => {
           if (process.env.NODE_ENV === 'development') {
             localStorage.setItem('token', res.data.content.accessToken)
           } else {
-            Cookies.set('ACCESS_TOKEN', res.data.content.accessToken)
+            Cookies.set('ACCESS-TOKEN', res.data.content.accessToken)
           }
           window.location.href = localStorage.getItem('location')
 

@@ -2,7 +2,7 @@
 /*
  * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
  * @Autor: renchao
- * @LastEditTime: 2023-06-13 15:52:38
+ * @LastEditTime: 2023-06-13 16:24:20
  */
 import axios from 'axios'
 import Router from '@/router'
@@ -35,7 +35,7 @@ service.interceptors.request.use(
                 config.headers.delete('Authorization')
             }
         } else {
-            const token = Cookies.get('accessToken')
+            const token = Cookies.get('ACCESS-TOKEN')
             // 添加请求头
             if (token) {
                 config.headers['Authorization'] = 'Bearer ' + token
@@ -78,7 +78,7 @@ service.interceptors.response.use(
                 if (process.env.NODE_ENV === 'development') {
                     localStorage.removeItem('token')
                 } else {
-                    Cookies.remove('ACCESS_TOKEN')
+                    Cookies.remove('ACCESS-TOKEN')
                 }
                 if (window._config.casEnable) {
                     window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(locationUrl);