From e1e2c7ac3afb8745ff3ee7dcd901f26d14dbfd38 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Thu, 23 Mar 2017 11:55:14 +0800 Subject: [PATCH] 2.2.1 --- hsweb-web-bean/pom.xml | 2 +- .../hsweb-web-concurrent-cache/pom.xml | 2 +- .../hsweb-web-concurrent-lock/pom.xml | 2 +- hsweb-web-concurrent/pom.xml | 2 +- hsweb-web-controller/pom.xml | 2 +- .../MessageConverterConfiguration.java | 23 ++++++++++++++----- hsweb-web-core/pom.xml | 2 +- hsweb-web-dao/hsweb-web-dao-api/pom.xml | 2 +- hsweb-web-dao/hsweb-web-dao-mybatis/README.md | 2 +- hsweb-web-dao/hsweb-web-dao-mybatis/pom.xml | 2 +- hsweb-web-dao/pom.xml | 2 +- hsweb-web-datasource/pom.xml | 2 +- .../hsweb-web-oauth2-controller/pom.xml | 2 +- .../hsweb-web-oauth2-core/pom.xml | 2 +- .../hsweb-web-oauth2-mybatis/pom.xml | 2 +- .../hsweb-web-oauth2-service-simple/pom.xml | 2 +- .../hsweb-web-oauth2-simple/pom.xml | 2 +- hsweb-web-oauth2/pom.xml | 2 +- .../hsweb-web-service-api/pom.xml | 2 +- .../hsweb-web-service-simple/pom.xml | 4 ++-- hsweb-web-service/pom.xml | 2 +- hsweb-web-starter/pom.xml | 2 +- hsweb-web-websocket/pom.xml | 2 +- hsweb-web-workflow/pom.xml | 2 +- pom.xml | 2 +- 25 files changed, 42 insertions(+), 31 deletions(-) diff --git a/hsweb-web-bean/pom.xml b/hsweb-web-bean/pom.xml index 468d26841..b494ad8bd 100644 --- a/hsweb-web-bean/pom.xml +++ b/hsweb-web-bean/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hsweb - 2.2 + 2.2.1 4.0.0 hsweb-web-bean diff --git a/hsweb-web-concurrent/hsweb-web-concurrent-cache/pom.xml b/hsweb-web-concurrent/hsweb-web-concurrent-cache/pom.xml index 38550c34b..f3f1e7e5d 100644 --- a/hsweb-web-concurrent/hsweb-web-concurrent-cache/pom.xml +++ b/hsweb-web-concurrent/hsweb-web-concurrent-cache/pom.xml @@ -5,7 +5,7 @@ hsweb-web-concurrent org.hsweb - 2.2 + 2.2.1 4.0.0 hsweb-web-concurrent-cache diff --git a/hsweb-web-concurrent/hsweb-web-concurrent-lock/pom.xml b/hsweb-web-concurrent/hsweb-web-concurrent-lock/pom.xml index 44485d38b..1244fc6dc 100644 --- a/hsweb-web-concurrent/hsweb-web-concurrent-lock/pom.xml +++ b/hsweb-web-concurrent/hsweb-web-concurrent-lock/pom.xml @@ -5,7 +5,7 @@ hsweb-web-concurrent org.hsweb - 2.2 + 2.2.1 4.0.0 hsweb-web-concurrent-lock diff --git a/hsweb-web-concurrent/pom.xml b/hsweb-web-concurrent/pom.xml index d765da021..3cebb9121 100644 --- a/hsweb-web-concurrent/pom.xml +++ b/hsweb-web-concurrent/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hsweb - 2.2 + 2.2.1 4.0.0 pom diff --git a/hsweb-web-controller/pom.xml b/hsweb-web-controller/pom.xml index 42e206f9f..818552c0d 100644 --- a/hsweb-web-controller/pom.xml +++ b/hsweb-web-controller/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hsweb - 2.2 + 2.2.1 4.0.0 hsweb-web-controller diff --git a/hsweb-web-controller/src/main/java/org/hsweb/web/controller/MessageConverterConfiguration.java b/hsweb-web-controller/src/main/java/org/hsweb/web/controller/MessageConverterConfiguration.java index 1e6d31d7a..12f153ef4 100644 --- a/hsweb-web-controller/src/main/java/org/hsweb/web/controller/MessageConverterConfiguration.java +++ b/hsweb-web-controller/src/main/java/org/hsweb/web/controller/MessageConverterConfiguration.java @@ -1,7 +1,9 @@ package org.hsweb.web.controller; import com.alibaba.fastjson.serializer.SerializerFeature; +import org.hsweb.web.bean.po.user.User; import org.hsweb.web.core.message.FastJsonHttpMessageConverter; +import org.hsweb.web.core.message.ResponseMessage; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.HttpMessageConverter; @@ -16,11 +18,20 @@ public class MessageConverterConfiguration { public HttpMessageConverter converter() { FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter(); converter.setFeatures( - SerializerFeature.WriteNullListAsEmpty, - SerializerFeature.WriteNullNumberAsZero, - SerializerFeature.WriteNullBooleanAsFalse, - SerializerFeature.WriteDateUseDateFormat - ); - return converter; + SerializerFeature.WriteNullListAsEmpty, + SerializerFeature.WriteNullNumberAsZero, + SerializerFeature.WriteNullBooleanAsFalse, + SerializerFeature.WriteDateUseDateFormat + ); + return converter; + } + + public static void main(String[] args) { + User user = new User(); + user.setPassword("test"); + user.setUsername("test1"); + ResponseMessage message = ResponseMessage.created(user) + .exclude("password"); + System.out.println(new FastJsonHttpMessageConverter().converter(message)); } } diff --git a/hsweb-web-core/pom.xml b/hsweb-web-core/pom.xml index 9ea86a87f..01bed3c24 100644 --- a/hsweb-web-core/pom.xml +++ b/hsweb-web-core/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hsweb - 2.2 + 2.2.1 4.0.0 hsweb-web-core diff --git a/hsweb-web-dao/hsweb-web-dao-api/pom.xml b/hsweb-web-dao/hsweb-web-dao-api/pom.xml index a3fe80138..5eb0482d2 100644 --- a/hsweb-web-dao/hsweb-web-dao-api/pom.xml +++ b/hsweb-web-dao/hsweb-web-dao-api/pom.xml @@ -5,7 +5,7 @@ hsweb-web-dao org.hsweb - 2.2 + 2.2.1 4.0.0 hsweb-web-dao-api diff --git a/hsweb-web-dao/hsweb-web-dao-mybatis/README.md b/hsweb-web-dao/hsweb-web-dao-mybatis/README.md index 12d20e2dc..35ba28060 100644 --- a/hsweb-web-dao/hsweb-web-dao-mybatis/README.md +++ b/hsweb-web-dao/hsweb-web-dao-mybatis/README.md @@ -10,7 +10,7 @@ org.hsweb hsweb-web-dao-mybatis - 2.2 + 2.2.1 ``` diff --git a/hsweb-web-dao/hsweb-web-dao-mybatis/pom.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/pom.xml index 1ece00fc7..527236a1f 100644 --- a/hsweb-web-dao/hsweb-web-dao-mybatis/pom.xml +++ b/hsweb-web-dao/hsweb-web-dao-mybatis/pom.xml @@ -5,7 +5,7 @@ hsweb-web-dao org.hsweb - 2.2 + 2.2.1 4.0.0 hsweb-web-dao-mybatis diff --git a/hsweb-web-dao/pom.xml b/hsweb-web-dao/pom.xml index a2da0c1d9..084858f51 100644 --- a/hsweb-web-dao/pom.xml +++ b/hsweb-web-dao/pom.xml @@ -21,7 +21,7 @@ hsweb-framework org.hsweb - 2.2 + 2.2.1 4.0.0 pom diff --git a/hsweb-web-datasource/pom.xml b/hsweb-web-datasource/pom.xml index 2dfef8f21..386427b0d 100644 --- a/hsweb-web-datasource/pom.xml +++ b/hsweb-web-datasource/pom.xml @@ -21,7 +21,7 @@ hsweb-framework org.hsweb - 2.2 + 2.2.1 4.0.0 diff --git a/hsweb-web-oauth2/hsweb-web-oauth2-controller/pom.xml b/hsweb-web-oauth2/hsweb-web-oauth2-controller/pom.xml index f6ac0839e..6913912e4 100644 --- a/hsweb-web-oauth2/hsweb-web-oauth2-controller/pom.xml +++ b/hsweb-web-oauth2/hsweb-web-oauth2-controller/pom.xml @@ -21,7 +21,7 @@ hsweb-web-oauth2 org.hsweb - 2.2 + 2.2.1 4.0.0 diff --git a/hsweb-web-oauth2/hsweb-web-oauth2-core/pom.xml b/hsweb-web-oauth2/hsweb-web-oauth2-core/pom.xml index ec3461849..12e6f17ae 100644 --- a/hsweb-web-oauth2/hsweb-web-oauth2-core/pom.xml +++ b/hsweb-web-oauth2/hsweb-web-oauth2-core/pom.xml @@ -21,7 +21,7 @@ hsweb-web-oauth2 org.hsweb - 2.2 + 2.2.1 4.0.0 diff --git a/hsweb-web-oauth2/hsweb-web-oauth2-mybatis/pom.xml b/hsweb-web-oauth2/hsweb-web-oauth2-mybatis/pom.xml index e889a075d..e68cd8702 100644 --- a/hsweb-web-oauth2/hsweb-web-oauth2-mybatis/pom.xml +++ b/hsweb-web-oauth2/hsweb-web-oauth2-mybatis/pom.xml @@ -21,7 +21,7 @@ hsweb-web-oauth2 org.hsweb - 2.2 + 2.2.1 4.0.0 diff --git a/hsweb-web-oauth2/hsweb-web-oauth2-service-simple/pom.xml b/hsweb-web-oauth2/hsweb-web-oauth2-service-simple/pom.xml index 23ee10d16..2a62dc249 100644 --- a/hsweb-web-oauth2/hsweb-web-oauth2-service-simple/pom.xml +++ b/hsweb-web-oauth2/hsweb-web-oauth2-service-simple/pom.xml @@ -21,7 +21,7 @@ hsweb-web-oauth2 org.hsweb - 2.2 + 2.2.1 4.0.0 diff --git a/hsweb-web-oauth2/hsweb-web-oauth2-simple/pom.xml b/hsweb-web-oauth2/hsweb-web-oauth2-simple/pom.xml index 6b6f3a813..b9c7e1fde 100644 --- a/hsweb-web-oauth2/hsweb-web-oauth2-simple/pom.xml +++ b/hsweb-web-oauth2/hsweb-web-oauth2-simple/pom.xml @@ -21,7 +21,7 @@ hsweb-web-oauth2 org.hsweb - 2.2 + 2.2.1 4.0.0 diff --git a/hsweb-web-oauth2/pom.xml b/hsweb-web-oauth2/pom.xml index b54e32cdb..7427df2b9 100644 --- a/hsweb-web-oauth2/pom.xml +++ b/hsweb-web-oauth2/pom.xml @@ -21,7 +21,7 @@ hsweb-framework org.hsweb - 2.2 + 2.2.1 4.0.0 diff --git a/hsweb-web-service/hsweb-web-service-api/pom.xml b/hsweb-web-service/hsweb-web-service-api/pom.xml index 1c37a55a2..e15959c49 100644 --- a/hsweb-web-service/hsweb-web-service-api/pom.xml +++ b/hsweb-web-service/hsweb-web-service-api/pom.xml @@ -5,7 +5,7 @@ hsweb-web-service org.hsweb - 2.2 + 2.2.1 4.0.0 hsweb-web-service-api diff --git a/hsweb-web-service/hsweb-web-service-simple/pom.xml b/hsweb-web-service/hsweb-web-service-simple/pom.xml index ce9bcd9c4..6aaaad7c4 100644 --- a/hsweb-web-service/hsweb-web-service-simple/pom.xml +++ b/hsweb-web-service/hsweb-web-service-simple/pom.xml @@ -5,7 +5,7 @@ hsweb-web-service org.hsweb - 2.2 + 2.2.1 4.0.0 @@ -45,7 +45,7 @@ javax.el el-api - 2.2 + 2.2.1 test diff --git a/hsweb-web-service/pom.xml b/hsweb-web-service/pom.xml index 4ef45e9e6..2c938f3e1 100644 --- a/hsweb-web-service/pom.xml +++ b/hsweb-web-service/pom.xml @@ -21,7 +21,7 @@ hsweb-framework org.hsweb - 2.2 + 2.2.1 4.0.0 diff --git a/hsweb-web-starter/pom.xml b/hsweb-web-starter/pom.xml index 3277c3d47..2a7c1fa9e 100644 --- a/hsweb-web-starter/pom.xml +++ b/hsweb-web-starter/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hsweb - 2.2 + 2.2.1 4.0.0 diff --git a/hsweb-web-websocket/pom.xml b/hsweb-web-websocket/pom.xml index 3e508a3f2..544f3ae7d 100644 --- a/hsweb-web-websocket/pom.xml +++ b/hsweb-web-websocket/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hsweb - 2.2 + 2.2.1 4.0.0 diff --git a/hsweb-web-workflow/pom.xml b/hsweb-web-workflow/pom.xml index b05d66015..7f010c9fa 100644 --- a/hsweb-web-workflow/pom.xml +++ b/hsweb-web-workflow/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hsweb - 2.2 + 2.2.1 4.0.0 diff --git a/pom.xml b/pom.xml index b256f8f66..b0018ef83 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.hsweb hsweb-framework pom - 2.2 + 2.2.1 ${project.groupId}:${project.artifactId} http://www.hsweb.me