Merge branch 'master' of https://github.com/metersphere/metersphere

backend/src/main/java/io/metersphere/track/controller/TestPlanController.java

@@ -50,7 +50,7 @@ public class TestPlanController {
         QueryTestPlanRequest request = new QueryTestPlanRequest();
         request.setWorkspaceId(workspaceId);
         request.setProjectId(projectId);
-        return testPlanService.listTestPlan(request);
+        return testPlanService.listTestPlanByProject(request);
     }
 
     @PostMapping("/list/all")

frontend/src/business/components/common/router/router.js

@@ -1,7 +1,6 @@
 import Vue from "vue";
 import VueRouter from 'vue-router'
 import RouterSidebar from "./RouterSidebar";
-import axios from "axios";
 import Setting from "@/business/components/settings/router";
 import API from "@/business/components/api/router";
 import Performance from "@/business/components/performance/router";
@@ -31,8 +30,8 @@ router.beforeEach((to, from, next) => {
 
   //解决localStorage清空，cookie没失效导致的卡死问题
   if (!localStorage.getItem('Admin-Token')) {
-    axios.get("/signout");
-    console.log("signout");
+    // axios.get("/signout");
+    // console.log("signout");
     localStorage.setItem('Admin-Token', "{}");
     window.location.href = "/login";
     next();