Home Explore Help
Register Sign In
root
/
gs_bg
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

优化业务校验失败普通请求跳转页面

RuoYi 5 years ago
parent
cd3dbd775b
commit
d1b440fc0d
5 changed files with 33 additions and 8 deletions
Unified View Show Diff Stats
  1. 0 2
      ruoyi-admin/src/main/resources/templates/error/404.html
  2. 0 2
      ruoyi-admin/src/main/resources/templates/error/500.html
  3. 20 0
      ruoyi-admin/src/main/resources/templates/error/business.html
  4. 0 2
      ruoyi-admin/src/main/resources/templates/error/unauth.html
  5. 13 2
      ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java

+ 0 - 2
ruoyi-admin/src/main/resources/templates/error/404.html
View File 

@@ -17,7 +17,5 @@
 
             <a href="javascript:top.document.location.href='/'" class="btn btn-primary m-t">主页</a>

             <a href="javascript:top.document.location.href='/'" class="btn btn-primary m-t">主页</a>

         </div>

         </div>

     </div>

     </div>

-    <script src="/js/jquery.min.js?v=2.1.4"></script>

-    <script src="/js/bootstrap.min.js?v=3.3.6"></script>

 </body>

 </body>

 </html>

 </html>

+ 0 - 2
ruoyi-admin/src/main/resources/templates/error/500.html
View File 

@@ -18,7 +18,5 @@
 
             <a href="javascript:top.document.location.href='/'" class="btn btn-primary m-t">主页</a>

             <a href="javascript:top.document.location.href='/'" class="btn btn-primary m-t">主页</a>

         </div>

         </div>

     </div>

     </div>

-    <script src="/js/jquery.min.js?v=2.1.4"></script>

-    <script src="/js/bootstrap.min.js?v=3.3.6"></script>

 </body>

 </body>

 </html>

 </html>

+ 20 - 0
ruoyi-admin/src/main/resources/templates/error/business.html
View File 

@@ -0,0 +1,20 @@
 
+<!DOCTYPE html>
 
+<html lang="zh">
 
+<head>
 
+    <meta charset="utf-8">
 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
+    <title>RuoYi - 403</title>
 
+	<link href="/css/bootstrap.min.css" rel="stylesheet"/>
 
+    <link href="/css/animate.css" rel="stylesheet"/>
 
+    <link href="/css/style.css" rel="stylesheet"/>
 
+</head>
 
+<body class="gray-bg">
 
+    <div class="middle-box text-center animated fadeInDown">
 
+        <h3 class="font-bold">操作异常！</h3>
 
+
 
+        <div class="error-desc">
 
+            [[${errorMessage}]]
 
+        </div>
 
+    </div>
 
+</body>
 
+</html>

+ 0 - 2
ruoyi-admin/src/main/resources/templates/error/unauth.html
View File 

@@ -18,7 +18,5 @@
 
             <a href="javascript:top.document.location.href='/'" class="btn btn-outline btn-primary btn-xs">返回主页</a>

             <a href="javascript:top.document.location.href='/'" class="btn btn-outline btn-primary btn-xs">返回主页</a>

         </div>

         </div>

     </div>

     </div>

-    <script src="/js/jquery.min.js?v=2.1.4"></script>

-    <script src="/js/bootstrap.min.js?v=3.3.6"></script>

 </body>

 </body>

 </html>

 </html>

+ 13 - 2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
View File 

@@ -77,10 +77,21 @@ public class GlobalExceptionHandler
 
      * 业务异常
 
      * 业务异常
 
      */
 
      */
 
     @ExceptionHandler(BusinessException.class)
 
     @ExceptionHandler(BusinessException.class)
 
-    public AjaxResult businessException(BusinessException e)
 
+    public Object businessException(HttpServletRequest request, BusinessException e)
 
     {
 
     {
 
         log.error(e.getMessage(), e);
 
         log.error(e.getMessage(), e);
 
-        return AjaxResult.error(e.getMessage());
 
+
 
+        if (ServletUtils.isAjaxRequest(request))
 
+        {
 
+            return AjaxResult.error(e.getMessage());
 
+        }
 
+        else
 
+        {
 
+            ModelAndView modelAndView = new ModelAndView();
 
+            modelAndView.addObject("errorMessage", e.getMessage());
 
+            modelAndView.setViewName("error/business");
 
+            return modelAndView;
 
+        }
 
     }
 
     }
 
 
 
     /**
 
     /**