feat(auth): 多个账号同时存在问题

README.md

@@ -10,13 +10,13 @@
 - [x] `eslint`调整，并配合`prettier`统一格式化代码。
 - [x] 添加原子化[`tailwindcss`](https://www.tailwindcss.cn/)，为了兼容性，使用`1.x`版本。
 - [x] 剔除若依覆盖`element-ui`的样式
+- [x] 同浏览器用户登录多个账号数据不串号，刷新页面则是最新的用户
+- [x] vue 升级到 2.7.x
+- [x] node-sass 更换为 sass（node-sass 经常安装失败）
+- [x] 富文本移除 quill，选用 Tinymce
+- [x] 增加 vue-echarts 配合 echarts，方便使用
 - [ ] 测试`ty-ui`，并增加页面使用案例
 - [ ] 设计师设计并调整页面整体样式
-- [ ] 梳理库并重新选型
-  - [x] vue 升级到 2.7.x
-  - [x] node-sass 更换为 sass（node-sass 经常安装失败）
-  - [x] 富文本移除 quill，选用 Tinymce
-  - [x] 增加 vue-echarts 配合 echarts，方便使用
 
 ## 启动发布
 

src/layout/components/Navbar.vue

@@ -16,21 +16,21 @@
 
     <div class="right-menu">
       <template v-if="device !== 'mobile'">
-        <search id="header-search" class="right-menu-item" />
+        <!-- <search id="header-search" class="right-menu-item" /> -->
 
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="文档地址" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
+        <!-- <screenfull id="screenfull" class="right-menu-item hover-effect" /> -->
 
-        <el-tooltip content="布局大小" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
       </template>
 
       <el-dropdown
@@ -62,22 +62,22 @@ import { mapGetters } from 'vuex';
 import Breadcrumb from '@/components/Breadcrumb';
 import TopNav from '@/components/TopNav';
 import Hamburger from '@/components/Hamburger';
-import Screenfull from '@/components/Screenfull';
-import SizeSelect from '@/components/SizeSelect';
-import Search from '@/components/HeaderSearch';
-import RuoYiGit from '@/components/RuoYi/Git';
-import RuoYiDoc from '@/components/RuoYi/Doc';
+// import Screenfull from '@/components/Screenfull';
+// import SizeSelect from '@/components/SizeSelect';
+// import Search from '@/components/HeaderSearch';
+// import RuoYiGit from '@/components/RuoYi/Git';
+// import RuoYiDoc from '@/components/RuoYi/Doc';
 
 export default {
   components: {
     Breadcrumb,
     TopNav,
-    Hamburger,
-    Screenfull,
-    SizeSelect,
-    Search,
-    RuoYiGit,
-    RuoYiDoc
+    Hamburger
+    // Screenfull,
+    // SizeSelect,
+    // Search
+    // RuoYiGit,
+    // RuoYiDoc
   },
   computed: {
     ...mapGetters(['sidebar', 'avatar', 'device']),
@@ -157,8 +157,6 @@ export default {
   .right-menu {
     float: right;
     height: 100%;
-    line-height: 50px;
-
     &:focus {
       outline: none;
     }

src/utils/auth.js

 import Cookies from 'js-cookie';
+import store from '@/store';
 
 const TokenKey = 'Admin-Token';
 
-export function getToken() {
+export function getToken(storePriority = false) {
+  if (storePriority && store && store.getters.token && store.getters.token) {
+    return store.getters.token;
+  }
   return Cookies.get(TokenKey);
 }
 

src/utils/request.js

@@ -27,8 +27,9 @@ service.interceptors.request.use(
     const isToken = (config.headers || {}).isToken === false;
     // 是否需要防止数据重复提交
     const isRepeatSubmit = (config.headers || {}).repeatSubmit === false;
-    if (getToken() && !isToken) {
-      config.headers.Authorization = 'Bearer ' + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
+    const token = getToken(true);
+    if (token && !isToken) {
+      config.headers.Authorization = 'Bearer ' + token; // 让每个请求携带自定义token 请根据实际情况自行修改
     }
     // get请求映射params参数
     if (config.method === 'get' && config.params) {