Browse Source

修改 code 为数值型这样限制严谨一点

hubin 6 years ago
parent
commit
5c0dcf9ffb

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/api/IErrorCode.java

@@ -28,7 +28,7 @@ public interface IErrorCode {
     /**
      * 错误编码 0、失败 1、正常
      */
-    String getCode();
+    long getCode();
 
     /**
      * 错误描述

+ 5 - 4
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/api/R.java

@@ -15,6 +15,7 @@
  */
 package com.baomidou.mybatisplus.extension.api;
 
+import java.io.Serializable;
 import java.util.Optional;
 
 import com.baomidou.mybatisplus.extension.enums.ApiErrorCode;
@@ -31,12 +32,12 @@ import lombok.Data;
  * @since 2018-06-05
  */
 @Data
-public class R<T> {
+public class R<T> implements Serializable {
 
     /**
      * 业务错误码
      */
-    private String code;
+    private long code;
     /**
      * 结果集
      */
@@ -72,7 +73,7 @@ public class R<T> {
         return restResult(data, errorCode.getCode(), errorCode.getMsg());
     }
 
-    private static <T> R<T> restResult(T data, String code, String msg) {
+    private static <T> R<T> restResult(T data, long code, String msg) {
         R<T> apiResult = new R<>();
         apiResult.setCode(code);
         apiResult.setData(data);
@@ -81,7 +82,7 @@ public class R<T> {
     }
 
     public boolean ok() {
-        return ApiErrorCode.SUCCESS.getCode().equals(this.code);
+        return ApiErrorCode.SUCCESS.getCode() == code;
     }
 
     /**

+ 7 - 7
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/enums/ApiErrorCode.java

@@ -29,24 +29,24 @@ public enum ApiErrorCode implements IErrorCode {
     /**
      * 失败
      */
-    FAILED("-1", "失败"),
+    FAILED(-1, "失败"),
     /**
      * 成功
      */
-    SUCCESS("0", "成功");
+    SUCCESS(0, "成功");
 
-    private final String code;
+    private final long code;
     private final String msg;
 
-    ApiErrorCode(final String code, final String msg) {
+    ApiErrorCode(final long code, final String msg) {
         this.code = code;
         this.msg = msg;
     }
 
-    public static ApiErrorCode fromCode(String code) {
+    public static ApiErrorCode fromCode(long code) {
         ApiErrorCode[] ecs = ApiErrorCode.values();
         for (ApiErrorCode ec : ecs) {
-            if (ec.getCode().equalsIgnoreCase(code)) {
+            if (ec.getCode() == code) {
                 return ec;
             }
         }
@@ -54,7 +54,7 @@ public enum ApiErrorCode implements IErrorCode {
     }
 
     @Override
-    public String getCode() {
+    public long getCode() {
         return code;
     }