9 年前 · 18b8e4e396
--- a/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/BaseController.java
+++ b/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/BaseController.java
@@ -1,8 +0,0 @@
 
				-package com.zheng.cms.admin.controller;
			
 
				-
			
 
				-/**
			
 
				- * Created by shuzheng on 2016/12/10.
			
 
				- */
			
 
				-public class BaseController {
			
 
				-
			
 
				-}
			
--- a/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/ManageController.java
+++ b/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/ManageController.java
@@ -1,5 +1,6 @@
 
				 package com.zheng.cms.admin.controller;
			
 
				 
			
 
				+import com.zheng.common.base.BaseController;
			
 
				 import io.swagger.annotations.Api;
			
 
				 import io.swagger.annotations.ApiOperation;
			
 
				 import org.slf4j.Logger;
			
--- a/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsArticleController.java
+++ b/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsArticleController.java
@@ -1,9 +1,9 @@
 
				 package com.zheng.cms.admin.controller.manage;
			
 
				 
			
 
				-import com.zheng.cms.admin.controller.BaseController;
			
 
				 import com.zheng.cms.dao.model.CmsArticle;
			
 
				 import com.zheng.cms.dao.model.CmsArticleExample;
			
 
				 import com.zheng.cms.rpc.api.CmsArticleService;
			
 
				+import com.zheng.common.base.BaseController;
			
 
				 import com.zheng.common.util.Paginator;
			
 
				 import io.swagger.annotations.Api;
			
 
				 import io.swagger.annotations.ApiOperation;
			
--- a/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCategoryController.java
+++ b/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCategoryController.java
@@ -1,9 +1,9 @@
 
				 package com.zheng.cms.admin.controller.manage;
			
 
				 
			
 
				-import com.zheng.cms.admin.controller.BaseController;
			
 
				 import com.zheng.cms.dao.model.CmsCategory;
			
 
				 import com.zheng.cms.dao.model.CmsCategoryExample;
			
 
				 import com.zheng.cms.rpc.api.CmsCategoryService;
			
 
				+import com.zheng.common.base.BaseController;
			
 
				 import com.zheng.common.util.Paginator;
			
 
				 import io.swagger.annotations.Api;
			
 
				 import io.swagger.annotations.ApiImplicitParam;
			
--- a/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCommentController.java
+++ b/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCommentController.java
@@ -1,9 +1,9 @@
 
				 package com.zheng.cms.admin.controller.manage;
			
 
				 
			
 
				-import com.zheng.cms.admin.controller.BaseController;
			
 
				 import com.zheng.cms.dao.model.CmsComment;
			
 
				 import com.zheng.cms.dao.model.CmsCommentExample;
			
 
				 import com.zheng.cms.rpc.api.CmsCommentService;
			
 
				+import com.zheng.common.base.BaseController;
			
 
				 import com.zheng.common.util.Paginator;
			
 
				 import io.swagger.annotations.Api;
			
 
				 import io.swagger.annotations.ApiOperation;
			
--- a/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsTagController.java
+++ b/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsTagController.java
@@ -1,9 +1,9 @@
 
				 package com.zheng.cms.admin.controller.manage;
			
 
				 
			
 
				-import com.zheng.cms.admin.controller.BaseController;
			
 
				 import com.zheng.cms.dao.model.CmsTag;
			
 
				 import com.zheng.cms.dao.model.CmsTagExample;
			
 
				 import com.zheng.cms.rpc.api.CmsTagService;
			
 
				+import com.zheng.common.base.BaseController;
			
 
				 import io.swagger.annotations.Api;
			
 
				 import io.swagger.annotations.ApiOperation;
			
 
				 import org.slf4j.Logger;
			
