chore: 合并 master 分支

src/main/java/com/youlai/boot/common/exception/BusinessException.java

@@ -20,6 +20,13 @@ public class BusinessException extends RuntimeException {
         this.resultCode = errorCode;
     }
 
+
+    public BusinessException(IResultCode errorCode,String message) {
+        super(message);
+        this.resultCode = errorCode;
+    }
+
+
     public BusinessException(String message, Throwable cause) {
         super(message, cause);
     }

src/main/java/com/youlai/boot/common/exception/GlobalExceptionHandler.java

@@ -30,7 +30,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-
 /**
  * 全局系统异常处理器
  * <p>
@@ -219,9 +218,9 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(BusinessException.class)
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     public <T> Result<T> handleBizException(BusinessException e) {
-        log.error("biz exception: {}", e.getMessage());
+        log.error("biz exception", e);
         if (e.getResultCode() != null) {
-            return Result.failed(e.getResultCode());
+            return Result.failed(e.getResultCode(), e.getMessage());
         }
         return Result.failed(e.getMessage());
     }
@@ -239,8 +238,7 @@ public class GlobalExceptionHandler {
                 || e instanceof AuthenticationException) {
             throw e;
         }
-        log.error("unknown exception: {}", e.getMessage());
-        e.printStackTrace();
+        log.error("unknown exception", e);
         return Result.failed(e.getLocalizedMessage());
     }
 

src/main/java/com/youlai/boot/common/result/IResultCode.java

@@ -3,8 +3,8 @@ package com.youlai.boot.common.result;
 /**
  * 响应码接口
  *
- * @author Ray
- * @since 2022/2/18
+ * @author Ray.Hao
+ * @since 1.0.0
  **/
 public interface IResultCode {
 

src/main/java/com/youlai/boot/common/result/ResultCode.java

@@ -42,7 +42,7 @@ public enum ResultCode implements IResultCode, Serializable {
     VOICE_VERIFICATION_CODE_INPUT_ERROR("A0133", "语音校验码输入错误"),
 
     USER_CERTIFICATE_EXCEPTION("A0140", "用户证件异常"),
-    USER_CERTIFICATE_TYPE_NOT_SELECTED("A0141", "用户证<EFBFBD><EFBFBD>类型未选择"),
+    USER_CERTIFICATE_TYPE_NOT_SELECTED("A0141", "用户证件类型未选择"),
     MAINLAND_ID_NUMBER_VERIFICATION_ILLEGAL("A0142", "大陆身份证编号校验非法"),
 
     USER_BASIC_INFORMATION_VERIFICATION_FAILED("A0150", "用户基本信息校验失败"),
@@ -67,7 +67,7 @@ public enum ResultCode implements IResultCode, Serializable {
     REFRESH_TOKEN_INVALID("A0231", "刷新令牌无效或已过期"),
 
     // 验证码错误
-    USER_VERIFICATION_CODE_ERROR("A0240", "用户验证码错误"),
+    USER_VERIFICATION_CODE_ERROR("A0240", "验证码错误"),
     USER_VERIFICATION_CODE_ATTEMPT_LIMIT_EXCEEDED("A0241", "用户验证码尝试次数超限"),
     USER_VERIFICATION_CODE_EXPIRED("A0242", "用户验证码过期"),
 
@@ -127,12 +127,14 @@ public enum ResultCode implements IResultCode, Serializable {
     USER_RESOURCE_NOT_FOUND("A0606", "用户资源不存在"),
 
     /** 二级宏观错误码  */
-    USER_UPLOAD_FILE_EXCEPTION("A0700", "用户上传文件异常"),
-    USER_UPLOAD_FILE_TYPE_MISMATCH("A0701", "用户上传文件类型不匹配"),
-    USER_UPLOAD_FILE_TOO_LARGE("A0702", "用户上传文件太大"),
-    USER_UPLOAD_IMAGE_TOO_LARGE("A0703", "用户上传图片太大"),
-    USER_UPLOAD_VIDEO_TOO_LARGE("A0704", "用户上传视频太大"),
-    USER_UPLOAD_COMPRESSED_FILE_TOO_LARGE("A0705", "用户上传压缩文件太大"),
+    UPLOAD_FILE_EXCEPTION("A0700", "上传文件异常"),
+    UPLOAD_FILE_TYPE_MISMATCH("A0701", "上传文件类型不匹配"),
+    UPLOAD_FILE_TOO_LARGE("A0702", "上传文件太大"),
+    UPLOAD_IMAGE_TOO_LARGE("A0703", "上传图片太大"),
+    UPLOAD_VIDEO_TOO_LARGE("A0704", "上传视频太大"),
+    UPLOAD_COMPRESSED_FILE_TOO_LARGE("A0705", "上传压缩文件太大"),
+
+    DELETE_FILE_EXCEPTION("A0710", "删除文件异常"),
 
     /** 二级宏观错误码  */
     USER_CURRENT_VERSION_EXCEPTION("A0800", "用户当前版本异常"),