Zhou Rui 5 лет назад
Родитель
Сommit
d65030a716
100 измененных файлов с 296 добавлено и 101 удалено
  1. 148 0
      o2server/start_windows_visualjvm.bat
  2. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceAdmin.java
  3. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceAppealInfo.java
  4. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceDetail.java
  5. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceDetailMobile.java
  6. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceDingtalkDetail.java
  7. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceEmployeeConfig.java
  8. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceImportFileInfo.java
  9. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceQywxDetail.java
  10. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceScheduleSetting.java
  11. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceSelfHoliday.java
  12. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceSetting.java
  13. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceStatisticRequireLog.java
  14. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceStatisticalCycle.java
  15. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceWorkDayConfig.java
  16. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceWorkPlace.java
  17. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/DingdingQywxSyncRecord.java
  18. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticDingdingPersonForMonth.java
  19. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticDingdingUnitForDay.java
  20. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticDingdingUnitForMonth.java
  21. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticPersonForMonth.java
  22. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticQywxPersonForMonth.java
  23. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticQywxUnitForDay.java
  24. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticQywxUnitForMonth.java
  25. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticTopUnitForDay.java
  26. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticTopUnitForMonth.java
  27. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticUnitForDay.java
  28. 1 1
      o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticUnitForMonth.java
  29. 27 0
      o2server/x_base_core_project/src/main/java/com/x/base/core/entity/annotation/ContainerEntity.java
  30. 2 1
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSConfigSetting.java
  31. 14 5
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSForumInfo.java
  32. 1 1
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSOperationRecord.java
  33. 1 1
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSPermissionInfo.java
  34. 1 1
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSPermissionRole.java
  35. 1 1
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSReplyInfo.java
  36. 1 1
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSRoleInfo.java
  37. 1 1
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSSectionInfo.java
  38. 1 1
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSSubjectAttachment.java
  39. 1 1
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSSubjectContent.java
  40. 1 1
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSSubjectInfo.java
  41. 1 1
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSSubjectVoteResult.java
  42. 1 1
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSUserInfo.java
  43. 1 1
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSUserRole.java
  44. 1 1
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSVoteOption.java
  45. 1 1
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSVoteOptionGroup.java
  46. 1 1
      o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSVoteRecord.java
  47. 1 1
      o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar.java
  48. 1 1
      o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar_Event.java
  49. 1 1
      o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar_EventComment.java
  50. 1 1
      o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar_EventRepeatMaster.java
  51. 1 1
      o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar_Setting.java
  52. 1 1
      o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar_SettingLobValue.java
  53. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/AppInfo.java
  54. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/AppInfoConfig.java
  55. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/CategoryExt.java
  56. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/CategoryInfo.java
  57. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/CmsBatchOperation.java
  58. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Document.java
  59. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/DocumentCommend.java
  60. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/DocumentCommentCommend.java
  61. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/DocumentCommentContent.java
  62. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/DocumentCommentInfo.java
  63. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/DocumentViewRecord.java
  64. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/FileInfo.java
  65. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Log.java
  66. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/ReadRemind.java
  67. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Review.java
  68. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/AppDict.java
  69. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/AppDictItem.java
  70. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/File.java
  71. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/Form.java
  72. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/FormField.java
  73. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/QueryView.java
  74. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/Script.java
  75. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/TemplateForm.java
  76. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/View.java
  77. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/ViewCategory.java
  78. 1 1
      o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/ViewFieldConfig.java
  79. 10 0
      o2server/x_component_assemble_control/src/main/webapp/describe/sources/com/x/component/assemble/control/jaxrs/component/ActionEdit.java
  80. 1 1
      o2server/x_component_core_entity/src/main/java/com/x/component/core/entity/Component.java
  81. 1 1
      o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/open/File.java
  82. 1 1
      o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/open/OriginFile.java
  83. 1 1
      o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/personal/Attachment.java
  84. 1 1
      o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/personal/Attachment2.java
  85. 1 1
      o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/personal/Folder.java
  86. 1 1
      o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/personal/Folder2.java
  87. 1 1
      o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/personal/Recycle.java
  88. 1 1
      o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/personal/Share.java
  89. 1 1
      o2server/x_general_core_entity/src/main/java/com/x/general/core/entity/area/District.java
  90. 1 1
      o2server/x_hotpic_core_entity/src/main/java/com/x/hotpic/entity/HotPictureInfo.java
  91. 1 1
      o2server/x_jpush_core_entity/src/main/java/com/x/jpush/core/entity/SampleEntityClassName.java
  92. 1 1
      o2server/x_meeting_core_entity/src/main/java/com/x/meeting/core/entity/Attachment.java
  93. 1 1
      o2server/x_meeting_core_entity/src/main/java/com/x/meeting/core/entity/Building.java
  94. 1 1
      o2server/x_meeting_core_entity/src/main/java/com/x/meeting/core/entity/Meeting.java
  95. 1 1
      o2server/x_meeting_core_entity/src/main/java/com/x/meeting/core/entity/Room.java
  96. 1 1
      o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/IMConversation.java
  97. 1 1
      o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/IMConversationExt.java
  98. 1 1
      o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/IMMsg.java
  99. 1 1
      o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/Instant.java
  100. 1 1
      o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/Mass.java

