diff --git a/src/main/java/com/emr/controller/UrlInterceptor.java b/src/main/java/com/emr/controller/UrlInterceptor.java
index 07dc4c0..da22d0d 100644
--- a/src/main/java/com/emr/controller/UrlInterceptor.java
+++ b/src/main/java/com/emr/controller/UrlInterceptor.java
@@ -16,6 +16,7 @@ import org.apache.cxf.endpoint.Client;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.servlet.HandlerInterceptor;
+import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
@@ -42,7 +43,11 @@ public class UrlInterceptor implements HandlerInterceptor {
String resultString = HttpClientTool.doPost(requestUrl, params);
String code = JSONArray.toJSONString(JSON.parseObject(resultString).get("code"));
if ("200".equals(code)) {
- response.sendRedirect(POWER_URLHEAD + "/login");
+ if (isAjaxRequest(request)) {
+ response.setHeader("sessionstatus", "timeout");
+ } else{
+ response.sendRedirect(POWER_URLHEAD + "/login");
+ }
return false;
}
//更新session
@@ -60,6 +65,20 @@ public class UrlInterceptor implements HandlerInterceptor {
}
return true;
}
+
+ /**
+ * 判断是否是ajax请求
+ * @param request
+ * @return
+ */
+ private boolean isAjaxRequest(HttpServletRequest request) {
+ String header = request.getHeader("X-Requested-With");
+ if (header != null && "XMLHttpRequest".equals(header)) {
+ return true;
+ }else {
+ return false;
+ }
+ }
}
diff --git a/src/main/webapp/WEB-INF/jspf/comm.jspf b/src/main/webapp/WEB-INF/jspf/comm.jspf
index cc7e938..88d94f1 100644
--- a/src/main/webapp/WEB-INF/jspf/comm.jspf
+++ b/src/main/webapp/WEB-INF/jspf/comm.jspf
@@ -57,6 +57,6 @@
-
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index 2fc2fad..10d4de2 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -812,7 +812,7 @@
-