From 6e66b778578298b4337119489852ef54f77bceb6 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 3 Jan 2025 09:42:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?MFA=E9=AA=8C=E8=AF=81=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MFA/index.vue | 12 ++++++------
 src/views/login/index.vue    | 21 ++++++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/components/MFA/index.vue b/src/components/MFA/index.vue
index 8f554b5d..e1f9d4e0 100644
--- a/src/components/MFA/index.vue
+++ b/src/components/MFA/index.vue
@@ -134,9 +134,9 @@ export default {
         let res = await verifyMFACode(this.form);
         this.loading = false;
         if (res.IsSuccess) {
-          if (this.status === "login") {
-            this.$message.success(this.$t("mfa:message:verifySuccess"));
-          }
+          // if (this.status === "login") {
+          //   this.$message.success(this.$t("mfa:message:verifySuccess"));
+          // }
           this.$emit("success", this.form.IdentityUserId);
           this.cancel();
         }
@@ -153,9 +153,9 @@ export default {
           clearInterval(this.timer);
           this.timer = null;
         }
-        let data = {
-          UserId: this.form.IdentityUserId,
-        };
+        // let data = {
+        //   IdentityUserId: this.form.IdentityUserId,
+        // };
         if (this.status === "lock") {
           data.MfaType = 1;
         }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 9b9c0646..d3c3e409 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -420,7 +420,7 @@ export default {
               UserId: res.BasicInfo.IdentityUserId,
               EMail: res.BasicInfo.EMail,
               username: this.loginForm.username,
-              callBack: this.loginIn,
+              callBack: this.changeRoleLogin,
               cancelBack: () => {
                 this.loading = false
               },
@@ -432,14 +432,7 @@ export default {
           //   // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
           //   this.$message.warning(this.$t('login:message:login4'))
           // }
-          if (
-            Array.isArray(this.$store.state.user.roles) &&
-            this.$store.state.user.roles.length === 1
-          ) {
-            this.loginByRole(this.$store.state.user.roles[0].Id)
-            return
-          }
-          return (this.toggleRoleVisible = true)
+          this.changeRoleLogin()
         })
         .catch(() => {
           this.showCode = true
@@ -502,6 +495,16 @@ export default {
           this.toggleRoleLoading = false
         })
     },
+    changeRoleLogin() {
+      if (
+        Array.isArray(this.$store.state.user.roles) &&
+        this.$store.state.user.roles.length === 1
+      ) {
+        this.loginByRole(this.$store.state.user.roles[0].Id)
+        return
+      }
+      return (this.toggleRoleVisible = true)
+    },
     cancel() {
       this.showCode = true
       this.loading = false

From 7f18e717b7f52f9be8f60256b6135c01f46db4cc Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 3 Jan 2025 09:47:57 +0800
Subject: [PATCH 2/2] 1

---
 src/components/MFA/index.vue | 6 +++---
 src/permission.js            | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/MFA/index.vue b/src/components/MFA/index.vue
index e1f9d4e0..0d56c249 100644
--- a/src/components/MFA/index.vue
+++ b/src/components/MFA/index.vue
@@ -153,9 +153,9 @@ export default {
           clearInterval(this.timer);
           this.timer = null;
         }
-        // let data = {
-        //   IdentityUserId: this.form.IdentityUserId,
-        // };
+        let data = {
+          // IdentityUserId: this.form.IdentityUserId,
+        };
         if (this.status === "lock") {
           data.MfaType = 1;
         }
diff --git a/src/permission.js b/src/permission.js
index a5bb41b2..d29e53ab 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -85,6 +85,7 @@ router.beforeEach(async (to, from, next) => {
           router.addRoutes(accessRoutes)
           next({ ...to, replace: true })
         } catch (error) {
+          console.log(error)
           // 删除token并进入登录页面以重新登录
           await store.dispatch('user/resetToken')
           next(`/login?redirect=${to.path}`)