Merge branch 'feature/java11' into 'develop'

fix redies

See merge request o2oa/o2oa!1620

o2server/x_base_core_project/src/main/java/com/x/base/core/project/cache/CacheRedisImpl.java

@@ -4,6 +4,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Optional;
@@ -12,6 +13,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 import org.apache.commons.lang3.StringUtils;
 
 import com.x.base.core.project.config.Cache.Redis;
+import com.x.base.core.project.gson.XGsonBuilder;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.jaxrs.WrapClearCacheRequest;
 
@@ -62,10 +64,14 @@ public class CacheRedisImpl implements Cache {
 
 	@Override
 	public Optional<Object> get(CacheCategory category, CacheKey key) throws Exception {
-		try (ByteArrayInputStream bais = new ByteArrayInputStream(
-				jedis.get(concrete(category, key).getBytes(StandardCharsets.UTF_8)));
-				ObjectInputStream ois = new ObjectInputStream(bais)) {
-			return Optional.ofNullable(ois.readObject());
+		byte[] bytes = jedis.get(concrete(category, key).getBytes(StandardCharsets.UTF_8));
+		if ((null != bytes) && bytes.length > 0) {
+			try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+					ObjectInputStream ois = new ObjectInputStream(bais)) {
+				return Optional.ofNullable(ois.readObject());
+			}
+		} else {
+			return Optional.empty();
 		}
 	}
 

o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WoFile.java

 package com.x.base.core.project.jaxrs;
 
 import com.x.base.core.project.annotation.FieldDescribe;
+import com.x.base.core.project.gson.GsonPropertyObject;
 
-public abstract class WoFile {
+public abstract class WoFile extends GsonPropertyObject {
 
+	private static final long serialVersionUID = -4566232046358204025L;
 	@FieldDescribe("说明")
 	private String contentDisposition;
 	@FieldDescribe("类型")

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/PersistenceProperties.java

@@ -76,6 +76,10 @@ public final class PersistenceProperties extends AbstractPersistenceProperties {
 		public static class DocumentVersion {
 			public static final String table = "PP_C_DOCUMENTVERSION";
 		}
+
+		public static class Snap {
+			public static final String table = "PP_C_SNAP";
+		}
 	}
 
 	public static class Element {

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Record.java

@@ -30,7 +30,7 @@ import com.x.processplatform.core.entity.PersistenceProperties;
 import com.x.processplatform.core.entity.element.ActivityType;
 
 @Entity
-@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
+@ContainerEntity(dumpSize = 100, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.Content.Record.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Content.Record.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,