From d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/common/web/RouterController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java
index 63fa812..6b21c8a 100644
--- a/src/main/java/com/zy/common/web/RouterController.java
+++ b/src/main/java/com/zy/common/web/RouterController.java
@@ -12,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 = "/"+applicationName+"/views/index.html";
- response.sendRedirect(redirect);
+ response.sendRedirect(contextPath+"/views/index.html");
} catch (Exception ex){
ex.printStackTrace();
}
@@ -28,8 +27,25 @@
@RequestMapping("/login")
public void login(HttpServletResponse response) {
try{
- String redirect = "/"+applicationName+"/views/login.html";
- response.sendRedirect(redirect);
+ response.sendRedirect(contextPath+"/views/login.html");
+ } catch (Exception ex){
+ ex.printStackTrace();
+ }
+ }
+
+ @RequestMapping("/pda")
+ public void pda(HttpServletResponse response) {
+ try{
+ response.sendRedirect(contextPath+"/views/pda/login.html");
+ } catch (Exception ex){
+ ex.printStackTrace();
+ }
+ }
+
+ @RequestMapping("/pda/ce")
+ public void pdaCe(HttpServletResponse response) {
+ try{
+ response.sendRedirect(contextPath+"/views/pdaCe/login.html");
} catch (Exception ex){
ex.printStackTrace();
}
--
Gitblit v1.9.1