浏览代码

Merge pull request #283 from keyganker/master

upgrade fastjson for security
agapple 8 年之前
父节点
当前提交
c629e8c899
共有 2 个文件被更改,包括 7 次插入12 次删除
  1. 6 11
      common/src/main/java/com/alibaba/otter/canal/common/utils/JsonUtils.java
  2. 1 1
      pom.xml

+ 6 - 11
common/src/main/java/com/alibaba/otter/canal/common/utils/JsonUtils.java

@@ -1,5 +1,9 @@
 package com.alibaba.otter.canal.common.utils;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson.serializer.*;
+
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.net.Inet4Address;
@@ -8,15 +12,6 @@ import java.net.InetAddress;
 import java.util.Arrays;
 import java.util.List;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
-import com.alibaba.fastjson.serializer.JSONSerializer;
-import com.alibaba.fastjson.serializer.ObjectSerializer;
-import com.alibaba.fastjson.serializer.PropertyFilter;
-import com.alibaba.fastjson.serializer.SerializeConfig;
-import com.alibaba.fastjson.serializer.SerializeWriter;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-
 /**
  * 字节处理相关工具类
  * 
@@ -88,8 +83,8 @@ public class JsonUtils {
 
         public static InetAddressSerializer instance = new InetAddressSerializer();
 
-        public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType)
-                                                                                                     throws IOException {
+        @Override
+        public void write(JSONSerializer serializer, Object object, Object fieldName, Type type, int i) throws IOException {
             if (object == null) {
                 serializer.writeNull();
                 return;

+ 1 - 1
pom.xml

@@ -177,7 +177,7 @@
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
-                <version>1.1.35</version>
+                <version>1.2.28</version>
             </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>