From 25426b299e155f6d581f5dbec57821ceb34b185f Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Mon, 2 Mar 2020 18:59:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A8=A1=E7=89=88=E5=BC=95?= =?UTF-8?q?=E6=93=8E=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pom.xml | 11 ----------- .../io/metersphere/controller/IndexController.java | 4 ++-- backend/src/main/resources/application.properties | 5 ++++- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 4ef4babb82..98a38b9ab3 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -41,17 +41,6 @@ spring-boot-starter - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-tomcat - - - - org.springframework.boot spring-boot-starter-test diff --git a/backend/src/main/java/io/metersphere/controller/IndexController.java b/backend/src/main/java/io/metersphere/controller/IndexController.java index 4785794b7f..2471534b6f 100644 --- a/backend/src/main/java/io/metersphere/controller/IndexController.java +++ b/backend/src/main/java/io/metersphere/controller/IndexController.java @@ -11,13 +11,13 @@ public class IndexController { @GetMapping(value = "/") public String index() { - return "index"; + return "index.html"; } @GetMapping(value = "/login") public String login() { if (SessionUtils.getUser() == null) { - return "login"; + return "login.html"; } else { return "redirect:/"; } diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index a5bb195f4c..0f453b5785 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -22,4 +22,7 @@ mybatis.configuration.use-column-label=true mybatis.configuration.auto-mapping-behavior=full mybatis.configuration.default-statement-timeout=25000 -logging.file.path=/opt/fit2cloud/logs/${spring.application.name} \ No newline at end of file +logging.file.path=/opt/fit2cloud/logs/${spring.application.name} + +# view +spring.resources.static-locations=classpath:/templates/,classpath:/static/