--- 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
@@ -8,10 +8,18 @@
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				-<meta charset="utf-8"/>
			
 
				-<title><spring:message code="error"/></title>
			
 
				+    <meta charset="utf-8"/>
			
 
				+    <title><spring:message code="error"/></title>
			
 
				 </head>
			
 
				 <body>
			
 
				-error
			
 
				+<% Exception e = (Exception)request.getAttribute("ex"); %>
			
 
				+<h2>错误: <%= e.getClass().getSimpleName()%></h2>
			
 
				+<hr />
			
 
				+<h5>错误描述：</h5>
			
 
				+<%= e.getMessage()%>
			
 
				+<h5>错误信息：</h5>
			
 
				+<pre>
			
 
				+<% e.printStackTrace(new java.io.PrintWriter(out)); %>
			
 
				+</pre>
			
 
				 </body>
			
 
				 </html>
			
--- 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
@@ -8,10 +8,18 @@
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				-<meta charset="utf-8"/>
			
 
				-<title><spring:message code="error"/></title>
			
 
				+    <meta charset="utf-8"/>
			
 
				+    <title><spring:message code="error"/></title>
			
 
				 </head>
			
 
				 <body>
			
 
				-error
			
 
				+<% Exception e = (Exception)request.getAttribute("ex"); %>
			
 
				+<h2>错误: <%= e.getClass().getSimpleName()%></h2>
			
 
				+<hr />
			
 
				+<h5>错误描述：</h5>
			
 
				+<%= e.getMessage()%>
			
 
				+<h5>错误信息：</h5>
			
 
				+<pre>
			
 
				+<% e.printStackTrace(new java.io.PrintWriter(out)); %>
			
 
				+</pre>
			
 
				 </body>
			
 
				 </html>
			
--- a/zheng-cms/zheng-cms-search/src/main/java/com/zheng/cms/search/controller/AppController.java
+++ b/zheng-cms/zheng-cms-search/src/main/java/com/zheng/cms/search/controller/AppController.java
@@ -0,0 +1,12 @@
 
				+package com.zheng.cms.search.controller;
			
 
				+
			
 
				+/**
			
 
				+ * 控制器基类
			
 
				+ * @author shuzheng
			
 
				+ * @date 2016年7月7日 上午10:08:47
			
 
				+ */
			
 
				+public class AppController {
			
 
				+	
			
 
				+
			
 
				+
			
 
				+}
			
--- a/zheng-cms/zheng-cms-search/src/main/java/com/zheng/cms/search/controller/BaseController.java
+++ b/zheng-cms/zheng-cms-search/src/main/java/com/zheng/cms/search/controller/BaseController.java
@@ -1,15 +0,0 @@
 
				-package com.zheng.cms.search.controller;
			
 
				-
			
 
				-/**
			
 
				- * 控制器基类
			
 
				- * @author shuzheng
			
 
				- * @date 2016年7月7日 上午10:08:47
			
 
				- */
			
 
				-public class BaseController {
			
 
				-	
			
 
				-	public static final String RESULT = "result";
			
 
				-	public static final String DATA = "data";
			
 
				-	public static final String SUCCESS = "success";
			
 
				-	public static final String FAILED = "failed";
			
 
				-
			
 
				-}
			
--- 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
@@ -8,10 +8,18 @@
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				-<meta charset="utf-8"/>
			
 
				-<title><spring:message code="error"/></title>
			
 
				+    <meta charset="utf-8"/>
			
 
				+    <title><spring:message code="error"/></title>
			
 
				 </head>
			
 
				 <body>
			
 
				-error
			
 
				+<% Exception e = (Exception)request.getAttribute("ex"); %>
			
 
				+<h2>错误: <%= e.getClass().getSimpleName()%></h2>
			
 
				+<hr />
			
 
				+<h5>错误描述：</h5>
			
 
				+<%= e.getMessage()%>
			
 
				+<h5>错误信息：</h5>
			
 
				+<pre>
			
 
				+<% e.printStackTrace(new java.io.PrintWriter(out)); %>
			
 
				+</pre>
			
 
				 </body>
			
 
				 </html>
			
