From ec583e53bb8f1f79f48063c48d554fa895e321a6 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 02 一月 2024 10:14:29 +0800
Subject: [PATCH] 四项库出库作业 出库相同物料不同料箱号报错bug修复 新增平库无组托上架功能
---
src/main/java/com/zy/common/web/RouterController.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java
index 5077891..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,16 @@
@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();
+ }
+ }
+
+ @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