diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index a1398d86eb..517e9ae764 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -114,9 +114,13 @@ public class ApiAutomationService {
                 Map<String, String> map = d.getEnvironmentMap();
                 if (map != null) {
                     if (map.isEmpty()) {
-                        List<String> ids = (List<String>) JSONPath.read(definition, "$..projectId");
-                        if (CollectionUtils.isNotEmpty(ids)) {
-                            idList.addAll(new HashSet<>(ids));
+                        try {
+                            List<String> ids = (List<String>) JSONPath.read(definition, "$..projectId");
+                            if (CollectionUtils.isNotEmpty(ids)) {
+                                idList.addAll(new HashSet<>(ids));
+                            }
+                        } catch (Exception e) {
+                            LogUtil.error("JSONPath.read projectId fail.");
                         }
                     } else {
                         Set<String> set = d.getEnvironmentMap().keySet();
diff --git a/backend/src/main/java/io/metersphere/security/CsrfFilter.java b/backend/src/main/java/io/metersphere/security/CsrfFilter.java
index 66ef15689e..59442dc61d 100644
--- a/backend/src/main/java/io/metersphere/security/CsrfFilter.java
+++ b/backend/src/main/java/io/metersphere/security/CsrfFilter.java
@@ -7,7 +7,6 @@ import io.metersphere.commons.utils.SessionUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.ExpiredCredentialsException;
 import org.apache.shiro.web.filter.authc.AnonymousFilter;
 import org.apache.shiro.web.util.WebUtils;
 import org.springframework.core.env.Environment;
@@ -42,12 +41,7 @@ public class CsrfFilter extends AnonymousFilter {
         // 请求头取出的token value
         String csrfToken = httpServletRequest.getHeader(TOKEN_NAME);
         // 校验 token
-        try {
-            validateToken(csrfToken);
-        } catch (ExpiredCredentialsException e) {
-            ((HttpServletResponse) response).setHeader("Authentication-Status", "invalid");
-            return true;
-        }
+        validateToken(csrfToken);
         // 校验 referer
         validateReferer(httpServletRequest);
         return true;
@@ -80,18 +74,6 @@ public class CsrfFilter extends AnonymousFilter {
         if (signatureArray.length != 3) {
             throw new RuntimeException("invalid token");
         }
-
-        long signatureTime;
-        try {
-            signatureTime = Long.parseLong(signatureArray[2]);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        Environment env = CommonBeanFactory.getBean(Environment.class);
-        long timeout = env.getProperty("session.timeout", Long.class, 43200L);
-        if (Math.abs(System.currentTimeMillis() - signatureTime) > timeout * 1000) {
-            throw new ExpiredCredentialsException("expired token");
-        }
         if (!StringUtils.equals(SessionUtils.getUserId(), signatureArray[0])) {
             throw new RuntimeException("Please check csrf token.");
         }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index e7b8089ea5..c7c1fed489 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -206,7 +206,7 @@ public class TestPlanService {
         }
         else {  //  有修改字段的调用，为保证将某些时间置null的情况，使用updateByPrimaryKey
             extScheduleMapper.updateNameByResourceID(testPlan.getId(), testPlan.getName());//   同步更新该测试的定时任务的name
-            i = testPlanMapper.updateByPrimaryKey(testPlan); //  更新
+            i = testPlanMapper.updateByPrimaryKeyWithBLOBs(testPlan); //  更新
         }
         if (!StringUtils.isBlank(testPlan.getStatus())) {
             BeanUtils.copyBean(testPlans, getTestPlan(testPlan.getId()));
diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue
index d6e72ddfd4..95a3ab2f8b 100644
--- a/frontend/src/business/components/api/automation/ApiAutomation.vue
+++ b/frontend/src/business/components/api/automation/ApiAutomation.vue
@@ -70,7 +70,6 @@
   import {getUUID, downloadFile, checkoutTestManagerOrTestUser} from "@/common/js/utils";
   import MsApiScenarioModule from "@/business/components/api/automation/scenario/ApiScenarioModule";
   import MsEditApiScenario from "./scenario/EditApiScenario";
-  import {getCurrentProjectID} from "../../../../common/js/utils";
 
   export default {
     name: "ApiAutomation",
@@ -96,7 +95,10 @@
       },
       isReadOnly() {
         return !checkoutTestManagerOrTestUser();
-      }
+      },
+      projectId() {
+        return this.$store.state.projectId
+      },
     },
     data() {
       return {
@@ -145,7 +147,7 @@
           let selectParamArr = redirectParam.split("edit:");
           if (selectParamArr.length == 2) {
             let scenarioId = selectParamArr[1];
-            let projectId = getCurrentProjectID();
+            let projectId = this.projectId;
             //查找单条数据，跳转修改页面
             let url = "/api/automation/list/" + 1 + "/" + 1;
             this.$post(url, {id: scenarioId, projectId: projectId}, response => {
@@ -176,7 +178,7 @@
         }
       },
       addTab(tab) {
-        if (!getCurrentProjectID()) {
+        if (!this.projectId) {
           this.$warning(this.$t('commons.check_project_tip'));
           return;
         }
diff --git a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
index c0624d9ffd..2fb0c281f8 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
@@ -45,7 +45,7 @@
   import MsApiReportExport from "./ApiReportExport";
   import MsApiReportViewHeader from "./ApiReportViewHeader";
   import {RequestFactory} from "../../definition/model/ApiTestModel";
-  import {windowPrint, getCurrentProjectID} from "@/common/js/utils";
+  import {windowPrint} from "@/common/js/utils";
 
   export default {
     name: "MsApiReport",
@@ -211,7 +211,7 @@
           return;
         }
         this.loading = true;
-        this.report.projectId = getCurrentProjectID();
+        this.report.projectId = this.projectId;
         let url = "/api/scenario/report/update";
         this.result = this.$post(url, this.report, response => {
           this.$success(this.$t('commons.save_success'));
@@ -236,7 +236,10 @@
       },
       isNotRunning() {
         return "Running" !== this.report.status;
-      }
+      },
+      projectId() {
+        return this.$store.state.projectId
+      },
     }
   }
 </script>
diff --git a/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue b/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
index 96110380f6..ae28794b28 100644
--- a/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
@@ -58,7 +58,7 @@
 
 <script>
   import {WORKSPACE_ID} from '@/common/js/constants';
-  import {getCurrentUser, getUUID, getCurrentProjectID} from "@/common/js/utils";
+  import {getCurrentUser, getUUID} from "@/common/js/utils";
   import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
 
   export default {
@@ -84,6 +84,11 @@
         },
       }
     },
+    computed: {
+      projectId() {
+        return this.$store.state.projectId
+      },
+    },
     methods: {
       saveScenario(saveAs) {
         this.$refs['scenarioForm'].validate((valid) => {
@@ -105,7 +110,7 @@
         })
       },
       setParameter() {
-        this.scenarioForm.projectId = getCurrentProjectID();
+        this.scenarioForm.projectId = this.projectId;
         this.scenarioForm.id = getUUID().substring(0, 8);
         this.scenarioForm.protocol = this.currentProtocol;
 
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 84aa1151ee..86e43deb4b 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -164,7 +164,7 @@
   import MsTablePagination from "@/business/components/common/pagination/TablePagination";
   import ShowMoreBtn from "@/business/components/track/case/components/ShowMoreBtn";
   import MsTag from "../../../common/components/MsTag";
-  import {downloadFile, getCurrentProjectID, getCurrentUser, getUUID, strMapToObj} from "@/common/js/utils";
+  import {downloadFile, getUUID, strMapToObj} from "@/common/js/utils";
   import MsApiReportDetail from "../report/ApiReportDetail";
   import MsTableMoreBtn from "./TableMoreBtn";
   import MsScenarioExtendButtons from "@/business/components/api/automation/scenario/ScenarioExtendBtns";
@@ -264,7 +264,6 @@
         infoDb: false,
         runVisible: false,
         planVisible: false,
-        projectId: "",
         runData: [],
         report: {},
         selectDataSize: 0,
@@ -338,7 +337,6 @@
     },
     created() {
       this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
-      this.projectId = getCurrentProjectID();
       this.search();
       this.getPrincipalOptions([]);
     },
@@ -363,7 +361,10 @@
     computed: {
       isNotRunning() {
         return "Running" !== this.report.status;
-      }
+      },
+      projectId() {
+        return this.$store.state.projectId
+      },
     },
     methods: {
       customHeader() {
@@ -559,7 +560,7 @@
       },
       buildBatchParam(param) {
         param.ids = Array.from(this.selectRows).map(row => row.id);
-        param.projectId = getCurrentProjectID();
+        param.projectId = this.projectId;
         param.condition = this.condition;
       },
       handleBatchExecute() {
@@ -640,7 +641,7 @@
         let scenarioIds = [];
         scenarioIds.push(row.id);
         run.id = getUUID();
-        run.projectId = getCurrentProjectID();
+        run.projectId = this.projectId;
         run.ids = scenarioIds;
         this.$post(url, run, response => {
           let data = response.data;
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
index de524efdf7..4b427b289e 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
@@ -59,7 +59,6 @@
 <script>
   import SelectMenu from "../../../track/common/SelectMenu";
   import MsAddBasisScenario from "@/business/components/api/automation/scenario/AddBasisScenario";
-  import {getCurrentProjectID} from "@/common/js/utils";
   import MsNodeTree from "../../../track/common/NodeTree";
   import {buildNodePath} from "../../definition/model/NodeTree";
   import ModuleTrashButton from "../../definition/components/module/ModuleTrashButton";
@@ -90,7 +89,10 @@
       },
       isRelevanceModel() {
         return this.relevanceProjectId ? true : false;
-      }
+      },
+      projectId() {
+        return this.$store.state.projectId
+      },
     },
     data() {
       return {
@@ -99,14 +101,12 @@
           filterText: "",
           trashEnable: false
         },
-        projectId: "",
         data: [],
         currentModule: undefined,
         moduleOptions: [],
       }
     },
     mounted() {
-      this.projectId = getCurrentProjectID();
       this.list();
     },
     watch: {
@@ -130,7 +130,7 @@
             this.addScenario();
             break;
           case "import":
-            this.result = this.$get("/api/automation/module/list/" + getCurrentProjectID(), response => {
+            this.result = this.$get("/api/automation/module/list/" + this.projectId, response => {
               if (response.data != undefined && response.data != null) {
                 this.data = response.data;
                 let moduleOptions = [];
@@ -238,7 +238,7 @@
         this.$emit("refreshTable");
       },
       addScenario() {
-        if (!getCurrentProjectID()) {
+        if (!this.projectId) {
           this.$warning(this.$t('commons.check_project_tip'));
           return;
         }
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index b96dbcec64..770bf7bf68 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -222,7 +222,7 @@
   import {parseEnvironment} from "../../definition/model/EnvironmentModel";
   import {ELEMENT_TYPE, ELEMENTS} from "./Setting";
   import MsApiCustomize from "./ApiCustomize";
-  import {getCurrentProjectID, getUUID, objToStrMap, strMapToObj, handleCtrlSEvent} from "@/common/js/utils";
+  import {getUUID, objToStrMap, strMapToObj, handleCtrlSEvent} from "@/common/js/utils";
   import ApiEnvironmentConfig from "../../definition/components/environment/ApiEnvironmentConfig";
   import MsInputTag from "./MsInputTag";
   import MsRun from "./DebugRun";
@@ -300,7 +300,6 @@
         path: "/api/automation/create",
         debugData: {},
         reportId: "",
-        projectId: "",
         enableCookieShare: false,
         globalOptions: {
           spacing: 30
@@ -317,7 +316,6 @@
       if (!this.currentScenario.apiScenarioModuleId) {
         this.currentScenario.apiScenarioModuleId = "";
       }
-      this.projectId = getCurrentProjectID();
       this.operatingElements = ELEMENTS.get("ALL");
       this.getWsProjects();
       this.getMaintainerOptions();
@@ -438,7 +436,10 @@
           }
         ];
         return buttons.filter(btn => btn.show);
-      }
+      },
+      projectId() {
+        return this.$store.state.projectId
+      },
     },
     methods: {
       setHideBtn() {
@@ -580,7 +581,7 @@
             arr[i].countController.proceed = true;
           }
           if (!arr[i].projectId) {
-            arr[i].projectId = getCurrentProjectID();
+            arr[i].projectId = this.projectId;
           }
           if (arr[i].hashTree != undefined && arr[i].hashTree.length > 0) {
             this.recursiveSorting(arr[i].hashTree);
@@ -602,7 +603,7 @@
           }
           // 设置项目ID
           if (!this.scenarioDefinition[i].projectId) {
-            this.scenarioDefinition[i].projectId = getCurrentProjectID();
+            this.scenarioDefinition[i].projectId = this.projectId;
           }
           if (this.scenarioDefinition[i].hashTree != undefined && this.scenarioDefinition[i].hashTree.length > 0) {
             this.recursiveSorting(this.scenarioDefinition[i].hashTree);
@@ -968,7 +969,7 @@
                     this.projectEnvMap = objToStrMap(obj.environmentMap);
                   } else {
                     // 兼容历史数据
-                    this.projectEnvMap.set(getCurrentProjectID(), obj.environmentId);
+                    this.projectEnvMap.set(this.projectId, obj.environmentId);
                   }
                   this.currentScenario.variables = [];
                   let index = 1;
@@ -1005,7 +1006,7 @@
       },
       setParameter() {
         this.currentScenario.stepTotal = this.scenarioDefinition.length;
-        this.currentScenario.projectId = getCurrentProjectID();
+        this.currentScenario.projectId = this.projectId;
         this.currentScenario.modulePath = this.getPath(this.currentScenario.apiScenarioModuleId);
         // 构建一个场景对象 方便引用处理
         let scenario = {
diff --git a/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue b/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
index 2aad07e5c6..c9a403c7e0 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
@@ -69,8 +69,7 @@
 
 <script>
   import MsDialogFooter from "../../../../common/components/MsDialogFooter";
-  import {listenGoBack, removeGoBackListener, getCurrentProjectID} from "@/common/js/utils";
-  import {buildNodePath} from "@/business/components/api/definition/model/NodeTree";
+  import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
 
   export default {
     name: "ScenarioImport",
@@ -161,6 +160,9 @@
       isHar() {
         return this.selectedPlatformValue === 'Har';
       },
+      projectId() {
+        return this.$store.state.projectId
+      },
     },
     methods: {
       scheduleEdit() {
@@ -241,7 +243,7 @@
           })
           param.modeId = this.formData.modeId
         }
-        param.projectId = getCurrentProjectID();
+        param.projectId = this.projectId;
         if (!this.swaggerUrlEable) {
           param.swaggerUrl = undefined;
         }
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
index fb6ce10dbb..f532f6d1ce 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
@@ -135,7 +135,7 @@
   import {parseEnvironment} from "../../../definition/model/EnvironmentModel";
   import {ELEMENT_TYPE, ELEMENTS} from "../Setting";
   import MsApiCustomize from "../ApiCustomize";
-  import {getCurrentProjectID, getUUID, objToStrMap, strMapToObj} from "@/common/js/utils";
+  import {getUUID, strMapToObj} from "@/common/js/utils";
   import ApiEnvironmentConfig from "../../../definition/components/environment/ApiEnvironmentConfig";
   import MsInputTag from "../MsInputTag";
   import MsRun from "../DebugRun";
@@ -215,7 +215,6 @@
         path: "/api/automation/create",
         debugData: {},
         reportId: "",
-        projectId: "",
         enableCookieShare: false,
         globalOptions: {
           spacing: 30
@@ -231,7 +230,6 @@
       if (!this.currentScenario.apiScenarioModuleId) {
         this.currentScenario.apiScenarioModuleId = "";
       }
-      this.projectId = getCurrentProjectID();
       this.operatingElements = ELEMENTS.get("ALL");
       this.projectEnvMap = this.envMap;
     },
@@ -354,7 +352,10 @@
           }
         ];
         return buttons.filter(btn => btn.show);
-      }
+      },
+      projectId() {
+        return this.$store.state.projectId
+      },
     },
     methods: {
       // 打开引用的场景
@@ -496,7 +497,7 @@
             arr[i].countController.proceed = true;
           }
           if (!arr[i].projectId) {
-            arr[i].projectId = getCurrentProjectID();
+            arr[i].projectId = this.projectId;
           }
           if (arr[i].hashTree != undefined && arr[i].hashTree.length > 0) {
             this.recursiveSorting(arr[i].hashTree);
@@ -518,7 +519,7 @@
           }
           // 设置项目ID
           if (!this.scenarioDefinition[i].projectId) {
-            this.scenarioDefinition[i].projectId = getCurrentProjectID();
+            this.scenarioDefinition[i].projectId = this.projectId;
           }
           if (this.scenarioDefinition[i].hashTree != undefined && this.scenarioDefinition[i].hashTree.length > 0) {
             this.recursiveSorting(this.scenarioDefinition[i].hashTree);
@@ -858,7 +859,7 @@
 
       setParameter() {
         this.currentScenario.stepTotal = this.scenarioDefinition.length;
-        this.currentScenario.projectId = getCurrentProjectID();
+        this.currentScenario.projectId = this.projectId;
         this.currentScenario.modulePath = this.getPath(this.currentScenario.apiScenarioModuleId);
         // 构建一个场景对象 方便引用处理
         let scenario = {
diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index 9f49986678..dc13136a3c 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -140,7 +140,7 @@ import MsRunTestHttpPage from "./components/runtest/RunTestHTTPPage";
 import MsRunTestTcpPage from "./components/runtest/RunTestTCPPage";
 import MsRunTestSqlPage from "./components/runtest/RunTestSQLPage";
 import MsRunTestDubboPage from "./components/runtest/RunTestDubboPage";
-import {checkoutTestManagerOrTestUser, getCurrentProjectID, getCurrentUser, getUUID} from "@/common/js/utils";
+import {checkoutTestManagerOrTestUser, getCurrentUser, getUUID} from "@/common/js/utils";
 import MsApiModule from "./components/module/ApiModule";
 import ApiCaseSimpleList from "./components/list/ApiCaseSimpleList";
 
@@ -159,7 +159,10 @@ import MsTabButton from "@/business/components/common/components/MsTabButton";
       },
       isReadOnly(){
         return !checkoutTestManagerOrTestUser();
-      }
+      },
+      projectId() {
+        return this.$store.state.projectId
+      },
     },
     components: {
       MsTabButton,
@@ -211,13 +214,9 @@ import MsTabButton from "@/business/components/common/components/MsTabButton";
         }],
         activeDom: "left",
         syncTabs: [],
-        projectId: "",
         nodeTree: []
       }
     },
-    mounted() {
-      this.projectId = getCurrentProjectID();
-    },
     watch: {
       currentProtocol() {
         this.handleCommand("CLOSE_ALL");
diff --git a/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue b/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
index d14d3eccfe..7bd6e6124a 100644
--- a/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
+++ b/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
@@ -59,7 +59,7 @@
   import MsDialogFooter from "../../../../common/components/MsDialogFooter";
   import {WORKSPACE_ID} from '../../../../../../common/js/constants';
   import {REQ_METHOD} from "../../model/JsonData";
-  import {getCurrentProjectID, getCurrentUser} from "../../../../../../common/js/utils";
+  import {getCurrentUser} from "../../../../../../common/js/utils";
   import {createComponent, Request} from "../jmeter/components";
 
   export default {
@@ -94,8 +94,12 @@
         value: REQ_METHOD[0].id,
         options: REQ_METHOD,
       }
-    }
-    ,
+    },
+    computed: {
+      projectId() {
+        return this.$store.state.projectId
+      },
+    },
     methods: {
       saveApi(saveAs) {
         this.$refs['httpForm'].validate((valid) => {
@@ -137,7 +141,7 @@
             break;
         }
         this.httpForm.bodyUploadIds = [];
-        this.httpForm.projectId = getCurrentProjectID();
+        this.httpForm.projectId = this.projectId;
         this.httpForm.id = this.httpForm.request.id;
         this.httpForm.protocol = this.currentProtocol;
 
diff --git a/frontend/src/business/components/api/definition/components/basis/SetEnvironment.vue b/frontend/src/business/components/api/definition/components/basis/SetEnvironment.vue
index 2abc7a3191..46a4890fc7 100644
--- a/frontend/src/business/components/api/definition/components/basis/SetEnvironment.vue
+++ b/frontend/src/business/components/api/definition/components/basis/SetEnvironment.vue
@@ -36,7 +36,6 @@
 <script>
 import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
-import {getUUID, getCurrentProjectID} from "@/common/js/utils";
 
 export default {
   name: "MsSetEnvironment",
@@ -64,6 +63,11 @@ export default {
       this.environmentChange(this.environmentId);
     },
   },
+  computed: {
+    projectId() {
+      return this.$store.state.projectId
+    },
+  },
   methods: {
     environmentChange(value) {
       for (let i in this.environments) {
@@ -74,7 +78,7 @@ export default {
       }
     },
     getEnvironments() {
-      let selectProjectId = getCurrentProjectID();
+      let selectProjectId = this.projectId;
       if (selectProjectId) {
         this.$get('/api/environment/list/' + selectProjectId, response => {
           this.environments = response.data;
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
index d7efb5be4d..cdc7166ee4 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -50,7 +50,7 @@
   import ApiCaseHeader from "./ApiCaseHeader";
   import ApiCaseItem from "./ApiCaseItem";
   import MsRun from "../Run";
-  import {getCurrentProjectID, getUUID} from "@/common/js/utils";
+  import {getUUID} from "@/common/js/utils";
   import MsDrawer from "../../../../common/components/MsDrawer";
   import {CASE_ORDER} from "../../model/JsonData";
   import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components";
@@ -89,7 +89,6 @@
         runData: [],
         selectdCases: [],
         reportId: "",
-        projectId: "",
         testCaseId: "",
         checkedCases: new Set(),
         visible: false,
@@ -128,7 +127,6 @@
     },
     created() {
       this.api = this.currentApi;
-      this.projectId = getCurrentProjectID();
       if (this.createCase) {
         this.sysAddition();
       }
@@ -136,7 +134,10 @@
     computed: {
       isCaseEdit() {
         return this.testCaseId ? true : false;
-      }
+      },
+      projectId() {
+        return this.$store.state.projectId
+      },
     },
     methods: {
       open(api, testCaseId) {
@@ -290,7 +291,7 @@
         this.singleRunId = row.id;
         row.request.name = row.id;
         row.request.useEnvironment = this.environment;
-        row.request.projectId = getCurrentProjectID();
+        row.request.projectId = this.projectId;
         this.runData.push(row.request);
         /*触发执行操作*/
         this.reportId = getUUID().substring(0, 8);
@@ -354,7 +355,7 @@
         if (form) {
           param[form.type] = form.value;
           param.ids = this.selectdCases;
-          param.projectId = getCurrentProjectID();
+          param.projectId = this.projectId;
           param.envId = form.envId;
           if (this.api) {
             param.protocol = this.api.protocol;
diff --git a/frontend/src/business/components/api/definition/components/import/ApiImport.vue b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
index e4e77933fc..6ccc97837a 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
@@ -94,7 +94,6 @@
 <script>
 import MsDialogFooter from "../../../../common/components/MsDialogFooter";
 import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
-import {getCurrentProjectID} from "../../../../../../common/js/utils";
 import ScheduleImport from "@/business/components/api/definition/components/import/ImportScheduleEdit";
 
 export default {
@@ -202,7 +201,10 @@ export default {
     },
     isScenarioModel() {
       return this.model === 'scenario';
-    }
+    },
+    projectId() {
+      return this.$store.state.projectId
+    },
   },
   methods: {
     scheduleEdit() {
@@ -283,7 +285,7 @@ export default {
         })
         param.modeId = this.formData.modeId
       }
-      param.projectId = getCurrentProjectID();
+      param.projectId = this.projectId;
       if (!this.swaggerUrlEnable) {
         param.swaggerUrl = undefined;
       }
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index f5ad30f686..c6fdcd47a0 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -143,7 +143,7 @@ import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
 import MsBatchEdit from "../basis/BatchEdit";
 import {API_METHOD_COLOUR, CASE_PRIORITY, DUBBO_METHOD, REQ_METHOD, SQL_METHOD, TCP_METHOD} from "../../model/JsonData";
 
-import {getBodyUploadFiles, getCurrentProjectID, getCurrentUser} from "@/common/js/utils";
+import {getBodyUploadFiles} from "@/common/js/utils";
 import PriorityTableItem from "../../../../track/common/tableItems/planview/PriorityTableItem";
 import MsApiCaseTableExtendBtns from "../reference/ApiCaseTableExtendBtns";
 import MsReferenceView from "../reference/ReferenceView";
@@ -282,11 +282,13 @@ export default {
       }
     },
   computed: {
-
     // 接口定义用例列表
     isApiModel() {
       return this.model === 'api'
     },
+    projectId() {
+      return this.$store.state.projectId
+    },
   },
   methods: {
     customHeader() {
@@ -305,7 +307,7 @@ export default {
         this.selectAll = false;
         this.unSelection = [];
         this.selectDataCounts = 0;
-        this.condition.projectId = getCurrentProjectID();
+        this.condition.projectId = this.projectId;
 
         if (this.currentProtocol != null) {
           this.condition.protocol = this.currentProtocol;
@@ -409,7 +411,7 @@ export default {
           callback: (action) => {
             if (action === 'confirm') {
               let obj = {};
-              obj.projectId = getCurrentProjectID();
+              obj.projectId = this.projectId;
               obj.selectAllDate = this.isSelectAllDate;
               obj.unSelectIds = this.unSelection;
               obj.ids = Array.from(this.selectRows).map(row => row.id);
@@ -456,7 +458,7 @@ export default {
         let param = {};
         param[form.type] = form.value;
         param.ids = ids;
-        param.projectId = getCurrentProjectID();
+        param.projectId = this.projectId;
         param.selectAllDate = this.isSelectAllDate;
         param.unSelectIds = this.unSelection;
         param = Object.assign(param, this.condition);
@@ -528,7 +530,7 @@ export default {
       },
       showEnvironment(row) {
 
-        let projectID = getCurrentProjectID();
+        let projectID = this.projectId;
         if (this.projectId) {
           this.$get('/api/environment/list/' + this.projectId, response => {
             this.environments = response.data;
@@ -580,7 +582,7 @@ export default {
           id: row.id,
           testElement: testPlan,
           name: row.name,
-          projectId: getCurrentProjectID(),
+          projectId: this.projectId,
         };
         let bodyFiles = getBodyUploadFiles(reqObj, runData);
         reqObj.reportId = "run";
diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index eaa6104b6d..3cae8525b0 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -225,7 +225,6 @@
   import {API_METHOD_COLOUR, API_STATUS, DUBBO_METHOD, REQ_METHOD, SQL_METHOD, TCP_METHOD} from "../../model/JsonData";
   import {checkoutTestManagerOrTestUser, downloadFile, getUUID} from "@/common/js/utils";
   import {PROJECT_NAME} from '@/common/js/constants';
-  import {getCurrentProjectID, getCurrentUser} from "@/common/js/utils";
   import {API_LIST, TEST_CASE_LIST, WORKSPACE_ID} from '@/common/js/constants';
   import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
   import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus";
@@ -370,6 +369,11 @@
         },
       }
     },
+    computed: {
+      projectId() {
+        return this.$store.state.projectId
+      },
+    },
     created: function () {
       if (this.trashEnable) {
         this.condition.filters = {status: ["Trash"]};
@@ -409,7 +413,7 @@
         initCondition(this.condition);
         this.selectDataCounts = 0;
         this.condition.moduleIds = this.selectNodeIds;
-        this.condition.projectId = getCurrentProjectID();
+        this.condition.projectId = this.projectId;
         if (this.currentProtocol != null) {
           this.condition.protocol = this.currentProtocol;
         }
@@ -636,7 +640,7 @@
         let arr = Array.from(this.selectRows);
         let ids = arr.map(row => row.id);
         param.ids = ids;
-        param.projectId = getCurrentProjectID();
+        param.projectId = this.projectId;
         param.moduleId = param.nodeId;
         param.condition = this.condition;
         param.selectAllDate = this.isSelectAllDate;
diff --git a/frontend/src/business/components/api/definition/components/module/ApiModule.vue b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
index ca7e7691f7..11eb4dfccb 100644
--- a/frontend/src/business/components/api/definition/components/module/ApiModule.vue
+++ b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
@@ -38,7 +38,6 @@ import MsAddBasisApi from "../basis/AddBasisApi";
 import SelectMenu from "../../../../track/common/SelectMenu";
 import {OPTIONS} from "../../model/JsonData";
 import ApiImport from "../import/ApiImport";
-import {getCurrentProjectID} from "@/common/js/utils";
 import MsNodeTree from "../../../../track/common/NodeTree";
 import ApiModuleHeader from "./ApiModuleHeader";
 import {buildNodePath} from "../../model/NodeTree";
@@ -60,7 +59,6 @@ export default {
           filterText: "",
           trashEnable: false
         },
-        projectId: "",
         data: [],
         currentModule: {},
       }
@@ -85,10 +83,12 @@ export default {
       },
       isReviewModel() {
         return this.reviewId ? true : false;
-      }
+      },
+      projectId() {
+        return this.$store.state.projectId
+      },
     },
     mounted() {
-      this.projectId = getCurrentProjectID();
       this.$emit('protocolChange', this.condition.protocol);
       this.list();
     },
diff --git a/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue b/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
index 4f5b2b6bb4..1339afced8 100644
--- a/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
+++ b/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
@@ -58,7 +58,6 @@ import {OPTIONS} from "../../model/JsonData";
 import MsAddBasisApi from "../basis/AddBasisApi";
 import ApiImport from "../import/ApiImport";
 import ModuleTrashButton from "./ModuleTrashButton";
-import {getCurrentProjectID} from "../../../../../../common/js/utils";
 import {buildNodePath} from "@/business/components/api/definition/model/NodeTree";
 import TemplateComponent from "../../../../track/plan/view/comonents/report/TemplateComponent/TemplateComponent";
 
@@ -91,6 +90,11 @@ export default {
       }
     },
   },
+  computed: {
+    projectId() {
+      return this.$store.state.projectId
+    },
+  },
   methods: {
 
     handleCommand(e) {
@@ -104,12 +108,12 @@ export default {
         case "add-module":
           break;
         case "import":
-          if (!getCurrentProjectID()) {
+          if (!this.projectId) {
             this.$warning(this.$t('commons.check_project_tip'));
             return;
           }
           this.protocol = "HTTP";
-          this.result = this.$get("/api/module/list/" + getCurrentProjectID() + "/" + this.protocol, response => {
+          this.result = this.$get("/api/module/list/" + this.projectId + "/" + this.protocol, response => {
             if (response.data != undefined && response.data != null) {
               this.data = response.data;
               let moduleOptions = [];
@@ -124,7 +128,7 @@ export default {
       }
     },
     chooseExportType(e) {
-      if (!getCurrentProjectID()) {
+      if (!this.projectId) {
         this.$warning(this.$t('commons.check_project_tip'));
         return;
       }
@@ -138,7 +142,7 @@ export default {
       }
     },
     addApi() {
-      if (!getCurrentProjectID()) {
+      if (!this.projectId) {
         this.$warning(this.$t('commons.check_project_tip'));
         return;
       }
diff --git a/frontend/src/business/components/api/head/ApiHeaderMenus.vue b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
index 982ecc1960..68275d6e10 100644
--- a/frontend/src/business/components/api/head/ApiHeaderMenus.vue
+++ b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
@@ -5,26 +5,26 @@
       <el-col :span="14">
         <el-menu class="header-menu" :unique-opened="true" mode="horizontal" router :default-active='$route.path'>
 
-          <el-menu-item v-show="$store.state.switch.value=='new'" :index="'/api/home'">
+          <el-menu-item v-show="isNewVersion" :index="'/api/home'">
             {{ $t("i18n.home") }}
           </el-menu-item>
-          <el-menu-item v-show="$store.state.switch.value=='old'" :index="'/api/home_obsolete'">
+          <el-menu-item v-show="isOldVersion" :index="'/api/home_obsolete'">
             {{ $t("i18n.home") }}
           </el-menu-item>
 
-          <el-menu-item v-show="$store.state.switch.value=='new'" :index="'/api/definition'">
+          <el-menu-item v-show="isNewVersion" :index="'/api/definition'">
             {{ $t("i18n.definition") }}
           </el-menu-item>
 
-          <el-menu-item v-show="$store.state.switch.value=='new'" :index="'/api/automation'">
+          <el-menu-item v-show="isNewVersion" :index="'/api/automation'">
             {{ $t("i18n.automation") }}
           </el-menu-item>
 
-          <el-menu-item v-show="$store.state.switch.value=='new'" :index="'/api/automation/report'">
+          <el-menu-item v-show="isNewVersion" :index="'/api/automation/report'">
             {{ $t("i18n.report") }}
           </el-menu-item>
 
-          <el-submenu v-show="$store.state.switch.value=='old'"
+          <el-submenu v-show="isOldVersion"
                       v-permission="['test_manager','test_user','test_viewer']" index="4">
             <template v-slot:title>{{ $t('commons.test') }}</template>
             <ms-recent-list ref="testRecent" :options="testRecent"/>
@@ -35,7 +35,7 @@
                               :title="$t('load_test.create')"/>
           </el-submenu>
 
-          <el-submenu v-show="$store.state.switch.value=='old'"
+          <el-submenu v-show="isOldVersion"
                       v-permission="['test_manager','test_user','test_viewer']" index="5">
             <template v-slot:title>{{ $t('commons.report') }}</template>
             <ms-recent-list ref="reportRecent" :options="reportRecent"/>
@@ -44,7 +44,7 @@
           </el-submenu>
 
 
-          <el-menu-item v-show="$store.state.switch.value=='old'"
+          <el-menu-item v-show="isOldVersion"
                         v-permission="['test_manager','test_user','test_viewer']" :index="'/api/monitor/view'">
             {{ $t('commons.monitor') }}
           </el-menu-item>
@@ -64,6 +64,7 @@ import MsCreateTest from "../../common/head/CreateTest";
 import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
 import SearchList from "@/business/components/common/head/SearchList";
 import ProjectChange from "@/business/components/common/head/ProjectSwitch";
+import {mapGetters} from "vuex";
 
 export default {
   name: "MsApiHeaderMenus",
@@ -94,6 +95,12 @@ export default {
       currentProject: ''
     }
   },
+  computed: {
+    ...mapGetters([
+      'isNewVersion',
+      'isOldVersion',
+    ])
+  },
   methods: {
     registerEvents() {
       ApiEvent.$on(LIST_CHANGE, () => {
diff --git a/frontend/src/business/components/common/head/HeaderTopMenus.vue b/frontend/src/business/components/common/head/HeaderTopMenus.vue
index 7f2cc6056c..8d559d0e94 100644
--- a/frontend/src/business/components/common/head/HeaderTopMenus.vue
+++ b/frontend/src/business/components/common/head/HeaderTopMenus.vue
@@ -30,6 +30,7 @@
 
 <script>
   import {LicenseKey} from '@/common/js/constants';
+  import {mapGetters} from "vuex";
 
   const requireContext = require.context('@/business/components/xpack/', true, /router\.js$/)
   const report = requireContext.keys().map(key => requireContext(key).report);
@@ -62,15 +63,21 @@
         this.isReport = false;
       }
     },
+    computed: {
+      ...mapGetters([
+        'isNewVersion',
+        'isOldVersion',
+      ])
+    },
     methods: {
       handleSelect(index) {
         this.activeIndex = index
       },
       active() {
         if (this.activeIndex === '/api') {
-          if (this.$store.state.switch.value == 'new') {
+          if (this.isNewVersion) {
             window.location.href = "/#/api/home";
-          } else if (this.$store.state.switch.value == 'old') {
+          } else if (this.isOldVersion) {
             window.location.href = "/#/api/home_obsolete";
           }
         }
diff --git a/frontend/src/business/components/common/head/HeaderUser.vue b/frontend/src/business/components/common/head/HeaderUser.vue
index bd17eb32a4..59fb5744f8 100644
--- a/frontend/src/business/components/common/head/HeaderUser.vue
+++ b/frontend/src/business/components/common/head/HeaderUser.vue
@@ -9,10 +9,10 @@
         <el-dropdown-item command="about">{{ $t('commons.about_us') }} <i class="el-icon-info"/></el-dropdown-item>
         <el-dropdown-item command="help">{{ $t('commons.help_documentation') }}</el-dropdown-item>
         <el-dropdown-item command="ApiHelp">{{ $t('commons.api_help_documentation') }}</el-dropdown-item>
-        <el-dropdown-item command="old" v-show=isReadOnly @click.native="changeBar('old')">
+        <el-dropdown-item command="old" v-show=isNewVersion @click.native="changeBar('old')">
           {{ $t('commons.cut_back_old_version') }}
         </el-dropdown-item>
-        <el-dropdown-item command="new" v-show=!isReadOnly @click.native="changeBar('new')">
+        <el-dropdown-item command="new" v-show=isOldVersion @click.native="changeBar('new')">
           {{ $t('commons.cut_back_new_version') }}
         </el-dropdown-item>
         <el-dropdown-item command="logout">{{ $t('commons.exit_system') }}</el-dropdown-item>
@@ -27,6 +27,7 @@
 import {getCurrentUser} from "@/common/js/utils";
 import AboutUs from "./AboutUs";
 import axios from "axios";
+import {mapGetters} from "vuex";
 
 const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
 const auth = requireComponent.keys().length > 0 ? requireComponent("./auth/Auth.vue") : {};
@@ -36,13 +37,16 @@ export default {
   components: {AboutUs},
   data() {
     return {
-      isReadOnly: this.$store.state.isReadOnly.flag
     }
   },
   computed: {
     currentUser: () => {
       return getCurrentUser();
-    }
+    },
+    ...mapGetters([
+      'isNewVersion',
+      'isOldVersion',
+    ])
   },
   methods: {
     logout: function () {
@@ -79,9 +83,7 @@ export default {
       }
     },
     changeBar(item) {
-      this.isReadOnly = !this.isReadOnly
-      this.$store.commit('setFlag', this.isReadOnly);
-      this.$store.commit('setValue', item);
+      this.$store.commit('setVersionSwitch', item);
       if (item == "old") {
         window.location.href = "/#/api/home_obsolete";
       } else {
diff --git a/frontend/src/business/components/common/head/SearchList.vue b/frontend/src/business/components/common/head/SearchList.vue
index ec087a2819..d8e05c4109 100644
--- a/frontend/src/business/components/common/head/SearchList.vue
+++ b/frontend/src/business/components/common/head/SearchList.vue
@@ -28,6 +28,7 @@
 <script>
 import {getCurrentProjectID, getCurrentUser, hasRoles} from "@/common/js/utils";
 import {PROJECT_ID, ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER} from "@/common/js/constants";
+import {mapGetters} from "vuex";
 
 export default {
   name: "SearchList",
@@ -39,6 +40,10 @@ export default {
     this.init();
   },
   computed: {
+    ...mapGetters([
+      'isNewVersion',
+      'isOldVersion',
+    ]),
     currentProjectId() {
       return localStorage.getItem(PROJECT_ID)
     }
@@ -70,7 +75,10 @@ export default {
               let projectId = localStorage.getItem(PROJECT_ID);
               if (!projectId || projectId != userLastProjectId) {
                 localStorage.setItem(PROJECT_ID, userLastProjectId);
+                this.$store.commit('setProjectId', userLastProjectId);
                 window.location.reload();
+              } else {
+                this.$store.commit('setProjectId', projectId);
               }
             }
           }
@@ -104,11 +112,12 @@ export default {
       }
       this.$post("/user/update/current", {id: this.userId, lastProjectId: projectId}, () => {
         localStorage.setItem(PROJECT_ID, projectId);
+        this.$store.commit('setProjectId', projectId);
         let path = this.$route.matched[0].path ? this.$route.matched[0].path : '/';
         if (path === '/api') {
-          if (this.$store.state.switch.value === 'new') {
+          if (this.isNewVersion) {
             path = "/api/home";
-          } else if (this.$store.state.switch.value === 'old') {
+          } else if (this.isOldVersion) {
             path = "/api/home_obsolete";
           } else {
             path = '/';
diff --git a/frontend/src/business/components/performance/test/EditPerformanceTest.vue b/frontend/src/business/components/performance/test/EditPerformanceTest.vue
index 97596ac98e..c4fe35f1dc 100644
--- a/frontend/src/business/components/performance/test/EditPerformanceTest.vue
+++ b/frontend/src/business/components/performance/test/EditPerformanceTest.vue
@@ -123,7 +123,7 @@ export default {
   },
   methods: {
     importAPITest() {
-      let apiTest = this.$store.state.api.test;
+      let apiTest = this.$store.state.test;
       if (apiTest && apiTest.name) {
         this.$set(this.test, "name", apiTest.name);
         let blob = new Blob([apiTest.jmx.xml], {type: "application/octet-stream"});
diff --git a/frontend/src/business/components/performance/test/components/ExistFiles.vue b/frontend/src/business/components/performance/test/components/ExistFiles.vue
index e62d21ca7a..9a3843f6c4 100644
--- a/frontend/src/business/components/performance/test/components/ExistFiles.vue
+++ b/frontend/src/business/components/performance/test/components/ExistFiles.vue
@@ -215,7 +215,7 @@ export default {
 
       // 检查数据库是否存在同名文件
       async function f() {
-        return await axios.post('/performance/file/' + getCurrentProjectID() + '/getMetadataByName', {filename: file.name})
+        return await axios.post('/performance/file/' + getCurrentProjectID() + '/getMetadataByName', {name: file.name})
       }
 
       await f().then(res => {
diff --git a/frontend/src/business/components/track/home/TrackHome.vue b/frontend/src/business/components/track/home/TrackHome.vue
index a978df9cea..206a2af82e 100644
--- a/frontend/src/business/components/track/home/TrackHome.vue
+++ b/frontend/src/business/components/track/home/TrackHome.vue
@@ -169,7 +169,7 @@ export default {
           type: 'bar',
           itemStyle: {
             normal: {
-              color: this.$store.state.theme.theme ? this.$store.state.theme.theme : COUNT_NUMBER
+              color: this.$store.state.theme ? this.$store.state.theme : COUNT_NUMBER
             }
           }
         },
@@ -179,7 +179,7 @@ export default {
             type: 'bar',
             itemStyle: {
               normal: {
-                color: this.$store.state.theme.theme ? this.$store.state.theme.theme : COUNT_NUMBER_SHALLOW
+                color: this.$store.state.theme ? this.$store.state.theme : COUNT_NUMBER_SHALLOW
               }
             }
           }]
diff --git a/frontend/src/business/main.js b/frontend/src/business/main.js
index 4d98b7cd4e..4fe1c4f6c3 100644
--- a/frontend/src/business/main.js
+++ b/frontend/src/business/main.js
@@ -10,7 +10,7 @@ import router from "./components/common/router/router";
 import YanProgress from 'yan-progress';
 import './permission' // permission control
 import i18n from "../i18n/i18n";
-import store from "./store";
+import store from "../store";
 import {permission, roles, tester, xpack} from './permission'
 import chart from "../common/js/chart";
 import CalendarHeatmap from "../common/js/calendar-heatmap";
diff --git a/frontend/src/business/store.js b/frontend/src/business/store.js
deleted file mode 100644
index 4fbb5d7f17..0000000000
--- a/frontend/src/business/store.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-
-Vue.use(Vuex);
-
-const Common = {
-  state: {
-    projectId: ""
-  },
-  mutations: {
-    setProjectId(state, projectId) {
-      state.projectId = projectId;
-    }
-  }
-}
-
-const API = {
-  state: {
-    test: {}
-  },
-  mutations: {
-    setTest(state, test) {
-      state.test = test;
-    },
-    clearTest(state) {
-      state.test = {};
-    }
-  }
-}
-
-const Switch = {
-  state: {
-    value: "new"
-  },
-  mutations: {
-    setValue(state, value) {
-      state.value = value;
-    }
-  }
-}
-
-const IsReadOnly = {
-  state: {
-    flag: true
-  },
-  mutations: {
-    setFlag(state, value) {
-      state.flag = value;
-    }
-  }
-}
-
-const Theme = {
-  state: {
-    theme: undefined
-  },
-  mutations: {
-    setTheme(state, value) {
-      state.theme = value;
-    }
-  }
-}
-
-export default new Vuex.Store({
-  modules: {
-    api: API,
-    common: Common,
-    switch: Switch,
-    isReadOnly: IsReadOnly,
-    theme: Theme
-  }
-})
diff --git a/frontend/src/store/actions.js b/frontend/src/store/actions.js
new file mode 100644
index 0000000000..97014f3a52
--- /dev/null
+++ b/frontend/src/store/actions.js
@@ -0,0 +1,6 @@
+const actions = {
+  // changeCount: ({
+  //   commit
+  // }) => commit('changeCount'),
+}
+export default actions;
diff --git a/frontend/src/store/getters.js b/frontend/src/store/getters.js
new file mode 100644
index 0000000000..f0d2e0baab
--- /dev/null
+++ b/frontend/src/store/getters.js
@@ -0,0 +1,6 @@
+const getters = {
+  isNewVersion: state => state.versionSwitch === 'new',
+  isOldVersion: state => state.versionSwitch === 'old'
+}
+
+export default getters
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
new file mode 100644
index 0000000000..b3700caada
--- /dev/null
+++ b/frontend/src/store/index.js
@@ -0,0 +1,25 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+import getters from './getters'
+import actions from './actions'
+import mutations from './mutations'
+
+Vue.use(Vuex)
+
+const state = {
+  projectId: "",
+  test: {},
+  versionSwitch: "new",
+  isReadOnly: true,
+  theme: undefined
+
+}
+
+const store = new Vuex.Store({
+  state,
+  getters,
+  actions,
+  mutations
+})
+
+export default store
diff --git a/frontend/src/store/mutations.js b/frontend/src/store/mutations.js
new file mode 100644
index 0000000000..a6f0a4a820
--- /dev/null
+++ b/frontend/src/store/mutations.js
@@ -0,0 +1,9 @@
+const mutations = {
+  setProjectId: (state, projectId) => state.projectId = projectId,
+  setTest: (state, test) => state.test = test,
+  clearTest: state => state.test = {},
+  setVersionSwitch: (state, value) => state.versionSwitch = value,
+  setTheme: (state, value) => state.theme = value
+}
+
+export default mutations;