From 45d36d2471ec7510190cc881cd64470a02666ae0 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 07 八月 2020 10:16:06 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/web/RouterController.java | 17 ++++++----------- src/main/webapp/static/js/common.js | 6 +----- src/main/resources/application.yml | 5 +++-- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java index fb79559..6b21c8a 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/index.html":"/"+applicationName+"/views/index.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(); } @@ -39,8 +36,7 @@ @RequestMapping("/pda") public void pda(HttpServletResponse response) { try{ - String redirect = Cools.isEmpty(applicationName)?"/views/pda/login.html":"/"+applicationName+"/views/pda/login.html"; - response.sendRedirect(redirect); + response.sendRedirect(contextPath+"/views/pda/login.html"); } catch (Exception ex){ ex.printStackTrace(); } @@ -49,8 +45,7 @@ @RequestMapping("/pda/ce") public void pdaCe(HttpServletResponse response) { try{ - String redirect = Cools.isEmpty(applicationName)?"/views/pdaCe/login.html":"/"+applicationName+"/views/pdaCe/login.html"; - response.sendRedirect(redirect); + response.sendRedirect(contextPath+"/views/pdaCe/login.html"); } catch (Exception ex){ ex.printStackTrace(); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 52092aa..df44fb7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,10 +1,11 @@ server: port: 8081 + servlet: + context-path: /@pom.artifactId@ spring: application: -# name: @pom.artifactId@ - name: + name: @pom.artifactId@ datasource: # mysql # driver-class-name: com.mysql.jdbc.Driver diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index 9c055cc..0dade9a 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -1,8 +1,4 @@ -// 鐢熶骇 -// var baseUrl = "/asrs"; -// 娴嬭瘯 -var baseUrl = ""; - +var baseUrl = "/asrs"; // 璇︽儏绐楀彛-楂樺害 var detailHeight = '80%'; -- Gitblit v1.9.1