Merge remote-tracking branch 'origin/release/10.0' into release/10.0

fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfLine.java

@@ -177,7 +177,7 @@ public class PdfLine {
         if (chunk.isBreakTag()) {
             addToLine(chunk);
             width = 0;
-            return null;
+            return new PdfChunk("", chunk);
         }
 
         // we split the chunk to be added

fine-poi/src/com/fr/third/v2/org/apache/poi/util/TempFile.java

@@ -93,7 +93,8 @@ public final class TempFile {
         @Override
         public File createTempFile(String prefix, String suffix) throws IOException {
             // Identify and create our temp dir, if needed
-            if (dir == null)
+            // 这里判断下路径是否存在，省的再排查temp目录丢失的问题
+            if (dir == null || !dir.exists())
             {
                 dir = new File(System.getProperty("java.io.tmpdir"), "poifiles");
                 dir.mkdir();

fine-socketio/src/com/fr/third/socketio/protocol/JacksonJsonSupport.java

@@ -26,6 +26,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 
 import com.fr.third.socketio.AckCallback;
 import com.fr.third.socketio.MultiTypeAckCallback;
@@ -324,6 +325,9 @@ public class JacksonJsonSupport implements JsonSupport {
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         objectMapper.configure(SerializationFeature.WRITE_BIGDECIMAL_AS_PLAIN, true);
         objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+
+        //时区设置，防止含有Data类型变量时序列化后，前台显示的data内时间不准确
+        objectMapper.setTimeZone(TimeZone.getDefault());
     }
 
     @Override