update: 修复Result默认值的问题 & 准备发布5.1.2

Wizzercn · Dec 12, 2018 · cd9508d · cd9508d
1 parent a333023
commit cd9508d
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>