Merge branch 'master' of http://94.191.59.107:3000/wukai/jy2024-ui

src/components/Editor/index.vue

@@ -36,7 +36,7 @@ const { proxy } = getCurrentInstance();
 const quillEditorRef = ref();
 const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址
 const headers = ref({
-  Authorization: "Bearer " + getToken()
+  // Authorization: "Bearer " + getToken()
 });
 
 const props = defineProps({

src/components/FileUpload/index.vue

@@ -71,7 +71,9 @@ const number = ref(0);
 const uploadList = ref([]);
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
 const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传文件服务器地址
-const headers = ref({ Authorization: "Bearer " + getToken() });
+const headers = ref({
+  // Authorization: "Bearer " + getToken()
+});
 const fileList = ref([]);
 const showTip = computed(
   () => props.isShowTip && (props.fileType || props.fileSize)

src/components/ImageUpload/index.vue

@@ -80,7 +80,7 @@ const dialogImageUrl = ref("");
 const dialogVisible = ref(false);
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
 const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址
-const headers = ref({ Authorization: "Bearer " + getToken() });
+const headers = ref({});// Authorization: "Bearer " + getToken() });
 const fileList = ref([]);
 const showTip = computed(
   () => props.isShowTip && (props.fileType || props.fileSize)

src/permission.js

@@ -11,11 +11,11 @@ import usePermissionStore from '@/store/modules/permission'
 
 NProgress.configure({ showSpinner: false });
 
-const whiteList = ['/login', '/register'];
+const whiteList = ['/**'];
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
-  if (getToken()) {
+  // if (getToken()) {
     to.meta.title && useSettingsStore().setTitle(to.meta.title)
     /* has token*/
     if (to.path === '/login') {
@@ -48,19 +48,19 @@ router.beforeEach((to, from, next) => {
         next()
       }
     }
-  } else {
-    useUserStore().loginSso().then(() =>{
-      next({ path: `${to.fullPath}` })
-    });
-    // // 没有token
-    // if (whiteList.indexOf(to.path) !== -1) {
-    //   // 在免登录白名单，直接进入
-    //   next()
-    // } else {
-    //   next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-    //   NProgress.done()
-    // }
-  }
+  // } else {
+  //   useUserStore().loginSso().then(() =>{
+  //     next({ path: `${to.fullPath}` })
+  //   });
+  //   // // 没有token
+  //   // if (whiteList.indexOf(to.path) !== -1) {
+  //   //   // 在免登录白名单，直接进入
+  //   //   next()
+  //   // } else {
+  //   //   next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+  //   //   NProgress.done()
+  //   // }
+  // }
 })
 
 router.afterEach(() => {

src/plugins/download.js

@@ -15,7 +15,7 @@ export default {
       method: 'get',
       url: url,
       responseType: 'blob',
-      headers: { 'Authorization': 'Bearer ' + getToken() }
+      headers: { }//'Authorization': 'Bearer ' + getToken() }
     }).then((res) => {
       const isBlob = blobValidate(res.data);
       if (isBlob) {
@@ -32,7 +32,7 @@ export default {
       method: 'get',
       url: url,
       responseType: 'blob',
-      headers: { 'Authorization': 'Bearer ' + getToken() }
+      headers: {}// 'Authorization': 'Bearer ' + getToken() }
     }).then((res) => {
       const isBlob = blobValidate(res.data);
       if (isBlob) {
@@ -50,7 +50,7 @@ export default {
       method: 'get',
       url: url,
       responseType: 'blob',
-      headers: { 'Authorization': 'Bearer ' + getToken() }
+      // headers: { 'Authorization': 'Bearer ' + getToken() }
     }).then((res) => {
       const isBlob = blobValidate(res.data);
       if (isBlob) {

src/utils/auth.js

@@ -1,6 +1,6 @@
 import Cookies from 'js-cookie'
 
-const TokenKey = 'Admin-Token'
+const TokenKey = 'risk-monitor-tkt'
 
 export function getToken() {
   return Cookies.get(TokenKey)

src/utils/request.js

@@ -33,7 +33,8 @@ service.interceptors.request.use(config => {
     // 是否需要防止数据重复提交
     const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
     if (getToken() && !isToken) {
-        config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+        //不添加token
+        // config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
     }
     // get请求映射params参数
     if (config.method === 'get' && config.params) {
@@ -88,41 +89,41 @@ service.interceptors.response.use(res => {
             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;
-            //   });
-            // }
-            // return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-            // 把当前请求相关信息存入队列
-            // token过期处理
-            return new Promise((resolve) => {
-                let requestQueue = [];
-                requestQueue.push({
-                    resolve,
-                    config: res.config
-                });
-                loginSso().then(res => {
-                    setToken(res.token)
-                    requestQueue.forEach(({resolve, config}) => {
-                        service(config).then(resolve);
-                    });
-                    requestQueue.length = 0;
-                    // resolve()
-                }).catch(error => {
-                    Promise.reject(error)
+            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('无效的会话，或者会话已过期，请重新登录。')
+            // // 把当前请求相关信息存入队列
+            // // token过期处理
+            // return new Promise((resolve) => {
+            //     let requestQueue = [];
+            //     requestQueue.push({
+            //         resolve,
+            //         config: res.config
+            //     });
+            //     loginSso().then(res => {
+            //         setToken(res.token)
+            //         requestQueue.forEach(({resolve, config}) => {
+            //             service(config).then(resolve);
+            //         });
+            //         requestQueue.length = 0;
+            //         // resolve()
+            //     }).catch(error => {
+            //         Promise.reject(error)
+            //     })
+            // });
         } else if (code === 500) {
             ElMessage({message: msg, type: 'error'})
             return Promise.reject(new Error(msg))

src/views/obj/obj/component/settingFile.vue

@@ -30,7 +30,7 @@ const props = defineProps({
 })
 
 const upload = reactive({
-  headers: { Authorization: "Bearer " + getToken() },
+  // headers: { Authorization: "Bearer " + getToken() },
   url: import.meta.env.VITE_APP_BASE_API + "/obj/metrics/importData"
 });
 

src/views/system/user/index.vue

@@ -363,7 +363,7 @@ const upload = reactive({
   // 是否更新已经存在的用户数据
   updateSupport: 0,
   // 设置上传的请求头部
-  headers: { Authorization: "Bearer " + getToken() },
+  // headers: { Authorization: "Bearer " + getToken() },
   // 上传的地址
   url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
 });