+ 148 - 0
o2server/start_windows_visualjvm.bat

@@ -0,0 +1,148 @@
+@echo off
+if exist "%~dp0local\update" (
+	if not exist "%~dp0commons" (
+		mkdir "%~dp0commons"
+	)
+	if not exist "%~dp0config" (
+		mkdir "%~dp0config"
+	)
+	if not exist "%~dp0configSample" (
+		mkdir "%~dp0configSample"
+	)
+	if not exist "%~dp0local" (
+		mkdir "%~dp0local"
+	)
+	if not exist "%~dp0localSample" (
+		mkdir "%~dp0localSample"
+	)
+	if not exist "%~dp0jvm" (
+		mkdir "%~dp0jvm"
+	)
+	if not exist "%~dp0servers" (
+		mkdir "%~dp0servers"
+	)
+	if not exist "%~dp0store" (
+		mkdir "%~dp0store"
+	)
+	if exist "%~dp0local\update\o2server\version.o2" (
+		if exist "%~dp0local\update\o2server\commons" (
+			xcopy "%~dp0local\update\o2server\commons" "%~dp0commons" /S /Y /Q
+		)
+		if exist "%~dp0local\update\o2server\configSample" (
+			xcopy "%~dp0local\update\o2server\configSample" "%~dp0configSample" /S /Y /Q	
+		)
+		if exist "%~dp0local\update\o2server\localSample" (
+			xcopy "%~dp0local\update\o2server\localSample" "%~dp0localSample" /S /Y /Q	
+		)
+		if exist "%~dp0local\update\o2server\jvm" (
+			xcopy "%~dp0local\update\o2server\jvm" "%~dp0jvm" /S /Y /Q
+		)
+		if exist "%~dp0local\update\o2server\servers" (
+			xcopy "%~dp0local\update\o2server\servers" "%~dp0servers" /S /Y /Q
+		)
+		if exist "%~dp0local\update\o2server\store" (
+			xcopy "%~dp0local\update\o2server\store" "%~dp0store" /S /Y /Q
+		)
+		if exist "%~dp0local\update\o2server\console.jar" (
+			copy "%~dp0local\update\o2server\console.jar" "%~dp0"
+		)
+		if exist "%~dp0local\update\o2server\index.html" (
+			copy "%~dp0local\update\o2server\index.html" "%~dp0"
+		)
+		if exist "%~dp0local\update\o2server\src.zip" (
+			copy "%~dp0local\update\o2server\src.zip" "%~dp0"
+		)
+		if exist "%~dp0start_windows.bat" (
+			copy "%~dp0local\update\o2server\start_windows.bat" "%~dp0"
+		)
+		if exist "%~dp0start_windows_debug.bat" (
+			copy "%~dp0local\update\o2server\start_windows_debug.bat" "%~dp0"
+		)
+		if exist "%~dp0stop_windows.bat" (
+			copy "%~dp0local\update\o2server\stop_windows.bat" "%~dp0"
+		)
+		if exist "%~dp0console_windows.bat" (
+			copy "%~dp0local\update\o2server\console_windows.bat" "%~dp0"
+		)
+		if exist "%~dp0service_windows.bat" (
+			copy "%~dp0local\update\o2server\service_windows.bat" "%~dp0"
+		)
+		if exist "%~dp0start_linux.sh" (
+			copy "%~dp0local\update\o2server\start_linux.sh" "%~dp0"
+		)
+		if exist "%~dp0start_linux_debug.sh" (
+			copy "%~dp0local\update\o2server\start_linux_debug.sh" "%~dp0"
+		)
+		if exist "%~dp0stop_linux.sh" (
+			copy "%~dp0local\update\o2server\stop_linux.sh" "%~dp0"
+		)
+		if exist "%~dp0console_linux.sh" (
+			copy "%~dp0local\update\o2server\console_linux.sh" "%~dp0"
+		)
+		if exist "%~dp0start_macos.sh" (
+			copy "%~dp0local\update\o2server\start_macos.sh" "%~dp0"
+		)
+		if exist "%~dp0start_macos_debug.sh" (
+			copy "%~dp0local\update\o2server\start_macos_debug.sh" "%~dp0"
+		)
+		if exist "%~dp0stop_macos.sh" (
+			copy "%~dp0local\update\o2server\stop_macos.sh" "%~dp0"
+		)
+		if exist "%~dp0console_macos.sh" (
+			copy "%~dp0local\update\o2server\console_macos.sh" "%~dp0"
+		)
+		if exist "%~dp0start_aix.sh" (
+			copy "%~dp0local\update\o2server\start_aix.sh" "%~dp0"
+		)
+		if exist "%~dp0start_aix_debug.sh" (
+			copy "%~dp0local\update\o2server\start_aix_debug.sh" "%~dp0"
+		)
+		if exist "%~dp0stop_aix.sh" (
+			copy "%~dp0local\update\o2server\stop_aix.sh" "%~dp0"
+		)
+		if exist "%~dp0console_aix.sh" (
+			copy "%~dp0local\update\o2server\console_aix.sh" "%~dp0"
+		)
+		if exist "%~dp0start_raspberrypi.sh" (
+			copy "%~dp0local\update\o2server\start_raspberrypi.sh" "%~dp0"
+		)
+		if exist "%~dp0start_raspberrypi_debug.sh" (
+			copy "%~dp0local\update\o2server\start_raspberrypi_debug.sh" "%~dp0"
+		)
+		if exist "%~dp0stop_raspberrypi.sh" (
+			copy "%~dp0local\update\o2server\stop_raspberrypi.sh" "%~dp0"
+		)
+		if exist "%~dp0console_raspberrypi.sh" (
+			copy "%~dp0local\update\o2server\console_raspberrypi.sh" "%~dp0"
+		)
+		if exist "%~dp0start_risc.sh" (
+			copy "%~dp0local\update\o2server\start_risc.sh" "%~dp0"
+		)
+		if exist "%~dp0start_risc_debug.sh" (
+			copy "%~dp0local\update\o2server\start_risc_debug.sh" "%~dp0"
+		)
+		if exist "%~dp0stop_risc.sh" (
+			copy "%~dp0local\update\o2server\stop_risc.sh" "%~dp0"
+		)
+		if exist "%~dp0console_risc.sh" (
+			copy "%~dp0local\update\o2server\console_risc.sh" "%~dp0"
+		)
+		if exist "%~dp0start_arm.sh" (
+			copy "%~dp0local\update\o2server\start_arm.sh" "%~dp0"
+		)
+		if exist "%~dp0start_arm_debug.sh" (
+			copy "%~dp0local\update\o2server\start_arm_debug.sh" "%~dp0"
+		)
+		if exist "%~dp0stop_arm.sh" (
+			copy "%~dp0local\update\o2server\stop_arm.sh" "%~dp0"
+		)
+		if exist "%~dp0console_arm.sh" (
+			copy "%~dp0local\update\o2server\console_arm.sh" "%~dp0"
+		)
+		copy "%~dp0local\update\o2server\version.o2" "%~dp0"
+		rmdir /S/Q "%~dp0local\update"
+	)
+)
+@echo on
+"%~dp0jvm\windows\bin\java" -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

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

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

