Merge branch 'feature/entityDump' into 'develop'

增加@ContainerEntity的dumpSize,type,reference设置,dump时通过不同的分类进行区分

See merge request o2oa/o2oa!498

o2server/configSample/dumpRestoreData.json

@@ -3,8 +3,10 @@
   "includes": [],
   "excludes": [],
   "batchSize": 1000.0,
+  "mode": "lite",
   "###enable": "是否启用.###",
   "###includes": "导出导入包含对象,可以使用通配符*.###",
   "###excludes": "导出导入排除对象,可以使用通配符*.###",
-  "###batchSize": "批量对象数量.###"
+  "###batchSize": "批量对象数量.###",
+  "###mode": "导出数据模式,lite|full,默认使用lite###"
 }

o2server/start_linux_debug.sh

@@ -146,4 +146,4 @@ if [ -d ${current_dir}/local/update ]; then
 		rm -Rf ${current_dir}/local/update
 	fi
 fi
-setsid ${current_dir}/jvm/linux/bin/java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
+setsid ${current_dir}/jvm/linux/bin/java -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar

o2server/start_windows_debug.bat

@@ -144,5 +144,5 @@ if exist "%~dp0local\update" (
 	)
 )
 @echo on
-"%~dp0jvm\windows\bin\java" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar "%~dp0console.jar"
+"%~dp0jvm\windows\bin\java" -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar "%~dp0console.jar"
 pause

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceAdmin.java

