From dd5b0d9cab85fed38565bd18b92fc3cc57dd2f5f Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Mon, 28 Dec 2020 10:50:01 +0800 Subject: [PATCH 1/3] chore: Sync --- backend/src/main/java/io/metersphere/xpack | 2 +- frontend/src/business/components/xpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index 79343a2763..f27d1609d7 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit 79343a2763b014355f91fc21b2356a95ae437973 +Subproject commit f27d1609d77f7d6c988d37d709466e844d350e17 diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 8cda5c873c..7d43154a7c 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 8cda5c873cd9985c97adb34efacf507167fa4182 +Subproject commit 7d43154a7c19732407a8e9ace8a7d1ea13c91f36 From ad982b5e092d34a36117f21b75eac38b6e1a4ec6 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Mon, 28 Dec 2020 11:08:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=81=AB=E7=8B=90?= =?UTF-8?q?icon=E4=B8=8D=E8=83=BD=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/io/metersphere/config/ShiroConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/main/java/io/metersphere/config/ShiroConfig.java b/backend/src/main/java/io/metersphere/config/ShiroConfig.java index 1fa1508bfe..cb14c1c6bb 100644 --- a/backend/src/main/java/io/metersphere/config/ShiroConfig.java +++ b/backend/src/main/java/io/metersphere/config/ShiroConfig.java @@ -44,6 +44,7 @@ public class ShiroConfig implements EnvironmentAware { Map filterChainDefinitionMap = shiroFilterFactoryBean.getFilterChainDefinitionMap(); ShiroUtils.loadBaseFilterChain(filterChainDefinitionMap); filterChainDefinitionMap.put("/display/info", "anon"); + filterChainDefinitionMap.put("/favicon.ico", "anon"); filterChainDefinitionMap.put("/display/file/**", "anon"); filterChainDefinitionMap.put("/jmeter/download/**", "anon"); filterChainDefinitionMap.put("/**", "apikey, authc"); From 84208e12309be68f1d973f1e00a750e820a3eb43 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Mon, 28 Dec 2020 11:19:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=E7=94=A8=E6=88=B7=E9=A6=96?= =?UTF-8?q?=E6=AC=A1=E7=99=BB=E5=BD=95=E5=90=8E=E8=B7=B3=E8=BD=AC=E5=88=B0?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #96 --- frontend/src/business/components/common/router/router.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/business/components/common/router/router.js b/frontend/src/business/components/common/router/router.js index f5821015c4..a9f24d6ebb 100644 --- a/frontend/src/business/components/common/router/router.js +++ b/frontend/src/business/components/common/router/router.js @@ -11,7 +11,7 @@ Vue.use(VueRouter); const router = new VueRouter({ routes: [ - {path: "/", redirect: '/setting/personsetting'}, + {path: "/", redirect: '/track/home'}, { path: "/sidebar", components: {