From cd9508d7eb62fb3f9b9626d8b40322b9cc6a2074 Mon Sep 17 00:00:00 2001
From: wizzercn <wizzer@qq.com>
Date: Wed, 12 Dec 2018 17:09:40 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E4=BF=AE=E5=A4=8DResult=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E7=9A=84=E9=97=AE=E9=A2=98=20&=20=E5=87=86?=
 =?UTF-8?q?=E5=A4=87=E5=8F=91=E5=B8=835.1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                      | 2 +-
 wk-app/pom.xml                                               | 2 +-
 wk-app/wk-common/pom.xml                                     | 2 +-
 wk-app/wk-model/pom.xml                                      | 2 +-
 wk-app/wk-nb-service-cms/pom.xml                             | 2 +-
 wk-app/wk-nb-service-sys/pom.xml                             | 2 +-
 wk-app/wk-nb-service-wx/pom.xml                              | 2 +-
 wk-app/wk-nb-task/pom.xml                                    | 2 +-
 wk-app/wk-nb-web-api/pom.xml                                 | 2 +-
 wk-app/wk-nb-web-platform/pom.xml                            | 2 +-
 wk-app/wk-nb-web-vue/pom.xml                                 | 2 +-
 wk-framework/pom.xml                                         | 2 +-
 .../src/main/java/cn/wizzer/framework/base/Result.java       | 5 ++---
 wk-wiki/pom.xml                                              | 4 ++--
 14 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index da45e0e06..f73e8b3a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.wizzer</groupId>
     <artifactId>wk-parent</artifactId>
-    <version>5.1.1</version>
+    <version>5.1.2</version>
     <modules>
         <module>wk-framework</module>
         <module>wk-app</module>
diff --git a/wk-app/pom.xml b/wk-app/pom.xml
index 7e7c46a64..5634b31e6 100644
--- a/wk-app/pom.xml
+++ b/wk-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-parent</artifactId>
         <groupId>cn.wizzer</groupId>
-        <version>5.1.1</version>
+        <version>5.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
diff --git a/wk-app/wk-common/pom.xml b/wk-app/wk-common/pom.xml
index 685d05f02..fe9cefad5 100644
--- a/wk-app/wk-common/pom.xml
+++ b/wk-app/wk-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.1.1</version>
+        <version>5.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/wk-app/wk-model/pom.xml b/wk-app/wk-model/pom.xml
index acd9bd93c..c5fac85d4 100644
--- a/wk-app/wk-model/pom.xml
+++ b/wk-app/wk-model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.1.1</version>
+        <version>5.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/wk-app/wk-nb-service-cms/pom.xml b/wk-app/wk-nb-service-cms/pom.xml
index 2e6d96d20..7b5cee237 100644
--- a/wk-app/wk-nb-service-cms/pom.xml
+++ b/wk-app/wk-nb-service-cms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.1.1</version>
+        <version>5.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/wk-app/wk-nb-service-sys/pom.xml b/wk-app/wk-nb-service-sys/pom.xml
index 5acc0fd3f..87a1fe5a6 100644
--- a/wk-app/wk-nb-service-sys/pom.xml
+++ b/wk-app/wk-nb-service-sys/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.1.1</version>
+        <version>5.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/wk-app/wk-nb-service-wx/pom.xml b/wk-app/wk-nb-service-wx/pom.xml
index e41c363d6..97d490fec 100644
--- a/wk-app/wk-nb-service-wx/pom.xml
+++ b/wk-app/wk-nb-service-wx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.1.1</version>
+        <version>5.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/wk-app/wk-nb-task/pom.xml b/wk-app/wk-nb-task/pom.xml
index f6c55fefd..4c8f8dc3c 100644
--- a/wk-app/wk-nb-task/pom.xml
+++ b/wk-app/wk-nb-task/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.1.1</version>
+        <version>5.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/wk-app/wk-nb-web-api/pom.xml b/wk-app/wk-nb-web-api/pom.xml
index d1fdc857a..f5e4663ef 100644
--- a/wk-app/wk-nb-web-api/pom.xml
+++ b/wk-app/wk-nb-web-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.1.1</version>
+        <version>5.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/wk-app/wk-nb-web-platform/pom.xml b/wk-app/wk-nb-web-platform/pom.xml
index 8e2712dd0..d0dd37d8e 100644
--- a/wk-app/wk-nb-web-platform/pom.xml
+++ b/wk-app/wk-nb-web-platform/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.1.1</version>
+        <version>5.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/wk-app/wk-nb-web-vue/pom.xml b/wk-app/wk-nb-web-vue/pom.xml
index e77bd091d..25f989220 100644
--- a/wk-app/wk-nb-web-vue/pom.xml
+++ b/wk-app/wk-nb-web-vue/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.1.1</version>
+        <version>5.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/wk-framework/pom.xml b/wk-framework/pom.xml
index 5d6806b17..829c4469c 100644
--- a/wk-framework/pom.xml
+++ b/wk-framework/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-parent</artifactId>
         <groupId>cn.wizzer</groupId>
-        <version>5.1.1</version>
+        <version>5.1.2</version>
     </parent>
     <packaging>jar</packaging>
     <modelVersion>4.0.0</modelVersion>
diff --git a/wk-framework/src/main/java/cn/wizzer/framework/base/Result.java b/wk-framework/src/main/java/cn/wizzer/framework/base/Result.java
index 2c3e8c678..79c321702 100644
--- a/wk-framework/src/main/java/cn/wizzer/framework/base/Result.java
+++ b/wk-framework/src/main/java/cn/wizzer/framework/base/Result.java
@@ -33,7 +33,7 @@ public Result addCode(int code) {
 
     public Result addMsg(String msg) {
         if (Strings.isBlank(msg) || Mvcs.getActionContext() == null || Mvcs.getActionContext().getRequest() == null || Mvcs.getMessage(Mvcs.getActionContext().getRequest(), msg) == null) {
-            this.msg = "";
+            this.msg = Strings.sNull(msg);
         } else {
             this.msg = Mvcs.getMessage(Mvcs.getActionContext().getRequest(), msg);
         }
@@ -96,8 +96,7 @@ public Object getData() {
         return data;
     }
 
-    @Override
-    public String toString() {
+    public String toJson() {
         return Json.toJson(this, JsonFormat.compact());
     }
 
diff --git a/wk-wiki/pom.xml b/wk-wiki/pom.xml
index 9b549aa09..d1047863b 100644
--- a/wk-wiki/pom.xml
+++ b/wk-wiki/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <artifactId>wk-parent</artifactId>
         <groupId>cn.wizzer</groupId>
-        <version>5.1.1</version>
+        <version>5.1.2</version>
     </parent>
     <artifactId>wk-wiki</artifactId>
-    <version>5.1.1</version>
+    <version>5.1.2</version>
     <packaging>pom</packaging>
     <name>wk-wiki</name>
     <url>http://www.wizzer.cn</url>