From a727ec75a55f804a06ed0b489fa7084bc8d09dca Mon Sep 17 00:00:00 2001
From: shuzheng <469741414@qq.com>
Date: Mon, 27 Mar 2017 00:35:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../zheng-api-server/src/main/webapp/WEB-INF/jsp/error.jsp | 4 ++--
.../zheng-cms-admin/src/main/webapp/WEB-INF/jsp/error.jsp | 4 ++--
zheng-cms/zheng-cms-job/src/main/webapp/WEB-INF/jsp/error.jsp | 4 ++--
.../zheng-cms-search/src/main/webapp/WEB-INF/jsp/error.jsp | 4 ++--
zheng-cms/zheng-cms-web/src/main/webapp/WEB-INF/jsp/error.jsp | 4 ++--
zheng-oss/zheng-oss-web/src/main/webapp/WEB-INF/jsp/error.jsp | 4 ++--
.../zheng-pay-admin/src/main/webapp/WEB-INF/jsp/error.jsp | 4 ++--
zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/jsp/error.jsp | 4 ++--
.../zheng-ucenter-home/src/main/webapp/WEB-INF/jsp/error.jsp | 4 ++--
.../zheng-upms-server/src/main/webapp/WEB-INF/jsp/error.jsp | 4 ++--
.../src/main/webapp/WEB-INF/jsp/error.jsp | 4 ++--
11 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/zheng-api/zheng-api-server/src/main/webapp/WEB-INF/jsp/error.jsp b/zheng-api/zheng-api-server/src/main/webapp/WEB-INF/jsp/error.jsp
index 3000bb87..79af8838 100644
--- a/zheng-api/zheng-api-server/src/main/webapp/WEB-INF/jsp/error.jsp
+++ b/zheng-api/zheng-api-server/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -1,4 +1,4 @@
-<%@ page contentType="text/html; charset=utf-8"%>
+<%@ page contentType="text/html; charset=utf-8" isErrorPage="true"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
@@ -12,7 +12,7 @@
<spring:message code="error"/>
-<% Exception e = (Exception)request.getAttribute("ex"); %>
+<% Exception e = null != exception ? (Exception) exception : (Exception)request.getAttribute("ex"); %>
错误: <%= e.getClass().getSimpleName()%>
错误描述：
diff --git a/zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/error.jsp b/zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/error.jsp
index 3000bb87..79af8838 100644
--- a/zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/error.jsp
+++ b/zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -1,4 +1,4 @@
-<%@ page contentType="text/html; charset=utf-8"%>
+<%@ page contentType="text/html; charset=utf-8" isErrorPage="true"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
@@ -12,7 +12,7 @@
<spring:message code="error"/>
-<% Exception e = (Exception)request.getAttribute("ex"); %>
+<% Exception e = null != exception ? (Exception) exception : (Exception)request.getAttribute("ex"); %>
错误: <%= e.getClass().getSimpleName()%>
错误描述：
diff --git a/zheng-cms/zheng-cms-job/src/main/webapp/WEB-INF/jsp/error.jsp b/zheng-cms/zheng-cms-job/src/main/webapp/WEB-INF/jsp/error.jsp
index 3000bb87..79af8838 100644
--- a/zheng-cms/zheng-cms-job/src/main/webapp/WEB-INF/jsp/error.jsp
+++ b/zheng-cms/zheng-cms-job/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -1,4 +1,4 @@
-<%@ page contentType="text/html; charset=utf-8"%>
+<%@ page contentType="text/html; charset=utf-8" isErrorPage="true"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
@@ -12,7 +12,7 @@
<spring:message code="error"/>
-<% Exception e = (Exception)request.getAttribute("ex"); %>
+<% Exception e = null != exception ? (Exception) exception : (Exception)request.getAttribute("ex"); %>
错误: <%= e.getClass().getSimpleName()%>
错误描述：
diff --git a/zheng-cms/zheng-cms-search/src/main/webapp/WEB-INF/jsp/error.jsp b/zheng-cms/zheng-cms-search/src/main/webapp/WEB-INF/jsp/error.jsp
index 3000bb87..79af8838 100644
--- a/zheng-cms/zheng-cms-search/src/main/webapp/WEB-INF/jsp/error.jsp
+++ b/zheng-cms/zheng-cms-search/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -1,4 +1,4 @@
-<%@ page contentType="text/html; charset=utf-8"%>
+<%@ page contentType="text/html; charset=utf-8" isErrorPage="true"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
@@ -12,7 +12,7 @@
<spring:message code="error"/>
-<% Exception e = (Exception)request.getAttribute("ex"); %>
+<% Exception e = null != exception ? (Exception) exception : (Exception)request.getAttribute("ex"); %>
错误: <%= e.getClass().getSimpleName()%>
错误描述：
diff --git a/zheng-cms/zheng-cms-web/src/main/webapp/WEB-INF/jsp/error.jsp b/zheng-cms/zheng-cms-web/src/main/webapp/WEB-INF/jsp/error.jsp
index 3000bb87..79af8838 100644
--- a/zheng-cms/zheng-cms-web/src/main/webapp/WEB-INF/jsp/error.jsp
+++ b/zheng-cms/zheng-cms-web/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -1,4 +1,4 @@
-<%@ page contentType="text/html; charset=utf-8"%>
+<%@ page contentType="text/html; charset=utf-8" isErrorPage="true"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
@@ -12,7 +12,7 @@
<spring:message code="error"/>
-<% Exception e = (Exception)request.getAttribute("ex"); %>
+<% Exception e = null != exception ? (Exception) exception : (Exception)request.getAttribute("ex"); %>
错误: <%= e.getClass().getSimpleName()%>
错误描述：
diff --git a/zheng-oss/zheng-oss-web/src/main/webapp/WEB-INF/jsp/error.jsp b/zheng-oss/zheng-oss-web/src/main/webapp/WEB-INF/jsp/error.jsp
index 3000bb87..79af8838 100644
--- a/zheng-oss/zheng-oss-web/src/main/webapp/WEB-INF/jsp/error.jsp
+++ b/zheng-oss/zheng-oss-web/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -1,4 +1,4 @@
-<%@ page contentType="text/html; charset=utf-8"%>
+<%@ page contentType="text/html; charset=utf-8" isErrorPage="true"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
@@ -12,7 +12,7 @@
<spring:message code="error"/>
-<% Exception e = (Exception)request.getAttribute("ex"); %>
+<% Exception e = null != exception ? (Exception) exception : (Exception)request.getAttribute("ex"); %>
错误: <%= e.getClass().getSimpleName()%>
错误描述：
diff --git a/zheng-pay/zheng-pay-admin/src/main/webapp/WEB-INF/jsp/error.jsp b/zheng-pay/zheng-pay-admin/src/main/webapp/WEB-INF/jsp/error.jsp
index 3000bb87..79af8838 100644
--- a/zheng-pay/zheng-pay-admin/src/main/webapp/WEB-INF/jsp/error.jsp
+++ b/zheng-pay/zheng-pay-admin/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -1,4 +1,4 @@
-<%@ page contentType="text/html; charset=utf-8"%>
+<%@ page contentType="text/html; charset=utf-8" isErrorPage="true"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
@@ -12,7 +12,7 @@
<spring:message code="error"/>
-<% Exception e = (Exception)request.getAttribute("ex"); %>
+<% Exception e = null != exception ? (Exception) exception : (Exception)request.getAttribute("ex"); %>
错误: <%= e.getClass().getSimpleName()%>
错误描述：
diff --git a/zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/jsp/error.jsp b/zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/jsp/error.jsp
index 3000bb87..79af8838 100644
--- a/zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/jsp/error.jsp
+++ b/zheng-pay/zheng-pay-web/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -1,4 +1,4 @@
-<%@ page contentType="text/html; charset=utf-8"%>
+<%@ page contentType="text/html; charset=utf-8" isErrorPage="true"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
@@ -12,7 +12,7 @@
<spring:message code="error"/>
-<% Exception e = (Exception)request.getAttribute("ex"); %>
+<% Exception e = null != exception ? (Exception) exception : (Exception)request.getAttribute("ex"); %>
错误: <%= e.getClass().getSimpleName()%>
错误描述：
diff --git a/zheng-ucenter/zheng-ucenter-home/src/main/webapp/WEB-INF/jsp/error.jsp b/zheng-ucenter/zheng-ucenter-home/src/main/webapp/WEB-INF/jsp/error.jsp
index 3000bb87..79af8838 100644
--- a/zheng-ucenter/zheng-ucenter-home/src/main/webapp/WEB-INF/jsp/error.jsp
+++ b/zheng-ucenter/zheng-ucenter-home/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -1,4 +1,4 @@
-<%@ page contentType="text/html; charset=utf-8"%>
+<%@ page contentType="text/html; charset=utf-8" isErrorPage="true"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
@@ -12,7 +12,7 @@
<spring:message code="error"/>
-<% Exception e = (Exception)request.getAttribute("ex"); %>
+<% Exception e = null != exception ? (Exception) exception : (Exception)request.getAttribute("ex"); %>
错误: <%= e.getClass().getSimpleName()%>
错误描述：
diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/error.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/error.jsp
index 141eaf66..29dad3ff 100644
--- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/error.jsp
+++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -1,4 +1,4 @@
-<%@ page contentType="text/html; charset=utf-8"%>
+<%@ page contentType="text/html; charset=utf-8" isErrorPage="true"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
@@ -12,7 +12,7 @@
<spring:message code="error"/>
-<% Exception e = (Exception)request.getAttribute("ex"); %>
+<% Exception e = null != exception ? (Exception) exception : (Exception)request.getAttribute("ex"); %>
错误: <%= e.getClass().getSimpleName()%>
错误描述：
diff --git a/zheng-wechat/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/jsp/error.jsp b/zheng-wechat/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/jsp/error.jsp
index 3000bb87..79af8838 100644
--- a/zheng-wechat/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/jsp/error.jsp
+++ b/zheng-wechat/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -1,4 +1,4 @@
-<%@ page contentType="text/html; charset=utf-8"%>
+<%@ page contentType="text/html; charset=utf-8" isErrorPage="true"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
@@ -12,7 +12,7 @@
<spring:message code="error"/>
-<% Exception e = (Exception)request.getAttribute("ex"); %>
+<% Exception e = null != exception ? (Exception) exception : (Exception)request.getAttribute("ex"); %>
错误: <%= e.getClass().getSimpleName()%>
错误描述：
--
GitLab