Pre Merge pull request !768 from 熊猫大侠/dev-singlelogin

src/components/RouterSearch/index.vue

@@ -18,7 +18,7 @@
     </el-select>
   </ElDialog>
   <div v-else class="custom-hover" @click.stop="showTopSearch = !showTopSearch">
-    <Icon icon="ep:search" />
+    <Icon icon="ep:search" :color="color"/>
     <el-select
       @click.stop
       filterable
@@ -41,11 +41,13 @@
 </template>
 
 <script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
 defineProps({
   isModal: {
     type: Boolean,
     default: true
-  }
+  },
+  color: propTypes.string.def('')
 })
 
 const router = useRouter() // 路由对象

src/config/axios/service.ts

@@ -126,19 +126,25 @@ service.interceptors.response.use(
         isRefreshToken = true
         // 1. 如果获取不到刷新令牌，则只能执行登出操作
         if (!getRefreshToken()) {
-          return handleAuthorized()
+          return handleAuthorized(t('sys.api.timeoutMessage'))
         }
         // 2. 进行刷新访问令牌
         try {
           const refreshTokenRes = await refreshToken()
-          // 2.1 刷新成功，则回放队列的请求 + 当前请求
-          setToken((await refreshTokenRes).data.data)
-          config.headers!.Authorization = 'Bearer ' + getAccessToken()
-          requestList.forEach((cb: any) => {
-            cb()
-          })
-          requestList = []
-          return service(config)
+          const retData = (await refreshTokenRes).data
+          if (retData.code === 1002000499) {
+            //登录被踢下线的处理 by panda 25.04.23
+            return handleAuthorized(retData.msg)
+          } else {
+            // 2.1 刷新成功，则回放队列的请求 + 当前请求
+            setToken((await refreshTokenRes).data.data)
+            config.headers!.Authorization = 'Bearer ' + getAccessToken()
+            requestList.forEach((cb: any) => {
+              cb()
+            })
+            requestList = []
+            return service(config)
+          }
         } catch (e) {
           // 为什么需要 catch 异常呢？刷新失败时，请求因为 Promise.reject 触发异常。
           // 2.2 刷新失败，只回放队列的请求
@@ -146,7 +152,7 @@ service.interceptors.response.use(
             cb()
           })
           // 提示是否要登出。即不回放当前请求！不然会形成递归
-          return handleAuthorized()
+          return handleAuthorized(t('sys.api.timeoutMessage'))
         } finally {
           requestList = []
           isRefreshToken = false
@@ -181,7 +187,7 @@ service.interceptors.response.use(
       if (msg === '无效的刷新令牌') {
         // hard coding：忽略这个提示，直接登出
         console.log(msg)
-        return handleAuthorized()
+        return handleAuthorized(t('sys.api.timeoutMessage'))
       } else {
         ElNotification.error({ title: msg })
       }
@@ -210,7 +216,7 @@ const refreshToken = async () => {
   axios.defaults.headers.common['tenant-id'] = getTenantId()
   return await axios.post(base_url + '/system/auth/refresh-token?refreshToken=' + getRefreshToken())
 }
-const handleAuthorized = () => {
+const handleAuthorized = (msg: any) => {
   const { t } = useI18n()
   if (!isRelogin.show) {
     // 如果已经到登录页面则不进行弹窗提示
@@ -218,7 +224,7 @@ const handleAuthorized = () => {
       return
     }
     isRelogin.show = true
-    ElMessageBox.confirm(t('sys.api.timeoutMessage'), t('common.confirmTitle'), {
+    ElMessageBox.confirm(msg, t('common.confirmTitle'), {
       showCancelButton: false,
       closeOnClickModal: false,
       showClose: false,

src/layout/components/Message/src/Message.vue

@@ -2,9 +2,14 @@
 import { formatDate } from '@/utils/formatTime'
 import * as NotifyMessageApi from '@/api/system/notify/message'
 import { useUserStoreWithOut } from '@/store/modules/user'
+import { propTypes } from '@/utils/propTypes'
 
 defineOptions({ name: 'Message' })
 
+defineProps({
+  color: propTypes.string.def('')
+})
+
 const { push } = useRouter()
 const userStore = useUserStoreWithOut()
 const activeName = ref('notice')
@@ -54,7 +59,7 @@ onMounted(() => {
     <ElPopover :width="400" placement="bottom" trigger="click">
       <template #reference>
         <ElBadge :is-dot="unreadCount > 0" class="item">
-          <Icon :size="18" class="cursor-pointer" icon="ep:bell" @click="getList" />
+          <Icon :size="18" class="cursor-pointer" icon="ep:bell" :color="color" @click="getList" />
         </ElBadge>
       </template>
       <ElTabs v-model="activeName">

src/layout/components/ToolHeader.vue

@@ -73,7 +73,7 @@ export default defineComponent({
           {screenfull.value ? (
             <Screenfull class="custom-hover" color="var(--top-header-text-color)"></Screenfull>
           ) : undefined}
-          {search.value ? <RouterSearch isModal={false} /> : undefined}
+          {search.value ? <RouterSearch isModal={false} color="var(--top-header-text-color)"/> : undefined}
           {size.value ? (
             <SizeDropdown class="custom-hover" color="var(--top-header-text-color)"></SizeDropdown>
           ) : undefined}

src/router/index.ts

@@ -1,13 +1,25 @@
 import type { App } from 'vue'
 import type { RouteRecordRaw } from 'vue-router'
 import { createRouter, createWebHistory } from 'vue-router'
-import remainingRouter from './modules/remaining'
+
+// 自动导入modules目录下的所有静态路由，项目可以按模块分类增加路由文件
+// by panda & inori_lover  25.03.21
+const allRouters: RouteRecordRaw[] = Object.values<{ default: RouteRecordRaw[] }>(
+  import.meta.glob('./modules/*.ts', { eager: true })
+).reduce<RouteRecordRaw[]>((acc, module) => {
+  // just ensure module.default is valid route define
+  if (Array.isArray(module?.default)) {
+    acc.push(...module.default)
+  }
+
+  return acc
+}, [])
 
 // 创建路由实例
 const router = createRouter({
   history: createWebHistory(import.meta.env.VITE_BASE_PATH), // createWebHashHistory URL带#，createWebHistory URL不带#
   strict: true,
-  routes: remainingRouter as RouteRecordRaw[],
+  routes: allRouters, //自动导入的所有静态路由 by panda & inori_lover  25.03.21
   scrollBehavior: () => ({ left: 0, top: 0 })
 })