From b26b72b495d06290f3484dc529e7ee6e7791a2a6 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 20 八月 2020 13:06:24 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/web/RouterController.java | 11 ++++------- src/main/webapp/static/js/common.js | 6 +----- pom.xml | 2 +- src/main/resources/application.yml | 5 +++-- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 60478db..718b060 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ </dependencies> <build> - <finalName>wcs</finalName> + <finalName>jswcs</finalName> <plugins> <plugin> <groupId>org.springframework.boot</groupId> diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java index 92ad6a6..d26088e 100644 --- a/src/main/java/com/zy/common/web/RouterController.java +++ b/src/main/java/com/zy/common/web/RouterController.java @@ -1,6 +1,5 @@ package com.zy.common.web; -import com.core.common.Cools; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -13,14 +12,13 @@ @Controller public class RouterController { - @Value("${spring.application.name}") - private String applicationName; + @Value("${server.servlet.context-path}") + private String contextPath; @RequestMapping("/") public void index(HttpServletResponse response) { try{ - String redirect = Cools.isEmpty(applicationName)?"views/login.html":"/"+applicationName+"/views/login.html"; - response.sendRedirect(redirect); + response.sendRedirect(contextPath+"/views/index.html"); } catch (Exception ex){ ex.printStackTrace(); } @@ -29,8 +27,7 @@ @RequestMapping("/login") public void login(HttpServletResponse response) { try{ - String redirect = Cools.isEmpty(applicationName)?"/views/login.html":"/"+applicationName+"/views/login.html"; - response.sendRedirect(redirect); + response.sendRedirect(contextPath+"/views/login.html"); } catch (Exception ex){ ex.printStackTrace(); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 3a5ccb3..1178607 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,10 +1,11 @@ server: port: 9090 + servlet: + context-path: /@pom.build.finalName@ spring: application: -# name: @pom.artifactId@ - name: + name: @pom.build.finalName@ datasource: # sql-server driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index bda3a25..e4ef932 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -1,8 +1,4 @@ -// 鐢熶骇 -// var baseUrl = "/wcs"; -// 娴嬭瘯 -var baseUrl = ""; - +var baseUrl = "/jswcs"; // 璧嬪�� function setVal(el, val) { -- Gitblit v1.9.1