galaxy-tool.1.0.6.rc1 for jsontostring testv1.0.6.rc1

2 files changed, 5 insertions, 7 deletions

diff --git a/pom.xml b/pom.xml
index 5f39154..4ac8785 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>galaxy</artifactId>
     <packaging>jar</packaging>
     <name>galaxy</name>
-    <version>1.0.6</version>
+    <version>1.0.6_rc1</version>
     <description>galaxy tools for common</description>
     <url>http://www.zdjizhi.com/galaxy-tool</url>
 
@@ -77,8 +77,6 @@
     <properties>
         <java.version>1.8</java.version>
         <slf4j.version>1.7.7</slf4j.version>
-        <hbase.version>1.4.9</hbase.version>
-        <hadoop.version>2.7.1</hadoop.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
     </properties>
@@ -140,6 +138,7 @@
                     <include>**/*.properties</include>
                     <include>**/*.xml</include>
                     <include>**/*.dat</include>
+                    <include>**/*.json</include>
                 </includes>
                 <filtering>true</filtering>
             </resource>
@@ -222,6 +221,7 @@
             <version>1.2.2</version>
         </dependency>
 
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/src/main/java/com/zdjizhi/utils/JsonMapper.java b/src/main/java/com/zdjizhi/utils/JsonMapper.java
index a4ad8f8..b3ad08e 100644
--- a/src/main/java/com/zdjizhi/utils/JsonMapper.java
+++ b/src/main/java/com/zdjizhi/utils/JsonMapper.java
@@ -3,9 +3,7 @@ package com.zdjizhi.utils;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.TimeZone;
 
 
@@ -62,14 +60,14 @@ public class JsonMapper extends ObjectMapper {
 			}
         });
 		// 进行HTML解码。
-		this.registerModule(new SimpleModule().addSerializer(String.class, new JsonSerializer<String>(){
+		/*this.registerModule(new SimpleModule().addSerializer(String.class, new JsonSerializer<String>(){
 			@Override
 			public void serialize(String value, JsonGenerator jgen,
 					SerializerProvider provider) throws IOException,
 					JsonProcessingException {
 				jgen.writeString(StringEscapeUtils.unescapeHtml4(value));
 			}
-        }));
+        }));*/
 		// 设置时区
 		this.setTimeZone(TimeZone.getDefault());//getTimeZone("GMT+8:00")