@@ -17,7 +17,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AttendanceAdmin.table, uniqueConstraints = @UniqueConstraint(name = PersistenceProperties.AttendanceAdmin.table
 		+ JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceAppealInfo.java

@@ -22,7 +22,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AttendanceAppealInfo.table, uniqueConstraints = @UniqueConstraint(name = PersistenceProperties.AttendanceAppealInfo.table
 		+ JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceDetail.java

@@ -24,7 +24,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AttendanceDetail.table, uniqueConstraints = @UniqueConstraint(name = PersistenceProperties.AttendanceDetail.table
 		+ JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceDetailMobile.java

@@ -20,7 +20,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AttendanceDetailMobile.table, uniqueConstraints = @UniqueConstraint(name = PersistenceProperties.AttendanceDetailMobile.table
 		+ JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceDingtalkDetail.java

@@ -9,7 +9,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 import javax.persistence.*;
 import java.util.Date;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AttendanceDingtalkDetail.table, uniqueConstraints = @UniqueConstraint(name = PersistenceProperties.AttendanceDingtalkDetail.table
         + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceEmployeeConfig.java

@@ -17,7 +17,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AttendanceEmployeeConfig.table, uniqueConstraints = @UniqueConstraint(name = PersistenceProperties.AttendanceEmployeeConfig.table
 		+ JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceImportFileInfo.java

@@ -32,7 +32,7 @@ import com.x.base.core.project.tools.DateTools;
  * 内容管理应用目录分类信息
  *
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AttendanceImportFileInfo.table, uniqueConstraints = @UniqueConstraint(name = PersistenceProperties.AttendanceImportFileInfo.table
 		+ JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceQywxDetail.java

@@ -9,7 +9,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 import javax.persistence.*;
 import java.util.Date;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AttendanceQywxDetail.table, uniqueConstraints = @UniqueConstraint(name = PersistenceProperties.AttendanceQywxDetail.table
         + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceScheduleSetting.java

@@ -15,7 +15,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AttendanceScheduleSetting.table, uniqueConstraints = @UniqueConstraint(name = PersistenceProperties.AttendanceScheduleSetting.table
 		+ JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceSelfHoliday.java

@@ -10,7 +10,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 import javax.persistence.*;
 import java.util.Date;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AttendanceSelfHoliday.table, uniqueConstraints = @UniqueConstraint(name = PersistenceProperties.AttendanceSelfHoliday.table
 		+ JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceSetting.java

@@ -16,7 +16,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AttendanceSetting.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.AttendanceSetting.table + JpaObject.IndexNameMiddle

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceStatisticRequireLog.java

@@ -21,7 +21,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AttendanceStatisticRequireLog.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.AttendanceStatisticRequireLog.table + JpaObject.IndexNameMiddle

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceStatisticalCycle.java

@@ -19,7 +19,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AttendanceStatisticalCycle.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.AttendanceStatisticalCycle.table + JpaObject.IndexNameMiddle

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceWorkDayConfig.java

@@ -14,7 +14,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AttendanceWorkDayConfig.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.AttendanceWorkDayConfig.table + JpaObject.IndexNameMiddle

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceWorkPlace.java

@@ -15,7 +15,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AttendanceWorkPlace.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.AttendanceWorkPlace.table + JpaObject.IndexNameMiddle

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/DingdingQywxSyncRecord.java

@@ -10,7 +10,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 import javax.persistence.*;
 import java.util.Date;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.DingdingQywxSyncRecord.table, uniqueConstraints = @UniqueConstraint(name = PersistenceProperties.DingdingQywxSyncRecord.table
         + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticDingdingPersonForMonth.java

@@ -8,7 +8,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 
 import javax.persistence.*;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.StatisticDingdingPersonForMonth.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.StatisticDingdingPersonForMonth.table + JpaObject.IndexNameMiddle

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticDingdingUnitForDay.java

@@ -8,7 +8,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 
 import javax.persistence.*;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.StatisticDingdingUnitForDay.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.StatisticDingdingUnitForDay.table + JpaObject.IndexNameMiddle

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticDingdingUnitForMonth.java

@@ -8,7 +8,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 
 import javax.persistence.*;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.StatisticDingdingUnitForMonth.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.StatisticDingdingUnitForMonth.table + JpaObject.IndexNameMiddle

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticPersonForMonth.java

@@ -17,7 +17,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.StatisticPersonForMonth.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.StatisticPersonForMonth.table + JpaObject.IndexNameMiddle

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticQywxPersonForMonth.java

@@ -8,7 +8,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 
 import javax.persistence.*;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.StatisticQywxPersonForMonth.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.StatisticQywxPersonForMonth.table + JpaObject.IndexNameMiddle

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticQywxUnitForDay.java

@@ -8,7 +8,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 
 import javax.persistence.*;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.StatisticQywxUnitForDay.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.StatisticQywxUnitForDay.table + JpaObject.IndexNameMiddle

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticQywxUnitForMonth.java

@@ -8,7 +8,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 
 import javax.persistence.*;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.StatisticQywxUnitForMonth.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.StatisticQywxUnitForMonth.table + JpaObject.IndexNameMiddle

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticTopUnitForDay.java

@@ -17,7 +17,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.StatisticTopUnitForDay.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.StatisticTopUnitForDay.table + JpaObject.IndexNameMiddle

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticTopUnitForMonth.java

@@ -17,7 +17,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.StatisticTopUnitForMonth.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.StatisticTopUnitForMonth.table + JpaObject.IndexNameMiddle

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticUnitForDay.java

@@ -17,7 +17,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.StatisticUnitForDay.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.StatisticUnitForDay.table + JpaObject.IndexNameMiddle

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticUnitForMonth.java

@@ -17,7 +17,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.StatisticUnitForMonth.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.StatisticUnitForMonth.table + JpaObject.IndexNameMiddle

o2server/x_base_core_project/src/main/java/com/x/base/core/entity/annotation/ContainerEntity.java

@@ -8,11 +8,38 @@ import java.lang.annotation.Target;
 /**
  * 用于标识Entity,由于@Entity标识可能扫描到其他的类,所以这里单独用一个标识,表示是自建的类,这样可以在scan 的时候区分
  * 
+ * 
  * @author zhour
+ * 
  *
  */
+
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+
 public @interface ContainerEntity {
 
+    /**
+     * 执行dump时分组数量
+     */
+    public int dumpSize() default 1000;
+
+    /**
+     * 类型
+     */
+    public Type type() default Type.content;
+
+    /**
+     * 引用,强数据,软数据(软数据不会影响系统运行)
+     */
+
+    public Reference reference() default Reference.strong;
+
+    public enum Type {
+        element, content, log, custom;
+    }
+
+    public enum Reference {
+        strong, soft;
+    }
 }

o2server/x_base_core_project/src/main/java/com/x/base/core/entity/dynamic/DynamicEntityBuilder.java

@@ -61,7 +61,10 @@ public class DynamicEntityBuilder {
 	public JavaFile build() throws Exception {
 
 		AnnotationSpec annotationSpec_entity = AnnotationSpec.builder(Entity.class).build();
-		AnnotationSpec annotationSpec_containerEntity = AnnotationSpec.builder(ContainerEntity.class).build();
+		AnnotationSpec annotationSpec_containerEntity = AnnotationSpec.builder(ContainerEntity.class)
+				.addMember("dumpSize", "500")
+				.addMember("type", "com.x.base.core.entity.annotation.ContainerEntity.Type.custom")
+				.addMember("reference", "com.x.base.core.entity.annotation.ContainerEntity.Reference.strong").build();
 		AnnotationSpec annotationSpec_table = AnnotationSpec.builder(Table.class)
 				.addMember("name", "\"" + dynamicEntity.tableName() + "\"")
 				.addMember("uniqueConstraints", "{@javax.persistence.UniqueConstraint(name = \""
@@ -119,16 +122,16 @@ public class DynamicEntityBuilder {
 	}
 
 	private void createIdField(Builder builder) {
-//		public String getId() {
-//			return id;
-//		}
-//		public void setId(String id) {
-//			this.id = id;
-//		}
-//		@FieldDescribe("数据库主键,自动生成.")
-//		@Id
-//		@Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME)
-//		private String id = createId();
+		// public String getId() {
+		// return id;
+		// }
+		// public void setId(String id) {
+		// this.id = id;
+		// }
+		// @FieldDescribe("数据库主键,自动生成.")
+		// @Id
+		// @Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME)
+		// private String id = createId();
 		AnnotationSpec fieldDescribe = AnnotationSpec.builder(FieldDescribe.class).addMember("value", "\"数据库主键,自动生成.\"")
 				.build();
 		AnnotationSpec id = AnnotationSpec.builder(Id.class).build();
@@ -174,12 +177,13 @@ public class DynamicEntityBuilder {
 	}
 
 	private void createField(Builder builder, Field field, Class<?> typeClass) {
-//		public static final String stringValue_FIELDNAME = "stringValue";
-//		@FieldDescribe("文本字段.")
-//		@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + stringValue_FIELDNAME)
-//		@Index(name = TABLE + IndexNameMiddle + stringValue_FIELDNAME)
-//		@CheckPersist(allowEmpty = true)
-//		private String stringValue;
+		// public static final String stringValue_FIELDNAME = "stringValue";
+		// @FieldDescribe("文本字段.")
+		// @Column(length = JpaObject.length_255B, name = ColumnNamePrefix +
+		// stringValue_FIELDNAME)
+		// @Index(name = TABLE + IndexNameMiddle + stringValue_FIELDNAME)
+		// @CheckPersist(allowEmpty = true)
+		// private String stringValue;
 		AnnotationSpec column = null;
 		if (typeClass == String.class) {
 			column = AnnotationSpec.builder(Column.class).addMember("length", "length_255B")
@@ -314,16 +318,20 @@ public class DynamicEntityBuilder {
 
 	private void createListFields(Builder builder, Field field, Class<?> typeClass) {
 
-//		public static final String groupList_FIELDNAME = "groupList";
-//		@FieldDescribe("群组的群组成员.存放群组 ID.")
-//		@ContainerTable(name = TABLE + ContainerTableNameMiddle + groupList_FIELDNAME, joinIndex = @Index(name = TABLE
-//				+ IndexNameMiddle + groupList_FIELDNAME + JoinIndexNameSuffix))
-//		@ElementIndex(name = TABLE + IndexNameMiddle + groupList_FIELDNAME + ElementIndexNameSuffix)
-//		@PersistentCollection(fetch = FetchType.EAGER)
-//		@OrderColumn(name =  ORDERCOLUMNCOLUMN)
-//		@ElementColumn(length = JpaObject.length_id, name = ColumnNamePrefix + groupList_FIELDNAME)
-//		@CheckPersist(allowEmpty = true, citationExists = @CitationExist(type = Group.class))
-//		private List<String> groupList;
+		// public static final String groupList_FIELDNAME = "groupList";
+		// @FieldDescribe("群组的群组成员.存放群组 ID.")
+		// @ContainerTable(name = TABLE + ContainerTableNameMiddle +
+		// groupList_FIELDNAME, joinIndex = @Index(name = TABLE
+		// + IndexNameMiddle + groupList_FIELDNAME + JoinIndexNameSuffix))
+		// @ElementIndex(name = TABLE + IndexNameMiddle + groupList_FIELDNAME +
+		// ElementIndexNameSuffix)
+		// @PersistentCollection(fetch = FetchType.EAGER)
+		// @OrderColumn(name = ORDERCOLUMNCOLUMN)
+		// @ElementColumn(length = JpaObject.length_id, name = ColumnNamePrefix +
+		// groupList_FIELDNAME)
+		// @CheckPersist(allowEmpty = true, citationExists = @CitationExist(type =
+		// Group.class))
+		// private List<String> groupList;
 
 		AnnotationSpec containerTable = AnnotationSpec.builder(ContainerTable.class)
 				.addMember("name", "TABLE + ContainerTableNameMiddle + " + field.fieldName())
@@ -375,11 +383,12 @@ public class DynamicEntityBuilder {
 
 	private void createStringLobField(Builder builder, Field field) {
 
-//		public static final String stringLobValue_FIELDNAME = "stringLobValue";
-//		@FieldDescribe("长文本.")
-//		@Lob
-//		@Basic(fetch = FetchType.EAGER)
-//		@Column(length = JpaObject.length_10M, name = ColumnNamePrefix + stringLobValue_FIELDNAME)
+		// public static final String stringLobValue_FIELDNAME = "stringLobValue";
+		// @FieldDescribe("长文本.")
+		// @Lob
+		// @Basic(fetch = FetchType.EAGER)
+		// @Column(length = JpaObject.length_10M, name = ColumnNamePrefix +
+		// stringLobValue_FIELDNAME)
 
 		AnnotationSpec lob = AnnotationSpec.builder(Lob.class).build();
 
@@ -410,15 +419,20 @@ public class DynamicEntityBuilder {
 
 	private void createStringMapField(Builder builder, Field field) {
 
-//		@FieldDescribe("Map类型.")
-//		@CheckPersist(allowEmpty = true)
-//		@PersistentMap(fetch = FetchType.EAGER, elementType = String.class, keyType = String.class)
-//		@ContainerTable(name = TABLE + ContainerTableNameMiddle + mapValueMap_FIELDNAME, joinIndex = @Index(name = TABLE
-//				+ IndexNameMiddle + mapValueMap_FIELDNAME + JoinIndexNameSuffix))
-//		@KeyColumn(name = ColumnNamePrefix + key_FIELDNAME)
-//		@ElementColumn(length = length_255B, name = ColumnNamePrefix + mapValueMap_FIELDNAME)
-//		@ElementIndex(name = TABLE + IndexNameMiddle + mapValueMap_FIELDNAME + ElementIndexNameSuffix)
-//		@KeyIndex(name = TABLE + IndexNameMiddle + mapValueMap_FIELDNAME + KeyIndexNameSuffix)
+		// @FieldDescribe("Map类型.")
+		// @CheckPersist(allowEmpty = true)
+		// @PersistentMap(fetch = FetchType.EAGER, elementType = String.class, keyType =
+		// String.class)
+		// @ContainerTable(name = TABLE + ContainerTableNameMiddle +
+		// mapValueMap_FIELDNAME, joinIndex = @Index(name = TABLE
+		// + IndexNameMiddle + mapValueMap_FIELDNAME + JoinIndexNameSuffix))
+		// @KeyColumn(name = ColumnNamePrefix + key_FIELDNAME)
+		// @ElementColumn(length = length_255B, name = ColumnNamePrefix +
+		// mapValueMap_FIELDNAME)
+		// @ElementIndex(name = TABLE + IndexNameMiddle + mapValueMap_FIELDNAME +
+		// ElementIndexNameSuffix)
+		// @KeyIndex(name = TABLE + IndexNameMiddle + mapValueMap_FIELDNAME +
+		// KeyIndexNameSuffix)
 
 		AnnotationSpec persistentMap = AnnotationSpec.builder(PersistentMap.class)
 				.addMember("fetch", " javax.persistence.FetchType.EAGER").addMember("elementType", "String.class")

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/DumpRestoreData.java

@@ -4,23 +4,29 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.tools.ListTools;
 
 public class DumpRestoreData extends ConfigObject {
 
+	public static String TYPE_FULL = "full";
+	public static String TYPE_LITE = "lite";
+
 	public static DumpRestoreData defaultInstance() {
 		return new DumpRestoreData();
 	}
 
 	public static final int default_batchSize = 1000;
+	public static final String default_type = TYPE_LITE;
 
 	public DumpRestoreData() {
 		this.enable = false;
 		this.includes = new ArrayList<String>();
 		this.excludes = new ArrayList<String>();
 		this.batchSize = default_batchSize;
+		this.mode = default_type;
 	}
 
 	@FieldDescribe("是否启用.")
@@ -35,6 +41,13 @@ public class DumpRestoreData extends ConfigObject {
 	@FieldDescribe("批量对象数量.")
 	private Integer batchSize;
 
+	@FieldDescribe("导出数据模式,lite|full,默认使用lite")
+	private String mode;
+
+	public String getMode() {
+		return StringUtils.equals(TYPE_FULL, mode) ? TYPE_FULL : TYPE_LITE;
+	}
+
 	public Boolean getEnable() {
 		return BooleanUtils.isTrue(this.enable);
 	}
@@ -78,4 +91,8 @@ public class DumpRestoreData extends ConfigObject {
 		this.enable = enable;
 	}
 
+	public void setMode(String mode) {
+		this.mode = mode;
+	}
+
 }

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSConfigSetting.java

@@ -21,7 +21,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 
  * @author LIYI
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSConfigSetting.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSConfigSetting.table + JpaObject.IndexNameMiddle
@@ -47,6 +47,7 @@ public class BBSConfigSetting extends SliceJpaObject {
 	private String id = createId();
 
 	public void onPersist() throws Exception {
+		//nothing
 	}
 	/*
 	 * =========================================================================

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSForumInfo.java

@@ -21,7 +21,7 @@ import java.util.List;
  * 
  * @author LIYI
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSForumInfo.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSForumInfo.table + JpaObject.IndexNameMiddle
@@ -47,6 +47,7 @@ public class BBSForumInfo extends SliceJpaObject {
 	private String id = createId();
 
 	public void onPersist() throws Exception {
+		// nothing
 	}
 	/*
 	 * =============================================================================
@@ -460,13 +461,21 @@ public class BBSForumInfo extends SliceJpaObject {
 		this.typeCategory = typeCategory;
 	}
 
-	public Boolean getReplyMessageNotify() { return this.replyMessageNotify== null ? false : this.replyMessageNotify; }
+	public Boolean getReplyMessageNotify() {
+		return this.replyMessageNotify == null ? false : this.replyMessageNotify;
+	}
 
-	public void setReplyMessageNotify(final Boolean replyMessageNotify) { this.replyMessageNotify = replyMessageNotify; }
+	public void setReplyMessageNotify(final Boolean replyMessageNotify) {
+		this.replyMessageNotify = replyMessageNotify;
+	}
 
-	public String getReplyMessageNotifyType() { return this.replyMessageNotifyType == null ? "0,0,0" : this.replyMessageNotifyType; }
+	public String getReplyMessageNotifyType() {
+		return this.replyMessageNotifyType == null ? "0,0,0" : this.replyMessageNotifyType;
+	}
 
-	public void setReplyMessageNotifyType(final String replyMessageNotifyType) { this.replyMessageNotifyType = replyMessageNotifyType; }
+	public void setReplyMessageNotifyType(final String replyMessageNotifyType) {
+		this.replyMessageNotifyType = replyMessageNotifyType;
+	}
 
 	public Boolean getSubjectMessageNotify() {
 		return this.subjectMessageNotify == null ? false : this.subjectMessageNotify;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSOperationRecord.java

@@ -21,7 +21,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 
  * @author LIYI
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSOperationRecord.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSOperationRecord.table + JpaObject.IndexNameMiddle

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSPermissionInfo.java

@@ -21,7 +21,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 
  * @author LIYI
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSPermissionInfo.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSPermissionInfo.table + JpaObject.IndexNameMiddle

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSPermissionRole.java

@@ -21,7 +21,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 
  * @author LIYI
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSPermissionRole.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSPermissionRole.table + JpaObject.IndexNameMiddle

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSReplyInfo.java

@@ -24,7 +24,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 
  * @author LIYI
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSReplyInfo.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSReplyInfo.table + JpaObject.IndexNameMiddle

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSRoleInfo.java

@@ -21,7 +21,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 
  * @author LIYI
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSRoleInfo.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSRoleInfo.table + JpaObject.IndexNameMiddle

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSSectionInfo.java

@@ -20,7 +20,7 @@ import java.util.List;
  * 
  * @author LIYI
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSSectionInfo.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSSectionInfo.table + JpaObject.IndexNameMiddle

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSSubjectAttachment.java

@@ -29,7 +29,7 @@ import com.x.base.core.project.tools.DateTools;
 /**
  * 附件信息管理表
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSSubjectAttachment.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSSubjectAttachment.table + JpaObject.IndexNameMiddle

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSSubjectContent.java

@@ -22,7 +22,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 
  * @author LIYI
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSSubjectContent.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSSubjectContent.table + JpaObject.IndexNameMiddle

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSSubjectInfo.java

@@ -33,7 +33,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 
  * @author LIYI
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSSubjectInfo.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSSubjectInfo.table + JpaObject.IndexNameMiddle

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSSubjectVoteResult.java

@@ -24,7 +24,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 
  * @author LIYI
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSSubjectVoteResult.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSSubjectVoteResult.table + JpaObject.IndexNameMiddle

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSUserInfo.java

@@ -28,7 +28,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 
  * @author LIYI
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSUserInfo.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSUserInfo.table + JpaObject.IndexNameMiddle

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSUserRole.java

@@ -21,7 +21,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 
  * @author LIYI
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSUserRole.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSUserRole.table + JpaObject.IndexNameMiddle

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSVoteOption.java

@@ -21,7 +21,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 
  * @author LIYI
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSVoteOption.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSVoteOption.table + JpaObject.IndexNameMiddle

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSVoteOptionGroup.java

@@ -21,7 +21,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 
  * @author LIYI
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSVoteOptionGroup.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSVoteOptionGroup.table + JpaObject.IndexNameMiddle

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSVoteRecord.java

@@ -21,7 +21,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 
  * @author LIYI
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.BBSVoteRecord.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.BBSVoteRecord.table + JpaObject.IndexNameMiddle

o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar.java

@@ -33,7 +33,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * @author O2LEE
  *
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Calendar.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Calendar.table + JpaObject.IndexNameMiddle

o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar_Event.java

@@ -43,7 +43,7 @@ import net.fortuna.ical4j.model.property.ExDate;
  *
  */
 @SuppressWarnings("rawtypes")
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Calendar_Event.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Calendar_Event.table + JpaObject.IndexNameMiddle

o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar_EventComment.java

@@ -16,7 +16,7 @@ import java.util.Date;
  * @author O2LEE
  *
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Calendar_EventComment.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Calendar_EventComment.table + JpaObject.IndexNameMiddle

o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar_EventRepeatMaster.java

@@ -50,7 +50,7 @@ import net.fortuna.ical4j.model.property.ExDate;
  *
  */
 @SuppressWarnings("rawtypes")
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Calendar_EventRepeatMaster.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Calendar_EventRepeatMaster.table + JpaObject.IndexNameMiddle

o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar_Setting.java

@@ -24,7 +24,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * @author O2LEE
  *
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Calendar_Setting.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Calendar_Setting.table + JpaObject.IndexNameMiddle

o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar_SettingLobValue.java

@@ -24,7 +24,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * @author O2LEE
  *
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Calendar_SettingLobValue.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Calendar_SettingLobValue.table + JpaObject.IndexNameMiddle

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/timertask/Timertask_BatchOperationTask.java

@@ -51,7 +51,7 @@ public class Timertask_BatchOperationTask extends AbstractJob {
 				}
 			} else {
 				logger.info(
-						"Timertask_BatchOperationTask -> not fount any cms batch operation, try to check unreview document in database......");
+						"Timertask_BatchOperationTask -> not found any cms batch operation, try to check unreview document in database......");
 				// 如果队列里已经没有任务了，那么检查一下是否还有未revieiw的文档，添加到队列
 				DocumentInfoService documentInfoService = new DocumentInfoService();
 				try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/AppInfo.java

@@ -24,7 +24,7 @@ import java.util.List;
  * @author O2LEE
  *
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AppInfo.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.AppInfo.table + JpaObject.IndexNameMiddle

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/AppInfoConfig.java

@@ -14,7 +14,7 @@ import javax.persistence.*;
  * @author O2LEE
  *
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.AppInfoConfig.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.AppInfoConfig.table + JpaObject.IndexNameMiddle

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/CategoryExt.java

@@ -20,7 +20,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 内容管理应用目录分类扩展信息
  *
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.CategoryExt.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.CategoryExt.table + JpaObject.IndexNameMiddle

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/CategoryInfo.java

@@ -36,7 +36,7 @@ import com.x.base.core.project.tools.ListTools;
  * @author O2LEE
  *
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.CategoryInfo.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.CategoryInfo.table + JpaObject.IndexNameMiddle

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/CmsBatchOperation.java

@@ -18,7 +18,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 数据指处理，比如修改栏目名称引起的所有分类 和文档别名需要修改
  */
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.CmsBatchOperation.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.CmsBatchOperation.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Document.java

@@ -37,7 +37,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  *
  */
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.Document.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Document.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/DocumentCommend.java

@@ -22,7 +22,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * @author O2LEE
  *
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.DocumentCommend.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.DocumentCommend.table + JpaObject.IndexNameMiddle

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/DocumentCommentCommend.java

@@ -22,7 +22,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * @author O2LEE
  *
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.DocumentCommentCommend.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.DocumentCommentCommend.table + JpaObject.IndexNameMiddle

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/DocumentCommentContent.java

@@ -20,7 +20,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 /**
  * 信息评论内容表
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.DocumentCommentContent.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.DocumentCommentContent.table + JpaObject.IndexNameMiddle

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/DocumentCommentInfo.java

@@ -19,7 +19,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 /**
  * 信息评论表
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.DocumentCommentInfo.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.DocumentCommentInfo.table + JpaObject.IndexNameMiddle

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/DocumentViewRecord.java

@@ -24,7 +24,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 内容管理日志信息表
  *
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.DocumentViewRecord.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.DocumentViewRecord.table + JpaObject.IndexNameMiddle

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/FileInfo.java

@@ -39,7 +39,7 @@ import com.x.base.core.project.tools.DateTools;
  * 内容管理应用目录分类信息
  *
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.FileInfo.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.FileInfo.table + JpaObject.IndexNameMiddle

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Log.java

@@ -20,7 +20,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * 内容管理日志信息表
  *
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Log.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Log.table + JpaObject.IndexNameMiddle

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/ReadRemind.java

@@ -28,7 +28,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  *
  */
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.ReadRemind.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.ReadRemind.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Review.java

@@ -23,7 +23,7 @@ import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.Review.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Review.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/AppDict.java

@@ -22,7 +22,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.cms.core.entity.AppInfo;
 import com.x.cms.core.entity.PersistenceProperties;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Element.AppDict.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Element.AppDict.table + JpaObject.IndexNameMiddle

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/AppDictItem.java

@@ -36,7 +36,7 @@ import com.x.cms.core.entity.AppInfo;
 import com.x.cms.core.entity.PersistenceProperties;
 
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.Element.AppDictItem.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Element.AppDictItem.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/File.java

@@ -39,7 +39,7 @@ import com.x.cms.core.entity.PersistenceProperties;
  *
  */
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.Element.File.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Element.File.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/Form.java

@@ -25,7 +25,7 @@ import com.x.cms.core.entity.AppInfo;
 import com.x.cms.core.entity.PersistenceProperties;
 
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.Element.Form.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Element.Form.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/FormField.java

@@ -21,7 +21,7 @@ import com.x.cms.core.entity.AppInfo;
 import com.x.cms.core.entity.PersistenceProperties;
 
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.Element.FormField.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Element.FormField.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/QueryView.java

@@ -33,7 +33,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.cms.core.entity.PersistenceProperties;
 
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.Element.QueryView.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Element.QueryView.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/Script.java

@@ -36,7 +36,7 @@ import com.x.cms.core.entity.AppInfo;
 import com.x.cms.core.entity.PersistenceProperties;
 
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.Element.Script.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Element.Script.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/TemplateForm.java

@@ -24,7 +24,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.cms.core.entity.PersistenceProperties;
 
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.Element.TemplateForm.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Element.TemplateForm.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/View.java

@@ -34,7 +34,7 @@ import com.x.cms.core.entity.AppInfo;
 import com.x.cms.core.entity.PersistenceProperties;
 
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.Element.View.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Element.View.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/ViewCategory.java

@@ -20,7 +20,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.cms.core.entity.PersistenceProperties;
 
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.Element.ViewCategory.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Element.ViewCategory.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/ViewFieldConfig.java

@@ -20,7 +20,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.cms.core.entity.PersistenceProperties;
 
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.Element.ViewFieldConfig.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Element.ViewFieldConfig.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_component_assemble_control/src/main/webapp/describe/sources/com/x/component/assemble/control/jaxrs/component/ActionEdit.java

@@ -1,5 +1,7 @@
 package com.x.component.assemble.control.jaxrs.component;
 
+import java.util.List;
+
 import com.google.gson.JsonElement;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
@@ -8,6 +10,7 @@ import com.x.base.core.entity.annotation.CheckPersistType;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.config.Config;
 import com.x.base.core.project.exception.ExceptionAccessDenied;
 import com.x.base.core.project.exception.ExceptionEntityNotExist;
 import com.x.base.core.project.http.ActionResult;
@@ -32,6 +35,13 @@ class ActionEdit extends ActionBase {
 				throw new ExceptionEntityNotExist(flag, Component.class);
 			}
 			Wi.copier.copy(wi, component);
+			List<String> names = ListTools.extractProperty(Config.components().getSystems(), "name", String.class, true,
+					true);
+			if (ListTools.contains(names, component.getName())) {
+				component.setType(Component.TYPE_SYSTEM);
+			} else {
+				component.setType(Component.TYPE_CUSTOM);
+			}
 			emc.beginTransaction(Component.class);
 			emc.persist(component, CheckPersistType.all);
 			emc.commit();

o2server/x_component_core_entity/src/main/java/com/x/component/core/entity/Component.java

@@ -27,7 +27,7 @@ import org.apache.openjpa.persistence.jdbc.ElementColumn;
 import org.apache.openjpa.persistence.jdbc.ElementIndex;
 import org.apache.openjpa.persistence.jdbc.Index;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Component.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Component.table + JpaObject.IndexNameMiddle

o2server/x_console/src/main/java/com/x/server/console/action/DumpData.java

@@ -1,9 +1,12 @@
 package com.x.server.console.action;
 
 import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
@@ -20,7 +23,10 @@ import org.apache.openjpa.persistence.OpenJPAPersistence;
 import com.google.gson.Gson;
 import com.x.base.core.container.factory.PersistenceXmlHelper;
 import com.x.base.core.entity.JpaObject;
+import com.x.base.core.entity.annotation.ContainerEntity;
+import com.x.base.core.entity.annotation.ContainerEntity.Reference;
 import com.x.base.core.project.config.Config;
+import com.x.base.core.project.config.DumpRestoreData;
 import com.x.base.core.project.gson.XGsonBuilder;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
@@ -40,6 +46,7 @@ public class DumpData {
 
 	private Gson pureGsonDateFormated = XGsonBuilder.instance();
 
+	@SuppressWarnings("unchecked")
 	public boolean execute(String path) throws Exception {
 		if (StringUtils.isEmpty(path)) {
 			this.dir = new File(Config.base(), "local/dump/dumpData_" + DateTools.compact(this.start));
@@ -56,8 +63,9 @@ public class DumpData {
 
 		/* 初始化完成 */
 
-		List<String> containerEntityNames = new ArrayList<>();
-		containerEntityNames.addAll((List<String>) Config.resource(Config.RESOURCE_CONTAINERENTITYNAMES));
+		List<String> containerEntityNames = this.entities();
+
+		/** 过滤include exclude 条件 */
 		List<String> classNames = ListTools.includesExcludesWildcard(containerEntityNames,
 				Config.dumpRestoreData().getIncludes(), Config.dumpRestoreData().getExcludes());
 		logger.print("dump data find {} data to dump, start at {}.", classNames.size(), DateTools.format(start));
@@ -65,18 +73,17 @@ public class DumpData {
 		PersistenceXmlHelper.write(persistence.getAbsolutePath(), classNames);
 		for (int i = 0; i < classNames.size(); i++) {
 			Class<JpaObject> cls = (Class<JpaObject>) Class.forName(classNames.get(i));
-				EntityManagerFactory emf = OpenJPAPersistence.createEntityManagerFactory(cls.getName(),
-						persistence.getName(),
-						PersistenceXmlHelper.properties(cls.getName(), Config.slice().getEnable()));
-				EntityManager em = emf.createEntityManager();
-				try {
-					logger.print("dump data({}/{}): {}, count: {}.", (i + 1), classNames.size(), cls.getName(),
-							this.estimateCount(em, cls));
-					this.dump(cls, em);
-				} finally {
-					em.close();
-					emf.close();
-				}
+			EntityManagerFactory emf = OpenJPAPersistence.createEntityManagerFactory(cls.getName(),
+					persistence.getName(), PersistenceXmlHelper.properties(cls.getName(), Config.slice().getEnable()));
+			EntityManager em = emf.createEntityManager();
+			try {
+				logger.print("dump data({}/{}): {}, count: {}.", (i + 1), classNames.size(), cls.getName(),
+						this.estimateCount(em, cls));
+				this.dump(cls, em);
+			} finally {
+				em.close();
+				emf.close();
+			}
 		}
 		FileUtils.write(new File(dir, "catalog.json"), pureGsonDateFormated.toJson(this.catalog),
 				DefaultCharset.charset);
@@ -97,17 +104,18 @@ public class DumpData {
 		return this.catalog.values().stream().mapToInt(Integer::intValue).sum();
 	}
 
-	private <T> void dump(Class<T> cls, EntityManager em) throws Exception {
+	private <T> void dump(Class<T> cls, EntityManager em)
+			throws IOException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
 		/** 创建最终存储文件的目录 */
 		File directory = new File(dir, cls.getName());
 		FileUtils.forceMkdir(directory);
 		FileUtils.cleanDirectory(directory);
-		int count = 0;
-		int size = Config.dumpRestoreData().getBatchSize();
+		ContainerEntity containerEntity = cls.getAnnotation(ContainerEntity.class);
 		String id = "";
 		List<T> list = null;
+		int count = 0;
 		do {
-			list = this.list(em, cls, id, size);
+			list = this.list(em, cls, id, containerEntity.dumpSize());
 			if (ListTools.isNotEmpty(list)) {
 				count = count + list.size();
 				id = BeanUtils.getProperty(list.get(list.size() - 1), JpaObject.id_FIELDNAME);
@@ -115,7 +123,6 @@ public class DumpData {
 				FileUtils.write(file, pureGsonDateFormated.toJson(list), DefaultCharset.charset);
 			}
 			em.clear();
-			Runtime.getRuntime().gc();
 		} while (ListTools.isNotEmpty(list));
 		this.catalog.put(cls.getName(), count);
 	}
@@ -132,4 +139,26 @@ public class DumpData {
 		return em.createQuery(cq).setMaxResults(size).getResultList();
 	}
 
+	/**
+	 * 根据设置的模式不同输出需要dump的entity className
+	 * 
+	 * @return
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	private List<String> entities() throws Exception {
+		List<String> list = new ArrayList<>();
+		if (StringUtils.equals(Config.dumpRestoreData().getMode(), DumpRestoreData.TYPE_FULL)) {
+			list.addAll((List<String>) Config.resource(Config.RESOURCE_CONTAINERENTITYNAMES));
+			return list;
+		}
+		for (String str : (List<String>) Config.resource(Config.RESOURCE_CONTAINERENTITYNAMES)) {
+			Class<?> cls = Class.forName(str);
+			ContainerEntity containerEntity = cls.getAnnotation(ContainerEntity.class);
+			if (Objects.equals(containerEntity.reference(), Reference.strong)) {
+				list.add(str);
+			}
+		}
+		return list;
+	}
 }

o2server/x_console/src/main/java/com/x/server/console/action/EraseContentBbs.java

@@ -1,9 +1,6 @@
 package com.x.server.console.action;
 
-import org.apache.commons.lang3.StringUtils;
-
 import com.x.base.core.entity.dataitem.ItemCategory;
-import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.bbs.entity.BBSOperationRecord;

o2server/x_console/src/main/java/com/x/server/console/action/ThreadDump.java

@@ -8,9 +8,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import com.google.gson.Gson;
 import com.x.base.core.project.config.Config;
-import com.x.base.core.project.gson.XGsonBuilder;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.tools.DateTools;

o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/open/File.java

@@ -37,7 +37,7 @@ import com.x.file.core.entity.PersistenceProperties;
  *
  */
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.Open.File.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Open.File.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/open/OriginFile.java

@@ -16,7 +16,7 @@ import org.apache.openjpa.persistence.jdbc.Index;
 import javax.persistence.*;
 import java.util.Date;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Open.OriginFile.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Open.OriginFile.table + JpaObject.IndexNameMiddle

o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/personal/Attachment.java

@@ -36,7 +36,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.tools.DateTools;
 import com.x.file.core.entity.PersistenceProperties;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Personal.Attachment.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Personal.Attachment.table + JpaObject.IndexNameMiddle

o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/personal/Attachment2.java

@@ -25,7 +25,7 @@ import com.x.base.core.entity.annotation.Equal;
 import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.file.core.entity.PersistenceProperties;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Personal.Attachment2.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Personal.Attachment2.table + JpaObject.IndexNameMiddle

o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/personal/Folder.java

@@ -23,7 +23,7 @@ import com.x.base.core.entity.annotation.Equal;
 import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.file.core.entity.PersistenceProperties;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Personal.Folder.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Personal.Folder.table + JpaObject.IndexNameMiddle

o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/personal/Folder2.java

@@ -22,7 +22,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.file.core.entity.PersistenceProperties;
 import java.util.Date;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Personal.Folder2.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Personal.Folder2.table + JpaObject.IndexNameMiddle

o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/personal/Recycle.java

@@ -20,7 +20,7 @@ import javax.persistence.*;
 import java.util.Date;
 import java.util.List;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Personal.Recycle.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Personal.Recycle.table + JpaObject.IndexNameMiddle

o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/personal/Share.java

@@ -20,7 +20,7 @@ import javax.persistence.*;
 import java.util.Date;
 import java.util.List;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Personal.Share.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Personal.Share.table + JpaObject.IndexNameMiddle

o2server/x_general_core_entity/src/main/java/com/x/general/core/entity/area/District.java

@@ -17,7 +17,7 @@ import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.general.core.entity.PersistenceProperties;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.element, reference = ContainerEntity.Reference.soft)
 @Entity
 @Table(name = PersistenceProperties.Area.District.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Area.District.table + JpaObject.IndexNameMiddle

o2server/x_hotpic_core_entity/src/main/java/com/x/hotpic/entity/HotPictureInfo.java

@@ -14,7 +14,7 @@ import javax.persistence.*;
  * 
  * @author O2LEE
  */
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.HotPictureInfo.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.HotPictureInfo.table + JpaObject.IndexNameMiddle

o2server/x_jpush_core_entity/src/main/java/com/x/jpush/core/entity/SampleEntityClassName.java

@@ -20,7 +20,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
 import com.x.base.core.entity.annotation.ContainerEntity;
 import com.x.base.core.project.annotation.FieldDescribe;
 
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.SampleEntityClassName.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.SampleEntityClassName.table + JpaObject.IndexNameMiddle