From 8770f98ea17057cc1bb552bb61a59e57a5f11d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= <liguilong@iie.ac.cn>
Date: Tue, 28 May 2019 20:07:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=B5=8C=E5=85=A5=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8URL=20cookie=E4=BC=A0=E9=80=92=20(test)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/include/left_menu.jsp | 15 ---------------
 src/main/webapp/WEB-INF/views/home.jsp        | 13 ++++++++++---
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/left_menu.jsp b/src/main/webapp/WEB-INF/include/left_menu.jsp
index 6618d55aa..dc8b4f84d 100644
--- a/src/main/webapp/WEB-INF/include/left_menu.jsp
+++ b/src/main/webapp/WEB-INF/include/left_menu.jsp
@@ -17,12 +17,7 @@
 			     				
 			     				<a class="nav-link nav-toggle"		     					
 			     					<c:if test="${secondMenu.href != null && secondMenu.href != ''}" var="secondHref">
-			     						<c:if test="${fn:startsWith(secondMenu.href,'http')}" var="secondFlag">
-				     						 href="javascript:;" onclick="page_turn('${secondMenu.id }','${secondMenu.functionId }','1','','${secondMenu.href }',this)" target="mainFrame" >
-			     						</c:if>
-			     						<c:if test="${!secondFlag}">
 				     						 href="javascript:;" onclick="page_turn('${secondMenu.id }','${secondMenu.functionId }','1','','${ctx}${secondMenu.href }',this)" target="mainFrame" >
-			     						</c:if>
 			     					</c:if>
 			     					<c:if test="${!secondHref }">
 			     						 href="javascript:;" class="nav-link nav-toggle"> 
@@ -47,12 +42,7 @@
 									
 								     				<a class="nav-link nav-toggle"		     					
 								     					<c:if test="${thirdMenu.href != null && thirdMenu.href != ''}" var="thirdHref">
-								     						<c:if test="${fn:startsWith(thirdMenu.href,'http')}" var="thirdFlag">
-									     						 href="javascript:;" onclick="page_turn('${thirdMenu.id }','${thirdMenu.functionId }','2','','${thirdMenu.href }',this)" target="mainFrame" >
-								     						</c:if>
-								     						<c:if test="${!thirdFlag}">
 									     						 href="javascript:;" onclick="page_turn('${thirdMenu.id }','${thirdMenu.functionId }','2','','${ctx}${thirdMenu.href }',this)" target="mainFrame" >
-								     						</c:if>
 								     						 
 								     					</c:if>
 								     					<c:if test="${!thirdHref }">
@@ -72,12 +62,7 @@
 																<c:if test="${fourthMenu.isShow==1}">
 																	<li class="nav-item" id="menu_${fourthMenu.id }" menu-id="${fourthMenu.id }" menu-name="<spring:message code="${fourthMenu.code}"></spring:message>"  >
 																		<a href="javascript:;" 
-																		<c:if test="${fn:startsWith(fourthMenu.href,'http')}" var="fourFlag">
-																			onclick="page_turn('${fourthMenu.id }','${fourthMenu.functionId }','3','','${fourthMenu.href }',this)" target="mainFrame" 
-																		</c:if>
-																		<c:if test="${!fourFlag}">
 																			onclick="page_turn('${fourthMenu.id }','${fourthMenu.functionId }','3','','${ctx}${fourthMenu.href }',this)" target="mainFrame" 
-																		</c:if>
 																		class="nav-link ">
 																			<%-- ${fourthMenu.name } --%> <spring:message code="${fourthMenu.code}"></spring:message> 
 																			<!-- <span class="badge badge-danger">1</span> -->
diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp
index 33cae4719..7188b2546 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp
+++ b/src/main/webapp/WEB-INF/views/home.jsp
@@ -107,6 +107,7 @@ function page_turn(id, functionId,level, name, url,obj){
 	var $header = $(".page-breadcrumb");//添加头部信息
 	$(".page-breadcrumb").empty();
 
+	var lang = "${cookie.Language.value }".toLowerCase();
 	
 	var parent_li = $object.parents("li");
 	var parent_parent_li = $object.parents("li").parents("li");
@@ -150,11 +151,17 @@ function page_turn(id, functionId,level, name, url,obj){
  	//}
     
 	//调入页面
-	if(url.indexOf("?")>0){
-		url = url+"&functionId="+functionId;
+	//进行区分是否为外部URL
+	if (url.split("http").length>1) {
+		url="http"+url.split("http")[url.split("http").length-1]+"?test_cookie="+lang;
 	}else{
-		url = url+"?functionId="+functionId;
+		if(url.indexOf("?")>0){
+			url = url+"&functionId="+functionId;
+		}else{
+			url = url+"?functionId="+functionId;
+		}
 	}
+	
 	window.frames['mainFrame'].location=url;
      
     $("#mainFrame").load(function(){