From 66a1f23216dc7ce9fb8e440037291f7109568f3d Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Sat, 21 Nov 2020 15:16:25 +0800
Subject: [PATCH] =?UTF-8?q?Feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E7=9A=84=E6=9F=A5=E8=AF=A2=E5=AE=9E=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/flyfish/framework/bean/Result.java | 14 +++++++++++---
 .../config/FrameworkConfiguration.java          | 15 +++++++++++++++
 .../flyfish/framework/constant/Frameworks.java  | 17 +++++++++++++++++
 3 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 flyfish-common/src/main/java/com/flyfish/framework/config/FrameworkConfiguration.java
 create mode 100644 flyfish-common/src/main/java/com/flyfish/framework/constant/Frameworks.java

diff --git a/flyfish-common/src/main/java/com/flyfish/framework/bean/Result.java b/flyfish-common/src/main/java/com/flyfish/framework/bean/Result.java
index 0d3e5b5..4d799df 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/bean/Result.java
+++ b/flyfish-common/src/main/java/com/flyfish/framework/bean/Result.java
@@ -1,6 +1,6 @@
 package com.flyfish.framework.bean;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.flyfish.framework.constant.Frameworks;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
@@ -144,7 +144,11 @@ public class Result<T> {
     }
 
     public T getData() {
-        return data;
+        return Frameworks.config.isResultStyle() ? null : data;
+    }
+
+    public T getResult() {
+        return Frameworks.config.isResultStyle() ? data : null;
     }
 
     public void setData(T data) {
@@ -160,7 +164,11 @@ public class Result<T> {
     }
 
     public String getMsg() {
-        return msg;
+        return Frameworks.config.isResultStyle() ? null : msg;
+    }
+
+    public String getMessage() {
+        return Frameworks.config.isResultStyle() ? msg : null;
     }
 
     public void setMsg(String msg) {
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/config/FrameworkConfiguration.java b/flyfish-common/src/main/java/com/flyfish/framework/config/FrameworkConfiguration.java
new file mode 100644
index 0000000..be2885e
--- /dev/null
+++ b/flyfish-common/src/main/java/com/flyfish/framework/config/FrameworkConfiguration.java
@@ -0,0 +1,15 @@
+package com.flyfish.framework.config;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 框架配置
+ * @author wangyu
+ */
+@Setter
+@Getter
+public class FrameworkConfiguration {
+
+    private boolean resultStyle = false;
+}
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/constant/Frameworks.java b/flyfish-common/src/main/java/com/flyfish/framework/constant/Frameworks.java
new file mode 100644
index 0000000..69b9a46
--- /dev/null
+++ b/flyfish-common/src/main/java/com/flyfish/framework/constant/Frameworks.java
@@ -0,0 +1,17 @@
+package com.flyfish.framework.constant;
+
+import com.flyfish.framework.config.FrameworkConfiguration;
+
+/**
+ * 框架静态配置
+ *
+ * @author wangyu
+ */
+public interface Frameworks {
+
+    FrameworkConfiguration config = new FrameworkConfiguration();
+
+    static void resultStyle() {
+        config.setResultStyle(true);
+    }
+}