--- a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/ActiveMQController.java
+++ b/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/ActiveMQController.java
@@ -1,6 +1,7 @@
 
				 package com.zheng.cms.web.controller;
			
 
				 
			
 
				 import com.zheng.cms.dao.model.CmsUser;
			
 
				+import com.zheng.common.base.BaseController;
			
 
				 import com.zheng.common.util.JmsUtil;
			
 
				 import net.sf.json.JSONObject;
			
 
				 import org.slf4j.Logger;
			
--- a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/BaseController.java
+++ b/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/BaseController.java
@@ -1,15 +0,0 @@
 
				-package com.zheng.cms.web.controller;
			
 
				-
			
 
				-/**
			
 
				- * 控制器基类
			
 
				- * @author shuzheng
			
 
				- * @date 2016年7月7日 上午10:08:47
			
 
				- */
			
 
				-public class BaseController {
			
 
				-	
			
 
				-	public static final String RESULT = "result";
			
 
				-	public static final String DATA = "data";
			
 
				-	public static final String SUCCESS = "success";
			
 
				-	public static final String FAILED = "failed";
			
 
				-
			
 
				-}
			
--- a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/EhCacheController.java
+++ b/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/EhCacheController.java
@@ -1,6 +1,7 @@
 
				 package com.zheng.cms.web.controller;
			
 
				 
			
 
				 import com.zheng.cms.rpc.api.UserService;
			
 
				+import com.zheng.common.base.BaseController;
			
 
				 import com.zheng.common.util.EhCacheUtil;
			
 
				 import com.zheng.common.util.PropertiesFileUtil;
			
 
				 import net.sf.ehcache.Cache;
			
--- a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/HelloController.java
+++ b/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/HelloController.java
@@ -2,6 +2,7 @@ package com.zheng.cms.web.controller;
 
				 
			
 
				 import com.zheng.cms.dao.model.CmsUser;
			
 
				 import com.zheng.cms.rpc.api.UserService;
			
 
				+import com.zheng.common.base.BaseController;
			
 
				 import org.apache.commons.io.FileUtils;
			
 
				 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
			
 
				 import org.slf4j.Logger;
			
--- a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/ManageController.java
+++ b/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/ManageController.java
@@ -1,5 +1,6 @@
 
				 package com.zheng.cms.web.controller;
			
 
				 
			
 
				+import com.zheng.common.base.BaseController;
			
 
				 import org.slf4j.Logger;
			
 
				 import org.slf4j.LoggerFactory;
			
 
				 import org.springframework.stereotype.Controller;
			
--- a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/RedisController.java
+++ b/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/RedisController.java
@@ -1,5 +1,6 @@
 
				 package com.zheng.cms.web.controller;
			
 
				 
			
 
				+import com.zheng.common.base.BaseController;
			
 
				 import com.zheng.common.util.RedisUtil;
			
 
				 import org.slf4j.Logger;
			
 
				 import org.slf4j.LoggerFactory;
			
--- a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/UserController.java
+++ b/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/UserController.java
@@ -3,6 +3,7 @@ package com.zheng.cms.web.controller;
 
				 import com.zheng.cms.dao.model.CmsUser;
			
 
				 import com.zheng.cms.dao.model.CmsUserExample;
			
 
				 import com.zheng.cms.rpc.api.UserService;
			
 
				+import com.zheng.common.base.BaseController;
			
 
				 import com.zheng.common.util.Paginator;
			
 
				 import org.slf4j.Logger;
			
 
				 import org.slf4j.LoggerFactory;
			
--- 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
@@ -8,10 +8,18 @@
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				-<meta charset="utf-8"/>
			
 
				-<title><spring:message code="error"/></title>
			
 
				+    <meta charset="utf-8"/>
			
 
				+    <title><spring:message code="error"/></title>
			
 
				 </head>
			
 
				 <body>
			
 
				-error
			
 
				+<% Exception e = (Exception)request.getAttribute("ex"); %>
			
 
				+<h2>错误: <%= e.getClass().getSimpleName()%></h2>
			
 
				+<hr />
			
 
				+<h5>错误描述：</h5>
			
 
				+<%= e.getMessage()%>
			
 
				+<h5>错误信息：</h5>
			
 
				+<pre>
			
 
				+<% e.printStackTrace(new java.io.PrintWriter(out)); %>
			
 
				+</pre>
			
 
				 </body>
			
 
				 </html>
			