@@ -34,7 +34,7 @@ import com.x.base.core.project.tools.DateTools;
  * @author 李义
  *
  */
-@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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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,

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 27 - 0
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();
+
+    /**
+     * 类型
+     */
+    public Type type();
+
+    /**
+     * 引用,强数据,软数据(软数据不会影响系统运行)
+     */
+
+    public Reference reference();
+
+    public enum Type {
+        element, content, log;
+    }
+
+    public enum Reference {
+        strong, soft;
+    }
 }

+ 2 - 1
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
 	}
 	/*
 	 * =========================================================================

+ 14 - 5
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;

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

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

@@ -32,7 +32,7 @@ import com.x.base.core.project.tools.DateTools;
  * @author 李义
  *
  */
-@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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

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

@@ -22,7 +22,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * @author 李义
  *
  */
-@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

+ 1 - 1
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

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

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

@@ -26,7 +26,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * @author 李义
  *
  */
-@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

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

@@ -41,7 +41,7 @@ import com.x.base.core.project.tools.DateTools;
  * @author 李义
  *
  */
-@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

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

@@ -22,7 +22,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
  * @author 李义
  *
  */
-@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

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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,

+ 10 - 0
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();

+ 1 - 1
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

+ 1 - 1
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,

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Area.District.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Area.District.table + JpaObject.IndexNameMiddle

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
o2server/x_meeting_core_entity/src/main/java/com/x/meeting/core/entity/Attachment.java

