Merge branch 'release/1.6.1'

CHANGELOG.md

@@ -0,0 +1,13 @@
+# 版本升级日志
+
+## 1.6.1 - 2020年8月27日
+
+### add
+
+- 添加升级日志 @田云
+
+## 1.6.0 - 2020年8月27日
+
+### add
+
+- test @田云

README.md

@@ -1,4 +1,5 @@
 # springboot-parent
+
 springboot-web常用功能整合，包含常用功能。
 - springboot-web示例
 - log4j2 日志异步打印

app/src/main/resources/application-dev.yml

@@ -29,7 +29,13 @@ spring:
       # 合并执行的相同sql，避免因为参数不同而统计多条sql语句；开启慢sql记录
       connect-properties: config.stat.mergeSql=true;config.stat.slowSqlMillis=500
       use-global-data-source-stat: true # 合并多个DruidDataSource的监控数据
-
+      stat-view-servlet:
+        enabled: true
+        login-username: tianyun
+        login-password: tianyunperfect
+        allow: # 默认运行所有
+        deny: # 默认即可
+        reset-enable: true
 
 
 mybatis:

common/src/main/java/com/alvin/common/entity/Result.java

@@ -5,7 +5,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 
 /**
  * @Description
@@ -23,9 +22,10 @@ public class Result<T> implements Serializable {
     private T data;
 
     public static <T> Result<T> result(Boolean flag, ResultCode resultCode, T data) {
-        return new Result<T>(flag, resultCode.ordinal(), resultCode.name(), data);
+        return new Result<T>(flag, resultCode.getCode(), resultCode.getMessage(), data);
     }
 
+    //region success封装
     public static <T> Result<T> success(ResultCode resultCode, T data) {
         return result(true, resultCode, data);
     }
@@ -37,22 +37,45 @@ public class Result<T> implements Serializable {
     public static <T> Result<T> success() {
         return success(null);
     }
+    //endregion
 
+
+    //region failure封装
     public static <T> Result<T> failure(Integer code, String message) {
         return new Result<T>(false, code, message, null);
     }
 
     public static <T> Result<T> failure(ResultCode resultCode) {
-        return new Result<T>(false, resultCode.ordinal(), resultCode.name(), null);
+        return new Result<T>(false, resultCode.getCode(), resultCode.getMessage(), null);
     }
 
     public static <T> Result<T> failure() {
         return failure(ResultCode.FAIL);
     }
+    //endregion
+
+
+    /**
+     * 通过对象输出结果
+     * 当对象为 true 或者不为 null 的时候返回正常
+     *
+     * @param t          t
+     * @param resultCode 结果代码
+     * @return {@link Result<T>}
+     */
+    public static <T> Result<T> byObject(T t, ResultCode resultCode) {
+        if (t instanceof Boolean) {
+            if ((Boolean) t) {
+                return Result.success();
+            }
+        } else if (t != null) {
+            return Result.success(t);
+        }
+        return Result.failure(resultCode);
+    }
 
     public static void main(String[] args) {
-        ArrayList<String> strings = new ArrayList<>();
-        strings.add("12");
-        System.out.println(Result.success(strings));
+        System.out.println(Result.byObject(null, ResultCode.UNKNOW));
+        System.out.println(Result.byObject(false, ResultCode.UNKNOW));
     }
 }

common/src/main/java/com/alvin/common/entity/ResultCode.java

@@ -15,6 +15,22 @@ public enum ResultCode {
      */
     private String message;
 
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
     ResultCode(Integer code, String message) {
         this.code = code;
         this.message = message;