--- a/zheng-common/src/main/java/com/zheng/common/base/BaseController.java
+++ b/zheng-common/src/main/java/com/zheng/common/base/BaseController.java
@@ -0,0 +1,36 @@
 
				+package com.zheng.common.base;
			
 
				+
			
 
				+import org.slf4j.Logger;
			
 
				+import org.slf4j.LoggerFactory;
			
 
				+import org.springframework.web.bind.annotation.ExceptionHandler;
			
 
				+
			
 
				+import javax.servlet.http.HttpServletRequest;
			
 
				+import javax.servlet.http.HttpServletResponse;
			
 
				+
			
 
				+/**
			
 
				+ * 控制器基类
			
 
				+ * Created by ZhangShuzheng on 2017/2/4.
			
 
				+ */
			
 
				+public abstract class BaseController {
			
 
				+
			
 
				+	private final static Logger _log = LoggerFactory.getLogger(BaseController.class);
			
 
				+
			
 
				+	public static final String RESULT = "result";
			
 
				+	public static final String DATA = "data";
			
 
				+	public static final String SUCCESS = "success";
			
 
				+	public static final String FAILED = "failed";
			
 
				+
			
 
				+	/**
			
 
				+	 * 统一异常处理
			
 
				+	 * @param request
			
 
				+	 * @param response
			
 
				+	 * @param exception
			
 
				+	 */
			
 
				+	@ExceptionHandler
			
 
				+	public String exceptionHandler(HttpServletRequest request, HttpServletResponse response, Exception exception) {
			
 
				+		_log.error("统一异常处理：", exception);
			
 
				+		request.setAttribute("ex", exception);
			
 
				+		return "/error";
			
 
				+	}
			
 
				+
			
 
				+}
			
--- 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
@@ -8,10 +8,18 @@
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				-<meta charset="utf-8"/>
			
 
				-<title><spring:message code="error"/></title>
			
 
				+    <meta charset="utf-8"/>
			
 
				+    <title><spring:message code="error"/></title>
			
 
				 </head>
			
 
				 <body>
			
 
				-error
			
 
				+<% Exception e = (Exception)request.getAttribute("ex"); %>
			
 
				+<h2>错误: <%= e.getClass().getSimpleName()%></h2>
			
 
				+<hr />
			
 
				+<h5>错误描述：</h5>
			
 
				+<%= e.getMessage()%>
			
 
				+<h5>错误信息：</h5>
			
 
				+<pre>
			
 
				+<% e.printStackTrace(new java.io.PrintWriter(out)); %>
			
 
				+</pre>
			
 
				 </body>
			
 
				 </html>
			
--- a/zheng-pay/zheng-pay-admin/src/main/java/com/zheng/pay/admin/controller/AppController.java
+++ b/zheng-pay/zheng-pay-admin/src/main/java/com/zheng/pay/admin/controller/AppController.java
@@ -0,0 +1,11 @@
 
				+package com.zheng.pay.admin.controller;
			
 
				+
			
 
				+/**
			
 
				+ * 控制器基类
			
 
				+ * @author shuzheng
			
 
				+ * @date 2016年7月7日 上午10:08:47
			
 
				+ */
			
 
				+public class AppController {
			
 
				+
			
 
				+
			
 
				+}
			
--- 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
@@ -8,10 +8,18 @@
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				-<meta charset="utf-8"/>
			
 
				-<title><spring:message code="error"/></title>
			
 
				+    <meta charset="utf-8"/>
			
 
				+    <title><spring:message code="error"/></title>
			
 
				 </head>
			
 
				 <body>
			
 
				-error
			
 
				+<% Exception e = (Exception)request.getAttribute("ex"); %>
			
 
				+<h2>错误: <%= e.getClass().getSimpleName()%></h2>
			
 
				+<hr />
			
 
				+<h5>错误描述：</h5>
			
 
				+<%= e.getMessage()%>
			
 
				+<h5>错误信息：</h5>
			
 
				+<pre>
			
 
				+<% e.printStackTrace(new java.io.PrintWriter(out)); %>
			
 
				+</pre>
			
 
				 </body>
			
 
				 </html>
			
