Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

shuishen

2026-02-09 3c60793b29ce70369871db801bfbfa26cb1fa212

 applications/task-work-order/src/axios.js

@@ -17,7 +17,6 @@
import { Base64 } from 'js-base64'
import { baseUrl } from '@/config/env'
import crypto from '@/utils/crypto'
const adminUrl = import.meta.env.VITE_APP_DASHBOARD_URL
// 全局未授权错误提示状态，只提示一次
let isErrorShown = false

@@ -34,6 +33,17 @@
   //跨域请求，允许保存cookie
   withCredentials: true,
})

function logOutFun() {
   store.dispatch('FedLogOut').then(() =>{
      const {VITE_APP_PARENT_SYSTEM,VITE_APP_ENV} = import.meta.env
      const isDev = VITE_APP_ENV === 'development'
      isDev
         ? router.push({ path: '/login' })
         : window.location.replace(`${VITE_APP_PARENT_SYSTEM}/#/login`)
   })
}


//http request拦截
service.interceptors.request.use(
@@ -153,16 +163,7 @@
               removeRefreshToken()
               const env = import.meta.env.VITE_APP_ENV
               // 重定向到登录页
               store.dispatch('FedLogOut').then(() => router.push({
                  path: '/login'
               }));
               // env === 'development'
               //    ? store.dispatch('FedLogOut').then(() =>
               //          router.push({
               //             path: '/login',
               //          })
               //      )
               //    : store.dispatch('FedLogOut').then(() => window.location.replace(`${adminUrl}#/login`))
               logOutFun()
               return Promise.reject(new Error(message))
            })
      }
@@ -180,17 +181,7 @@
         removeToken()
         removeRefreshToken()
         // 重定向到登录页
         //   store.dispatch('FedLogOut').then(() => router.push({
         //      path: '/login'
         //   }));
         const env = import.meta.env.VITE_APP_ENV
         env === 'development'
            ? store.dispatch('FedLogOut').then(() =>
                  router.push({
                     path: '/login',
                  })
              )
            : store.dispatch('FedLogOut').then(() => window.location.replace(`${adminUrl}#/login`))
         logOutFun()
         return Promise.reject(new Error(message))
      }
      // 如果请求为oauth2错误码则首次报错时提示