@@ -23,7 +23,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.Attachment.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Attachment.table + JpaObject.IndexNameMiddle

+ 1 - 1
o2server/x_meeting_core_entity/src/main/java/com/x/meeting/core/entity/Building.java

@@ -21,7 +21,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.Building.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Building.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

+ 1 - 1
o2server/x_meeting_core_entity/src/main/java/com/x/meeting/core/entity/Meeting.java

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

+ 1 - 1
o2server/x_meeting_core_entity/src/main/java/com/x/meeting/core/entity/Room.java

@@ -24,7 +24,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.Room.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Room.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

+ 1 - 1
o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/IMConversation.java

@@ -17,7 +17,7 @@ import java.util.List;
 
 
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.IMConversation.table, uniqueConstraints = {
         @UniqueConstraint(name = PersistenceProperties.IMConversation.table + JpaObject.IndexNameMiddle
                 + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

+ 1 - 1
o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/IMConversationExt.java

@@ -17,7 +17,7 @@ import java.util.List;
 
 
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.IMConversationExt.table, uniqueConstraints = {
         @UniqueConstraint(name = PersistenceProperties.IMConversationExt.table + JpaObject.IndexNameMiddle
                 + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

+ 1 - 1
o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/IMMsg.java

@@ -11,7 +11,7 @@ import javax.persistence.*;
 
 
 @Entity
-@ContainerEntity
+@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.IMMsg.table, uniqueConstraints = {
         @UniqueConstraint(name = PersistenceProperties.IMMsg.table + JpaObject.IndexNameMiddle
                 + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

+ 1 - 1
o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/Instant.java

@@ -27,7 +27,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.Instant.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Instant.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

+ 1 - 1
o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/Mass.java

@@ -27,7 +27,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.Mass.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Mass.table + JpaObject.IndexNameMiddle
 				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,

Некоторые файлы не были показаны из-за большого количества измененных файлов