--- a/zheng-pay/zheng-pay-web/src/main/java/com/zheng/pay/web/controller/AppController.java
+++ b/zheng-pay/zheng-pay-web/src/main/java/com/zheng/pay/web/controller/AppController.java
@@ -0,0 +1,8 @@
 
				+package com.zheng.pay.web.controller;
			
 
				+
			
 
				+
			
 
				+public class AppController {
			
 
				+	
			
 
				+
			
 
				+
			
 
				+}
			
--- 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
@@ -8,10 +8,18 @@
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				-<meta charset="utf-8"/>
			
 
				-<title><spring:message code="error"/></title>
			
 
				+    <meta charset="utf-8"/>
			
 
				+    <title><spring:message code="error"/></title>
			
 
				 </head>
			
 
				 <body>
			
 
				-error
			
 
				+<% Exception e = (Exception)request.getAttribute("ex"); %>
			
 
				+<h2>错误: <%= e.getClass().getSimpleName()%></h2>
			
 
				+<hr />
			
 
				+<h5>错误描述：</h5>
			
 
				+<%= e.getMessage()%>
			
 
				+<h5>错误信息：</h5>
			
 
				+<pre>
			
 
				+<% e.printStackTrace(new java.io.PrintWriter(out)); %>
			
 
				+</pre>
			
 
				 </body>
			
 
				 </html>
			
--- a/zheng-ucenter/zheng-ucenter-home/src/main/java/com/zheng/ucenter/home/controller/AppController.java
+++ b/zheng-ucenter/zheng-ucenter-home/src/main/java/com/zheng/ucenter/home/controller/AppController.java
@@ -0,0 +1,7 @@
 
				+package com.zheng.ucenter.home.controller;
			
 
				+
			
 
				+public class AppController {
			
 
				+	
			
 
				+
			
 
				+
			
 
				+}
			
--- a/zheng-ucenter/zheng-ucenter-home/src/main/java/com/zheng/ucenter/home/controller/BaseController.java
+++ b/zheng-ucenter/zheng-ucenter-home/src/main/java/com/zheng/ucenter/home/controller/BaseController.java
@@ -1,15 +0,0 @@
 
				-package com.zheng.ucenter.home.controller;
			
 
				-
			
 
				-/**
			
 
				- * 控制器基类
			
 
				- * @author shuzheng
			
 
				- * @date 2016年7月7日 上午10:08:47
			
 
				- */
			
 
				-public class BaseController {
			
 
				-	
			
 
				-	public static final String RESULT = "result";
			
 
				-	public static final String DATA = "data";
			
 
				-	public static final String SUCCESS = "success";
			
 
				-	public static final String FAILED = "failed";
			
 
				-
			
 
				-}
			
--- 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
@@ -8,10 +8,18 @@
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				-<meta charset="utf-8"/>
			
 
				-<title><spring:message code="error"/></title>
			
 
				+    <meta charset="utf-8"/>
			
 
				+    <title><spring:message code="error"/></title>
			
 
				 </head>
			
 
				 <body>
			
 
				-error
			
 
				+<% Exception e = (Exception)request.getAttribute("ex"); %>
			
 
				+<h2>错误: <%= e.getClass().getSimpleName()%></h2>
			
 
				+<hr />
			
 
				+<h5>错误描述：</h5>
			
 
				+<%= e.getMessage()%>
			
 
				+<h5>错误信息：</h5>
			
 
				+<pre>
			
 
				+<% e.printStackTrace(new java.io.PrintWriter(out)); %>
			
 
				+</pre>
			
 
				 </body>
			
 
				 </html>
			
