Gaokun Wang hace 4 semanas
padre
commit
9132adb95b

+ 3 - 2
eco-common/com-orm/src/main/java/org/eco/vip/orm/listener/EntityUpdateListener.java

@@ -7,6 +7,7 @@ package org.eco.vip.orm.listener;
 
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpStatus;
 import com.mybatisflex.annotation.UpdateListener;
 import org.eco.vip.orm.domain.BaseEntity;
 import org.eco.vip.orm.exception.BusinessException;
@@ -37,8 +38,8 @@ public class EntityUpdateListener implements UpdateListener {
                 }
                 baseEntity.setUpdateTime(new Date());
             }
-        } catch (Exception e) {
-            throw new BusinessException("全局更新数据监听器注入异常 => {} {}", e.getMessage());
+        } catch (BusinessException e) {
+            throw new BusinessException(HttpStatus.HTTP_FORBIDDEN,"全局更新数据监听器注入异常 => {} {}", e.getMessage());
         }
     }
 }

+ 0 - 28
eco-common/com-security/src/main/java/org/eco/vip/security/handler/GlobalExceptionHandler.java

@@ -40,22 +40,6 @@ import static org.eco.vip.orm.exception.enums.GlobalErrorCode.NOT_FOUND;
 @Slf4j
 public class GlobalExceptionHandler {
 
-    public CommonResult<?> allExceptionHandler(HttpServletRequest request, Throwable throwable) {
-        if (throwable instanceof MethodArgumentNotValidException) {
-            return handleMethodArgumentNotValidException((MethodArgumentNotValidException) throwable);
-        }
-        if (throwable instanceof ConstraintViolationException) {
-            return constraintViolationExceptionHandler((ConstraintViolationException) throwable);
-        }
-        if (throwable instanceof ValidationException) {
-            return validationException((ValidationException) throwable);
-        }
-        if (throwable instanceof NoResourceFoundException) {
-            return noResourceFoundExceptionHandler(request, (NoResourceFoundException) throwable);
-        }
-        return defaultExceptionHandler(request, throwable);
-    }
-
     /**
      * 业务异常
      */
@@ -127,16 +111,4 @@ public class GlobalExceptionHandler {
         log.error("请求地址'{}',认证失败'{}',无法访问系统资源", uri, loginException.getMessage());
         return CommonResult.fail(HttpStatus.HTTP_UNAUTHORIZED, "认证失败,无法访问系统资源");
     }
-
-    /**
-     * 系统异常
-     */
-    @ExceptionHandler(Exception.class)
-    public CommonResult<Void> defaultExceptionHandler(HttpServletRequest request, Throwable throwable) {
-        log.warn("[defaultExceptionHandler]", throwable);
-        String requestUri = request.getRequestURI();
-        String message = ExceptionUtil.getRootCauseMessage(throwable);
-        log.error("请求地址'{}',发生系统异常.{}", requestUri, message);
-        return CommonResult.fail(message);
-    }
 }

+ 1 - 0
eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/menu/pojo/MenuBO.java

@@ -52,6 +52,7 @@ public class MenuBO extends BaseBO {
     /**
      * 路径
      */
+    @NotBlank(message = "path不能为空")
     private String path;
 
     /**

+ 6 - 0
eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/org/pojo/OrgVO.java

@@ -33,6 +33,12 @@ public class OrgVO extends BaseEntity {
      */
     private String parentId;
 
+    /**
+     * 父部门Name
+     */
+    @RelationOneToOne(selfField = "parentId", targetTable = "system_org_t", targetField = "orgId", valueField = "name")
+    private String parentName;
+
     /**
      * 祖级列表
      */