From 57673183e8465d19dc2973b1c462dae013df45fc Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Fri, 28 Oct 2022 09:54:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ibeetl/jlw/web/IndexController.java     | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/web/IndexController.java b/web/src/main/java/com/ibeetl/jlw/web/IndexController.java
index fe5712bb..e46d009d 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/IndexController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/IndexController.java
@@ -947,12 +947,13 @@ public class IndexController {
 
 	//跳转到电脑端首页
 	@RequestMapping("/index.do")
-	public void index(HttpServletRequest request, HttpServletResponse response,
+	public String index(HttpServletRequest request, HttpServletResponse response,
 					  @TTeacher Teacher teacher, @TStudent Student student,  @SCoreUser CoreUser coreUser) {
+		String redirectUrl = "";
 		//判断是老师还是学生
 		if(null != student || null != teacher){//学生
 			try {
-				String redirectUrl = "";
+
 				if(request.getHeader("Referer").contains("/server")){
 					redirectUrl = request.getHeader("Referer").substring(0,request.getHeader("Referer").indexOf("/server"));
 				}else {
@@ -975,7 +976,8 @@ public class IndexController {
 					if(ApplicationRunnerController.isOnline){
 						//TODO 根据 uSystem 跳不同的页面
 
-						response.sendRedirect(redirectUrl+"Home");
+//						response.sendRedirect(redirectUrl+"Home");
+						return "redirect:" + redirectUrl + "Home";
 //						if(uSystem.getTypeId().toString().equals("1")){ //大数据基础 子应用
 //							response.sendRedirect(redirectUrl+"/studentEnd_dsj/index.html");
 //						}else if(uSystem.getTypeId().toString().equals("2")){ //金融大数据 子应用
@@ -988,7 +990,8 @@ public class IndexController {
 //							response.sendRedirect(redirectUrl+"/studentEnd_yx/index.html");
 //						}
 					}else {
-						response.sendRedirect("http://localhost:8080/Home");
+//						response.sendRedirect("http://localhost:8080/Home");
+						return "redirect:" + "http://localhost:8080/Home";
 //					    if(uSystem.getTypeId().toString().equals("1")){ //大数据基础 子应用
 //							response.sendRedirect("http://localhost:8080/studentEnd_dsj/index.html");
 //                        }else if(uSystem.getTypeId().toString().equals("2")){ //金融大数据 子应用
@@ -1010,11 +1013,15 @@ public class IndexController {
 			}
 		}else{//老师 或 管理员
 			try {
-				request.getRequestDispatcher("/pc/index.do").forward(request, response);
+//				response.sendRedirect(redirectUrl+"/server/pc/index.do");
+//				request.getRequestDispatcher("/pc/index.do").forward(request, response);
+				return "forward:/pc/index.do";
 			}catch (Exception e){
 				e.printStackTrace();
 			}
 		}
+
+		return "forward:/pc/index.do";
 	}
 
 	//跳转到电脑端首页