--- a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/HelloController.java
+++ b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/HelloController.java
@@ -0,0 +1,28 @@
 
				+package com.zheng.upms.admin.controller;
			
 
				+
			
 
				+import com.zheng.common.base.BaseController;
			
 
				+import org.springframework.stereotype.Controller;
			
 
				+import org.springframework.web.bind.annotation.RequestMapping;
			
 
				+import org.springframework.web.bind.annotation.ResponseBody;
			
 
				+
			
 
				+
			
 
				+@Controller
			
 
				+@RequestMapping("/hello")
			
 
				+public class HelloController extends BaseController {
			
 
				+
			
 
				+	@RequestMapping("/index")
			
 
				+	@ResponseBody
			
 
				+	public String index() {
			
 
				+		System.out.println(1/0);
			
 
				+		return "/hello/world";
			
 
				+	}
			
 
				+
			
 
				+	@RequestMapping("/index2")
			
 
				+	@ResponseBody
			
 
				+	public String index2() {
			
 
				+		String a = null;
			
 
				+		System.out.println(a.toString());
			
 
				+		return "/hello/world";
			
 
				+	}
			
 
				+
			
 
				+}
			
--- 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
@@ -12,6 +12,14 @@
 
				 <title><spring:message code="error"/></title>
			
 
				 </head>
			
 
				 <body>
			
 
				-error
			
 
				+<% Exception e = (Exception)request.getAttribute("ex"); %>
			
 
				+<h2>错误: <%= e.getClass().getSimpleName()%></h2>
			
 
				+<hr />
			
 
				+<h5>错误描述：</h5>
			
 
				+<%= e.getMessage()%>
			
 
				+<h5>错误信息：</h5>
			
 
				+<pre>
			
 
				+<% e.printStackTrace(new java.io.PrintWriter(out)); %>
			
 
				+</pre>
			
 
				 </body>
			
 
				 </html>
			
--- a/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/java/com/zheng/wechat/mp/admin/controller/AppController.java
+++ b/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/java/com/zheng/wechat/mp/admin/controller/AppController.java
@@ -0,0 +1,8 @@
 
				+package com.zheng.wechat.mp.admin.controller;
			
 
				+
			
 
				+
			
 
				+public class AppController {
			
 
				+	
			
 
				+
			
 
				+
			
 
				+}
			
--- a/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/java/com/zheng/wechat/mp/admin/controller/BaseController.java
+++ b/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/java/com/zheng/wechat/mp/admin/controller/BaseController.java
@@ -1,15 +0,0 @@
 
				-package com.zheng.wechat.mp.admin.controller;
			
 
				-
			
 
				-/**
			
 
				- * 控制器基类
			
 
				- * @author shuzheng
			
 
				- * @date 2016年7月7日 上午10:08:47
			
 
				- */
			
 
				-public class BaseController {
			
 
				-	
			
 
				-	public static final String RESULT = "result";
			
 
				-	public static final String DATA = "data";
			
 
				-	public static final String SUCCESS = "success";
			
 
				-	public static final String FAILED = "failed";
			
 
				-
			
 
				-}
			
--- a/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/jsp/error.jsp
+++ b/zheng-wechat-mp/zheng-wechat-mp-admin/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -8,10 +8,18 @@
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				-<meta charset="utf-8"/>
			
 
				-<title><spring:message code="error"/></title>
			
 
				+    <meta charset="utf-8"/>
			
 
				+    <title><spring:message code="error"/></title>
			
 
				 </head>
			
 
				 <body>
			
 
				-error
			
 
				+<% Exception e = (Exception)request.getAttribute("ex"); %>
			
 
				+<h2>错误: <%= e.getClass().getSimpleName()%></h2>
			
 
				+<hr />
			
 
				+<h5>错误描述：</h5>
			
 
				+<%= e.getMessage()%>
			
 
				+<h5>错误信息：</h5>
			
 
				+<pre>
			
 
				+<% e.printStackTrace(new java.io.PrintWriter(out)); %>
			
 
				+</pre>
			
 
				 </body>
			
 
				 </html>