基础类定义

framework-boot/src/main/java/com/mrxu/framework/boot/bean/ResponseObj.java

@@ -16,15 +16,16 @@ public class ResponseObj<T> implements Serializable {
     private static final long serialVersionUID = -1L;
 
     public final static ResponseObj<Object> OK = new ResponseObj<Object> (BaseCode.OK);
+
     public final static ResponseObj<Object> ERROR = new ResponseObj<Object>(BaseCode.ERROR);
 
-    @ApiModelProperty(notes = "状态码", position = 4)
+    @ApiModelProperty("状态码")
     private int code = BaseCode.OK.getCode();
 
-    @ApiModelProperty(notes = "提示信息", position = 2)
+    @ApiModelProperty("提示信息")
     private String msg = BaseCode.OK.getMsg();
 
-    @ApiModelProperty(notes = "返回数据", position = 3)
+    @ApiModelProperty("返回数据")
     private T result;
 
     public ResponseObj(int code,String msg) {
@@ -53,7 +54,7 @@ public class ResponseObj<T> implements Serializable {
      * 通用的 操作成功
      */
     public static ResponseObj<Object> SUCCESS() {
-        return new ResponseObj<Object>(BaseCode.OK);
+        return OK;
     }
 
     /**

framework-boot/src/main/java/com/mrxu/framework/boot/handle/WebExceptionHandler.java

@@ -87,7 +87,7 @@ public class WebExceptionHandler {
             modelAndView.setViewName("error/500.html");
 
             //未登录
-            if(BaseCode.ERR_NOTAUTH.getCode() == code.getCode()) {
+            if(BaseCode.ERR_NOT_AUTH.getCode() == code.getCode()) {
                 StringBuffer source = request.getRequestURL();
                 String queryString = request.getQueryString();
                 if(StrFunc.isNotEmpty(queryString)) {

framework-common/src/main/java/com/mrxu/framework/common/util/BaseCode.java

@@ -2,26 +2,38 @@ package com.mrxu.framework.common.util;
 
 import lombok.Data;
 
+/**
+ * 业务错误状态码
+ */
 @Data
 public class BaseCode {
 
     public final static BaseCode OK = new BaseCode(0,"成功");
-    public final static BaseCode ERR_NOTAUTH = new BaseCode(401,"未登录或登录过期");
-    public final static BaseCode ERR_FORBIDDEN = new BaseCode(403,"无访问权限");
     public final static BaseCode ERROR = new BaseCode(500,"系统错误");
+    public final static BaseCode ERR_NOT_AUTH = new BaseCode(401,"未登录或登录过期");
+    public final static BaseCode ERR_FORBIDDEN = new BaseCode(403,"无访问权限");
     public final static BaseCode ERR_PARAMS_MISS = new BaseCode(510,"缺少必要参数");
     public final static BaseCode ERR_PARAMS_VALID = new BaseCode(511,"参数格式错误");
 
+    /**
+     * 状态码
+     */
     public int code;
 
+    /**
+     * 状态描述
+     */
     public String msg;
 
+    /**
+     * 默认构造方法
+     */
+    public BaseCode() {
+    }
+
     public BaseCode(int code, String msg) {
         this.code = code;
         this.msg = msg;
     }
 
-    public BaseCode() {
-    }
-
 }

framework-common/src/main/java/com/mrxu/framework/common/util/BusinessException.java

@@ -5,14 +5,23 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 
+/**
+ * 业务异常
+ */
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class BusinessException extends RuntimeException implements Serializable {
 
     private static final long serialVersionUID = -1L;
 
+    /**
+     * 异常状态码
+     */
     private int code;
 
+    /**
+     * 异常信息
+     */
     private String msg;
 
     public BusinessException(BaseCode baseCode) {
@@ -21,6 +30,12 @@ public class BusinessException extends RuntimeException implements Serializable
         this.msg = baseCode.getMsg();
     }
 
+    public BusinessException(BaseCode baseCode, String errMsg) {
+        super(errMsg);
+        this.code = baseCode.getCode();
+        this.msg = errMsg;
+    }
+
     public BusinessException(int code,String msg) {
         super(msg);
         this.code = code;
@@ -33,12 +48,6 @@ public class BusinessException extends RuntimeException implements Serializable
         this.msg = baseCode.getMsg();
     }
 
-    public BusinessException(BaseCode baseCode, String errMsg) {
-        super(errMsg);
-        this.code = baseCode.getCode();
-        this.msg = errMsg;
-    }
-
     public BusinessException(String errMsg) {
         super(errMsg);
         this.code = BaseCode.ERROR.getCode();

framework-common/src/main/java/com/mrxu/framework/common/util/MrxuAssert.java

@@ -1,5 +1,6 @@
 package com.mrxu.framework.common.util;
 
+import cn.hutool.core.util.ObjectUtil;
 import org.hibernate.validator.HibernateValidator;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
@@ -10,32 +11,71 @@ import javax.validation.Validator;
 import java.util.List;
 import java.util.Set;
 
+/**
+ * 自定义断言
+ */
 public class MrxuAssert {
 
+    /**
+     * 断言表达式是true，否则抛出异常
+     * @param expression 表达式内容
+     * @param msg 异常message
+     */
     public static void isTrue(boolean expression, String msg) {
         if (!expression) {
             throw new BusinessException(msg);
         }
     }
 
+    /**
+     * 断言表达式是true，否则抛出异常
+     * @param expression 表达式内容
+     * @param baseCode 异常Code
+     */
     public static void isTrue(boolean expression, BaseCode baseCode) {
         if (!expression) {
             throw new BusinessException(baseCode);
         }
     }
 
-    public static void isNotEmpty(Object str, String msg) {
-        isFalse((str == null) || ("".equals(str.toString())), msg);
+    /**
+     * 断言表达式是false，否则抛出异常
+     * @param expression 表达式内容
+     * @param msg 错误信息
+     */
+    public static void isFalse(boolean expression, String msg) {
+        isTrue(!expression, msg);
     }
 
-    public static void isEmpty(Object str, String msg) {
-        isTrue((str == null) || ("".equals(str.toString())), msg);
+    /**
+     * 断言表达式是false，否则抛出异常
+     * @param expression 表达式内容
+     * @param baseCode 异常Code
+     */
+    public static void isFalse(boolean expression,BaseCode baseCode) {
+        isTrue(!expression,baseCode);
     }
 
-    public static void isFalse(boolean expression, String msg) {
-        isTrue(!expression, msg);
+    /**
+     * 断言对象不为空，否则抛出异常
+     * @param obj 要判断对象
+     * @param msg 异常msg
+     */
+    public static void isNotEmpty(Object obj, String msg) {
+        isTrue(ObjectUtil.isNotEmpty(obj),msg);
     }
 
+    /**
+     * 断言对象为空，否则抛出异常
+     * @param obj 要判断对象
+     * @param msg 异常msg
+     */
+    public static void isEmpty(Object obj, String msg) {
+        isTrue(!ObjectUtil.isNotEmpty(obj),msg);
+    }
+
+
+
     public static void check(BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             List<FieldError> list = bindingResult.getFieldErrors();