Merge branch 'main' of http://th.local.t-aaron.com:13000/THENG/a-cloud-all

ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineFileVO.java

@@ -18,7 +18,10 @@ public class AirlineFileVO {
      * 主键ID
      */
     private Long id;
-
+    /**
+     * 航线名称
+     */
+    private String name;
     /**
      * 用户ID
      */
@@ -50,7 +53,7 @@ public class AirlineFileVO {
     /**
      * 航线点列表
      */
-    private List<AirLinePointVO> linePointDtoList;
+    private List<AirLinePointVO> linePointVOList;
 
     /**
      * 1 启用 0 停用

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java

@@ -14,6 +14,7 @@ import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.exception.DemoModeException;
 import com.ruoyi.common.core.exception.InnerAuthException;
 import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.exception.base.BaseException;
 import com.ruoyi.common.core.exception.auth.NotPermissionException;
 import com.ruoyi.common.core.exception.auth.NotRoleException;
 import com.ruoyi.common.core.text.Convert;
@@ -75,6 +76,17 @@ public class GlobalExceptionHandler
         return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage());
     }
 
+    /**
+     * 基础异常
+     */
+    @ExceptionHandler(BaseException.class)
+    public AjaxResult handleBaseException(BaseException e, HttpServletRequest request)
+    {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址'{}',发生基础异常'{}'", requestURI, e.getDefaultMessage(), e);
+        return AjaxResult.error(e.getDefaultMessage());
+    }
+
     /**
      * 请求路径中缺少必需的路径变量
      */