From 8143ca54a2b9a954d64296ff955ebe21a21afcdb Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Mon, 22 Jul 2024 16:01:54 +0800
Subject: [PATCH] =?UTF-8?q?[update=20=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95]?=
 =?UTF-8?q?=20=E6=B5=8B=E8=AF=95=E9=A3=9E=E4=B9=A6=E5=8D=95=E7=82=B9?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js       | 6 ------
 src/permission.js | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main.js b/src/main.js
index 7de0450..5009e3c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -92,12 +92,6 @@ function main () {
       store.commit('TOGGLE_COLOR', Vue.ls.get(DEFAULT_COLOR, config.primaryColor))
       store.commit('SET_TOKEN', Vue.ls.get(ACCESS_TOKEN))
       store.commit('SET_MULTI_PAGE', Vue.ls.get(DEFAULT_MULTI_PAGE, config.multipage))
-      // 如果没有登录，state是飞书，并且有code，就请求飞书单点登录
-      if (!Vue.ls.get(ACCESS_TOKEN) && this.$route.query.code && this.$route.query.state === 'feishu') {
-        store.dispatch('FeiShuLogin').catch((e) => {
-          this.$message.warn(e.message)
-        })
-      }
     },
     render: h => h(App),
     data: {
diff --git a/src/permission.js b/src/permission.js
index fb0166e..85a0eef 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -35,6 +35,11 @@ router.beforeEach(async (to, from, next) => {
       store.commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() })
       store.commit('SET_AVATAR', userInfo.avatar)
     }
+  } else if (!Vue.ls.get(ACCESS_TOKEN) && to.query.code && to.query.state === 'feishu') {
+    // 如果没有登录，state是飞书，并且有code，就请求飞书单点登录
+    store.dispatch('FeiShuLogin').catch((e) => {
+      this.$message.warn(e.message)
+    })
   } else if (to.query.code) {
     // 研发大前台单点登录
     const { result, success, message } = await getSSOUserInfo({ code: to.query.code })