优化索为式登录

src/router/filter.js

@@ -1,49 +1,97 @@
-import Router from 'vue-router'
-import router from "./index"
+import Router from "vue-router";
+import router from "./index";
+import axios from "axios";
+import store from "../store";
 
 // 解决ElementUI导航栏中的vue-router在3.0版本以上重复点菜单报错问题
-const originalPush = Router.prototype.push
+const originalPush = Router.prototype.push;
 Router.prototype.push = function push(location) {
-    return originalPush.call(this, location).catch(err => err)
-}
+    return originalPush.call(this, location).catch((err) => err);
+};
 
+// http://localhost:8082/?code=1&ticket=1
+router.beforeEach(async (to, from, next) => {
 
-router.beforeEach((to, from, next) => {
-    if (to.fullPath === '/' || to.name === '*') {
-        let {
-            code,
-            ticket
-        } = to.query;
+    let {
+        code,
+        ticket
+    } = to.query;
 
-        if (code && ticket) {
-            next({
-                path: "/mainPage",
-                query: {
+    if (code && ticket && to.name === "mainPage") {
+        localStorage.clear();
+
+        store.commit("getUserId", "");
+        store.commit("getUsername", "");
+        store.commit("getRoleCode", "");
+        store.commit("getUseType", "");
+
+        let result = await axios({
+                method: "post",
+                url: "/simulation/oauth/client/sign/single",
+                data: {
                     code,
-                    ticket
+                    ticket,
                 },
-                replace: true
-            });
-        } else {
-            if (to.meta.login) {
-                if (localStorage.getItem('Authorization')) {
-                    next({
-                        path: "/mainPage",
-                    });
+            })
+            .then((res) => {
+                if (res.code == 200 && !!res.info.access_token) {
+                    localStorage.setItem(
+                        "Authorization",
+                        res.info.token_type + " " + res.info.access_token
+                    );
+                    localStorage.setItem(
+                        "refreshToken",
+                        res.info.refresh_token
+                    );
+                    localStorage.setItem("expiresTime", res.info.expires_time);
+                    return true;
                 } else {
-                    next({
-                        path: "/login",
-                    });
+                    alert(res.message || "网络异常");
+                    return false;
                 }
-            } else {
+            })
+            .catch((error) => {
+                alert("网络异常!");
+                return false;
+            });
+
+        if (result) {
+            next({
+                path: "/mainPage",
+                // query: {
+                //     code,
+                //     ticket,
+                // },
+                replace: true,
+            });
+        } else {
+            next({
+                path: "/login",
+            });
+        }
+
+        return;
+    }
+
+    if (to.fullPath === "/" || to.name === "*") {
+        if (to.meta.login) {
+            if (localStorage.getItem("Authorization")) {
                 next({
                     path: "/mainPage",
                 });
+            } else {
+                next({
+                    path: "/login",
+                });
             }
+        } else {
+            next({
+                path: "/mainPage",
+            });
         }
     } else {
         if (to.meta.login) {
-            if (localStorage.getItem('Authorization')) {
+            if (localStorage.getItem("Authorization")) {
                 next();
             } else {
                 next({

src/views/index.vue

@@ -97,7 +97,10 @@ export default {
         },
     },
     created() {
-        let { code, ticket } = this.$route.query;
+        this.getMenuItems();
+        this.getUserInfo();
+
+        /* let { code, ticket } = this.$route.query;
 
         if (code && ticket) {
             localStorage.clear();
@@ -131,7 +134,7 @@ export default {
         } else {
             this.getMenuItems();
             this.getUserInfo();
-        }
+        } */
     },
 };
 </script>