Ver código fonte

Merge branch 'fix/#302' into 'develop'

修正CacheInit

See merge request o2oa/o2oa!1426
o2null 5 anos atrás
pai
commit
64c927ab07
39 arquivos alterados com 296 adições e 117 exclusões
  1. 8 8
      o2server/configSample/communicate.json
  2. 2 0
      o2server/configSample/logLevel.json
  3. 8 0
      o2server/configSample/pushConfig.json
  4. 9 5
      o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/ThisApplication.java
  5. 3 0
      o2server/x_base_core_project/src/main/java/com/x/base/core/project/cache/CacheEhcacheReceiveThread.java
  6. 2 1
      o2server/x_base_core_project/src/main/java/com/x/base/core/project/cache/CacheManager.java
  7. 17 4
      o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/LogLevel.java
  8. 32 28
      o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/ThisApplication.java
  9. 11 4
      o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/assemble/control/ThisApplication.java
  10. 50 34
      o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/ThisApplication.java
  11. 3 1
      o2server/x_component_assemble_control/src/main/java/com/x/component/assemble/control/ThisApplication.java
  12. 3 0
      o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/ThisApplication.java
  13. 1 1
      o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/open/File.java
  14. 1 1
      o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/open/OriginFile.java
  15. 3 0
      o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/ThisApplication.java
  16. 12 6
      o2server/x_hotpic_assemble_control/src/main/java/com/x/hotpic/assemble/control/ThisApplication.java
  17. 10 0
      o2server/x_jpush_assemble_control/src/main/java/com/x/jpush/assemble/control/ThisApplication.java
  18. 3 0
      o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/ThisApplication.java
  19. 9 7
      o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/ThisApplication.java
  20. 17 6
      o2server/x_mind_assemble_control/src/main/java/com/x/mind/assemble/control/ThisApplication.java
  21. 16 6
      o2server/x_mind_assemble_control/src/main/webapp/describe/sources/com/x/mind/assemble/control/ThisApplication.java
  22. 6 1
      o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/ThisApplication.java
  23. 5 1
      o2server/x_okr_assemble_control/src/main/webapp/describe/sources/com/x/okr/assemble/control/ThisApplication.java
  24. 3 0
      o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/ThisApplication.java
  25. 3 0
      o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/ThisApplication.java
  26. 4 1
      o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/ThisApplication.java
  27. 6 0
      o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/ThisApplication.java
  28. 6 0
      o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/ThisApplication.java
  29. 6 0
      o2server/x_portal_assemble_surface/src/main/java/com/x/portal/assemble/surface/ThisApplication.java
  30. 5 0
      o2server/x_portal_assemble_surface/src/main/webapp/describe/sources/com/x/portal/assemble/surface/ThisApplication.java
  31. 6 0
      o2server/x_processplatform_assemble_bam/src/main/java/com/x/processplatform/assemble/bam/ThisApplication.java
  32. 5 0
      o2server/x_processplatform_assemble_bam/src/main/webapp/describe/sources/com/x/processplatform/assemble/bam/ThisApplication.java
  33. 3 0
      o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/ThisApplication.java
  34. 4 1
      o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/ThisApplication.java
  35. 3 0
      o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/ThisApplication.java
  36. 3 0
      o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/ThisApplication.java
  37. 3 1
      o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/ThisApplication.java
  38. 3 0
      o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/ThisApplication.java
  39. 2 0
      o2server/x_query_service_processing/src/main/webapp/describe/sources/com/x/query/service/processing/ThisApplication.java

+ 8 - 8
o2server/configSample/communicate.json

@@ -5,20 +5,20 @@
   "###wsEnable": "是否启用ws消息.###",
   "###pmsEnable": "是否启用pms消息.###",
   "###calendarEnable": "是否启用calendar消息.###",
+  "###cronMq": "定时触发发送到消息队列MQ.###",
+  "cronMq": {
+    "enable": false,
+    "cron": "0 0 * * * ? *",
+    "###enable": "是否启用###",
+    "###cron": "定时cron表达式###"
+  },
   "###clean": "清理设置.###",
   "clean": {
     "enable": true,
     "cron": "30 30 6 * * ?",
-    "keep": 7,
+    "keep": 7.0,
     "###enable": "是否启用###",
     "###cron": "定时cron表达式###",
     "###keep": "消息保留天数###"
-  },
-  "###cronMq": "定时触发发送到消息队列MQ.###",
-  "cronMq": {
-    "enable": true,
-    "cron": "0 */5 * * * ?",
-    "###enable": "是否启用###",
-    "###cron": "定时cron表达式###"
   }
 }

+ 2 - 0
o2server/configSample/logLevel.json

@@ -28,6 +28,7 @@
   "x_portal_assemble_designer": "",
   "x_portal_assemble_surface": "",
   "x_processplatform_assemble_bam": "",
+  "x_jpush_assemble_control": "",
   "audit": {
     "###enable": "是否启用审计日志###",
     "###logSize": "审计日志保留天数###",
@@ -64,5 +65,6 @@
   "###x_portal_assemble_designer": "是否启用调试###",
   "###x_portal_assemble_surface": "是否启用调试###",
   "###x_processplatform_assemble_bam": "是否启用调试###",
+  "###x_jpush_assemble_control": "是否启用调试###",
   "###audit": "审计日志配置###"
 }

+ 8 - 0
o2server/configSample/pushConfig.json

@@ -0,0 +1,8 @@
+{
+  "enable": false,
+  "appKey": "9aca7cc20fe0cc987cd913ca",
+  "masterSecret": "96ee7e2e0daffd51bac57815",
+  "###enable": "是否启用.###",
+  "###appKey": "极光推送应用的AppKey###",
+  "###masterSecret": "极光推送应用的Master Secret###"
+}

+ 9 - 5
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/ThisApplication.java

@@ -5,7 +5,10 @@ import com.x.attendance.assemble.control.processor.thread.DataProcessThreadFacto
 import com.x.attendance.assemble.control.schedule.*;
 import com.x.attendance.assemble.control.service.AttendanceSettingService;
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
+import com.x.base.core.project.logger.LoggerFactory;
+
 import org.apache.commons.lang3.BooleanUtils;
 
 public class ThisApplication {
@@ -26,10 +29,10 @@ public class ThisApplication {
 	public static QueuePersonAttendanceDetailAnalyse detailAnalyseQueue = new QueuePersonAttendanceDetailAnalyse();
 	public static QueueAttendanceDetailStatistic detailStatisticQueue = new QueueAttendanceDetailStatistic();
 
-
 	public static void init() throws Exception {
 		try {
-
+			CacheManager.init(context.clazz().getSimpleName());
+			LoggerFactory.setLevel(Config.logLevel().x_attendance_assemble_control());
 			new AttendanceSettingService().initAllSystemConfig();
 
 			detailAnalyseQueue.start();
@@ -38,8 +41,8 @@ public class ThisApplication {
 				dingdingQueue.start();
 				personStatisticQueue.start();
 				unitStatisticQueue.start();
-				context.schedule( DingdingAttendanceSyncScheduleTask.class, "0 0 1 * * ?" );
-				//已经将任务 放到了同步结束后执行 暂时不需要开定时任务了
+				context.schedule(DingdingAttendanceSyncScheduleTask.class, "0 0 1 * * ?");
+				// 已经将任务 放到了同步结束后执行 暂时不需要开定时任务了
 //				context.schedule(DingdingAttendanceStatisticScheduleTask.class, "0 0 3 * * ?");
 //				context.schedule(DingdingAttendanceStatisticPersonScheduleTask.class, "0 0 3 * * ?");
 			}
@@ -53,7 +56,7 @@ public class ThisApplication {
 			context.schedule(AttendanceStatisticTask.class, "0 0 0/4 * * ?");
 
 			context.schedule(MobileRecordAnalyseTask.class, "0 0 * * * ?");
-			//每天凌晨1点,计算前一天所有的未签退和未分析的打卡数据
+			// 每天凌晨1点,计算前一天所有的未签退和未分析的打卡数据
 			context.schedule(DetailLastDayRecordAnalyseTask.class, "0 0 1 * * ?");
 
 		} catch (Exception e) {
@@ -63,6 +66,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 			DataProcessThreadFactory.getInstance().showdown();
 		} catch (Exception e) {
 			e.printStackTrace();

+ 3 - 0
o2server/x_base_core_project/src/main/java/com/x/base/core/project/cache/CacheEhcacheReceiveThread.java

@@ -30,6 +30,9 @@ public class CacheEhcacheReceiveThread extends Thread {
 		while (!isInterrupted()) {
 			try {
 				WrapClearCacheRequest wi = queue.take();
+				System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+				System.out.println(wi);
+				System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
 				String keyValue = new CacheKey(wi.getKeys().toArray()).toString();
 				Stream.of(cacheManager.getCacheNames()).forEach(cacheName -> {
 					if (StringUtils.contains(cacheName, new CacheCategory(wi.getClassName()).toString())) {

+ 2 - 1
o2server/x_base_core_project/src/main/java/com/x/base/core/project/cache/CacheManager.java

@@ -26,8 +26,9 @@ public abstract class CacheManager {
 
 	private static String name = StringTools.uniqueToken();
 
-	public static void setName(String name) {
+	public static void init(String name) throws Exception {
 		CacheManager.name = name;
+		cache();
 	}
 
 	private static synchronized Cache cache() throws Exception {

+ 17 - 4
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/LogLevel.java

@@ -95,6 +95,9 @@ public class LogLevel extends ConfigObject {
 	@FieldDescribe("是否启用调试")
 	private String x_processplatform_assemble_bam = "";
 
+	@FieldDescribe("是否启用调试")
+	private String x_jpush_assemble_control = "";
+
 	@FieldDescribe("审计日志配置")
 	private Audit audit = Audit.defaultInstance();
 
@@ -222,6 +225,10 @@ public class LogLevel extends ConfigObject {
 		return this.getLevel(this.x_general_assemble_control);
 	}
 
+	public String x_jpush_assemble_control() {
+		return this.getLevel(this.x_jpush_assemble_control);
+	}
+
 	private String getLevel(String str) {
 		if (StringUtils.equalsIgnoreCase(str, Logger.ERROR)) {
 			return Logger.ERROR;
@@ -276,16 +283,22 @@ public class LogLevel extends ConfigObject {
 				return this.logSize;
 			}
 		}
-		public String getSystem() { return system; }
+
+		public String getSystem() {
+			return system;
+		}
 
 		public void setSystem(String system) {
 			this.system = system;
 		}
 
-		public String getSystemName() { return systemName; }
-
-		public void setSystemName(String systemName) { this.systemName = systemName; }
+		public String getSystemName() {
+			return systemName;
+		}
 
+		public void setSystemName(String systemName) {
+			this.systemName = systemName;
+		}
 
 		public String getExtend1() {
 			return extend1;

+ 32 - 28
o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/ThisApplication.java

@@ -3,6 +3,8 @@ package com.x.bbs.assemble.control;
 import java.util.List;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.config.Config;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.message.MessageConnector;
@@ -23,7 +25,7 @@ import com.x.bbs.entity.BBSForumInfo;
 import com.x.bbs.entity.BBSSectionInfo;
 
 public class ThisApplication {
-	
+
 	protected static Context context;
 	public static final String BBSMANAGER = "BBSManager@CMSManagerSystemRole@R";
 	public static QueueNewReplyNotify queueNewReplyNotify;
@@ -36,19 +38,22 @@ public class ThisApplication {
 
 	public static void init() throws Exception {
 		try {
-			CONFIG_BBS_ANONYMOUS_PERMISSION = (new BBSConfigSettingService()).getValueWithConfigCode("BBS_ANONYMOUS_PERMISSION");;
+			CacheManager.init(context.clazz().getSimpleName());
+			LoggerFactory.setLevel(Config.logLevel().x_bbs_assemble_control());
+			CONFIG_BBS_ANONYMOUS_PERMISSION = (new BBSConfigSettingService())
+					.getValueWithConfigCode("BBS_ANONYMOUS_PERMISSION");
 			initAllSystemConfig();
 			queueNewReplyNotify = new QueueNewReplyNotify();
 			queueNewSubjectNotify = new QueueNewSubjectNotify();
 
 			MessageConnector.start(context());
 
-			context().startQueue( queueNewReplyNotify );
-			context().startQueue( queueNewSubjectNotify );
-			context.schedule( SubjectTotalStatisticTask.class, "0 0 1 * * ?"); //每天凌晨一点执行
-			context.schedule( UserCountTodaySetZeroTask.class, "0 1 0 * * ?"); //每天凌晨执行
-			context.schedule( SubjectReplyTotalStatisticTask.class, "0 40 * * * ?");
-			context.schedule( UserSubjectReplyPermissionStatisticTask.class, "0 0/30 * * * ?");
+			context().startQueue(queueNewReplyNotify);
+			context().startQueue(queueNewSubjectNotify);
+			context.schedule(SubjectTotalStatisticTask.class, "0 0 1 * * ?"); // 每天凌晨一点执行
+			context.schedule(UserCountTodaySetZeroTask.class, "0 1 0 * * ?"); // 每天凌晨执行
+			context.schedule(SubjectReplyTotalStatisticTask.class, "0 40 * * * ?");
+			context.schedule(UserSubjectReplyPermissionStatisticTask.class, "0 0/30 * * * ?");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -56,15 +61,16 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
 
-	public static String getRoleAndPermissionCacheKey( String personName ) {
+	public static String getRoleAndPermissionCacheKey(String personName) {
 		return "RoleAndPermission.withPerson." + personName;
 	}
-	
+
 	private static void initAllSystemConfig() {
 		BBSPermissionInfoService permissionInfoService = new BBSPermissionInfoService();
 		BBSRoleInfoService roleInfoService = new BBSRoleInfoService();
@@ -87,7 +93,7 @@ public class ThisApplication {
 			if (forumInfoList != null) {
 				for (BBSForumInfo forumInfo : forumInfoList) {
 					permissionInfoService.createForumPermission(forumInfo);
-					roleInfoService.createForumRole( null, forumInfo);
+					roleInfoService.createForumRole(null, forumInfo);
 				}
 			}
 		} catch (Exception e) {
@@ -101,7 +107,7 @@ public class ThisApplication {
 			if (sectionInfoList != null) {
 				for (BBSSectionInfo sectionInfo : sectionInfoList) {
 					permissionInfoService.createSectionPermission(sectionInfo);
-					roleInfoService.createSectionRole( "System", sectionInfo);
+					roleInfoService.createSectionRole("System", sectionInfo);
 				}
 			}
 		} catch (Exception e) {
@@ -110,19 +116,18 @@ public class ThisApplication {
 			LoggerFactory.getLogger(ThisApplication.class).error(e);
 		}
 	}
-	
+
 	/**
-	 * 判断用户是否有BBS系统管理权限
-	 * 1、系统管理员Manager或者xadmin
-	 * 2、拥有BBSManager角色的人员
+	 * 判断用户是否有BBS系统管理权限 1、系统管理员Manager或者xadmin 2、拥有BBSManager角色的人员
+	 * 
 	 * @param effectivePerson
 	 * @return
 	 */
-	public static Boolean isBBSManager( EffectivePerson effectivePerson ) {
+	public static Boolean isBBSManager(EffectivePerson effectivePerson) {
 		UserManagerService userManagerService = new UserManagerService();
 		try {
-			if ( userManagerService.isHasPlatformRole( effectivePerson.getDistinguishedName(), ThisApplication.BBSMANAGER  )
-				|| effectivePerson.isManager()) {
+			if (userManagerService.isHasPlatformRole(effectivePerson.getDistinguishedName(), ThisApplication.BBSMANAGER)
+					|| effectivePerson.isManager()) {
 				return true;
 			}
 		} catch (Exception e) {
@@ -130,27 +135,26 @@ public class ThisApplication {
 		}
 		return false;
 	}
-	
+
 	/**
-	 * 判断用户是否有权限对指定的论坛进行管理
-	 * 1、系统管理员、BBS管理员
-	 * 2、指定论坛设置的管理员
+	 * 判断用户是否有权限对指定的论坛进行管理 1、系统管理员、BBS管理员 2、指定论坛设置的管理员
+	 * 
 	 * @param effectivePerson
 	 * @param forumInfo
 	 * @return
 	 */
-	public static Boolean isForumManager( EffectivePerson effectivePerson, BBSForumInfo forumInfo ) {
-		if( isBBSManager( effectivePerson ) ) {
+	public static Boolean isForumManager(EffectivePerson effectivePerson, BBSForumInfo forumInfo) {
+		if (isBBSManager(effectivePerson)) {
 			return true;
 		}
-		if ( forumInfo != null && ListTools.isNotEmpty( forumInfo.getForumManagerList() ) ) {
+		if (forumInfo != null && ListTools.isNotEmpty(forumInfo.getForumManagerList())) {
 			for (String name : forumInfo.getForumManagerList()) {
-				if ( effectivePerson.getDistinguishedName().equals( name ) ) {
+				if (effectivePerson.getDistinguishedName().equals(name)) {
 					return true;
 				}
 			}
 		}
 		return false;
 	}
-	
+
 }

+ 11 - 4
o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/assemble/control/ThisApplication.java

@@ -1,7 +1,12 @@
 package com.x.calendar.assemble.control;
 
+import java.util.List;
+
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.config.Config;
 import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.message.MessageConnector;
 import com.x.base.core.project.tools.ListTools;
 import com.x.calendar.assemble.control.schedule.AlarmTrigger;
@@ -10,22 +15,23 @@ import com.x.calendar.assemble.control.service.UserManagerService;
 import com.x.calendar.core.entity.Calendar;
 import com.x.calendar.core.entity.Calendar_Event;
 
-import java.util.List;
-
 public class ThisApplication {
 
 	protected static Context context;
 	public static final String CalendarMANAGER = "CalendarManager";
+
 	public static Context context() {
 		return context;
 	}
 
 	public static void init() throws Exception {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
+			LoggerFactory.setLevel(Config.logLevel().x_calendar_assemble_control());
 			MessageConnector.start(context());
-			//每30秒检查一次需要推送的消息
+			// 每30秒检查一次需要推送的消息
 			context.schedule(AlarmTrigger.class, "0/30 * * * * ?");
-			//每两小时检查一次comment信息的引用情况,删除多余的不必要的数据
+			// 每两小时检查一次comment信息的引用情况,删除多余的不必要的数据
 			context.schedule(CheckEventComment.class, "* * */2 * * ?");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -34,6 +40,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 50 - 34
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/ThisApplication.java

@@ -1,16 +1,29 @@
 package com.x.cms.assemble.control;
 
+import java.util.concurrent.ConcurrentHashMap;
+
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.message.MessageConnector;
-import com.x.cms.assemble.control.queue.*;
-import com.x.cms.assemble.control.timertask.*;
-
-import java.util.concurrent.ConcurrentHashMap;
+import com.x.cms.assemble.control.queue.DataImportStatus;
+import com.x.cms.assemble.control.queue.QueueBatchOperation;
+import com.x.cms.assemble.control.queue.QueueDataRowImport;
+import com.x.cms.assemble.control.queue.QueueDocumentDelete;
+import com.x.cms.assemble.control.queue.QueueDocumentUpdate;
+import com.x.cms.assemble.control.queue.QueueDocumentViewCountUpdate;
+import com.x.cms.assemble.control.queue.QueueSendDocumentNotify;
+import com.x.cms.assemble.control.timertask.Timertask_BatchOperationTask;
+import com.x.cms.assemble.control.timertask.Timertask_CheckDocumentReviewStatus;
+import com.x.cms.assemble.control.timertask.Timertask_InitOperationRunning;
+import com.x.cms.assemble.control.timertask.Timertask_LogRecordCheckTask;
+import com.x.cms.assemble.control.timertask.Timertask_RefreshAllDocumentReviews;
 
 public class ThisApplication {
 
 	protected static Context context;
-	
+
 	public static final String ROLE_CMSManager = "CMSManager@CMSManagerSystemRole@R";
 	public static final String ROLE_Manager = "Manager@ManagerSystemRole@R";
 	public static QueueDataRowImport queueDataRowImport;
@@ -20,47 +33,50 @@ public class ThisApplication {
 	public static QueueBatchOperation queueBatchOperation;
 	public static QueueSendDocumentNotify queueSendDocumentNotify;
 	private static ConcurrentHashMap<String, DataImportStatus> importStatus = new ConcurrentHashMap<>();
-	
+
 	public static Context context() {
 		return context;
 	}
-	
+
 	public static void init() throws Exception {
-		//执行数据库中的批处理操作
+		CacheManager.init(context.clazz().getSimpleName());
+		LoggerFactory.setLevel(Config.logLevel().x_cms_assemble_control());
+		// 执行数据库中的批处理操作
 		queueBatchOperation = new QueueBatchOperation();
-		//Document删除时也需要检查一下热点图片里的数据是否已经删除掉了
+		// Document删除时也需要检查一下热点图片里的数据是否已经删除掉了
 		queueDocumentDelete = new QueueDocumentDelete();
-		//文档批量导入时数据存储过程
+		// 文档批量导入时数据存储过程
 		queueDataRowImport = new QueueDataRowImport();
-		//Document变更标题时也需要更新一下热点图片里的数据
+		// Document变更标题时也需要更新一下热点图片里的数据
 		queueDocumentUpdate = new QueueDocumentUpdate();
-		//Document被访问时,需要将总的访问量更新到item的document中,便于视图使用,在队列里异步修改
+		// Document被访问时,需要将总的访问量更新到item的document中,便于视图使用,在队列里异步修改
 		queueDocumentViewCountUpdate = new QueueDocumentViewCountUpdate();
-		//Document发布时,向所有阅读者推送通知
+		// Document发布时,向所有阅读者推送通知
 		queueSendDocumentNotify = new QueueSendDocumentNotify();
-		
+
 		MessageConnector.start(context());
-		
-		context().startQueue( queueBatchOperation );
-		context().startQueue( queueDocumentDelete );
-		context().startQueue( queueDataRowImport );
-		context().startQueue( queueDocumentUpdate );
-		context().startQueue( queueDocumentViewCountUpdate );
-		context().startQueue( queueSendDocumentNotify );
+
+		context().startQueue(queueBatchOperation);
+		context().startQueue(queueDocumentDelete);
+		context().startQueue(queueDataRowImport);
+		context().startQueue(queueDocumentUpdate);
+		context().startQueue(queueDocumentViewCountUpdate);
+		context().startQueue(queueSendDocumentNotify);
 
 		// 每天凌晨2点执行一次
-		context.schedule( Timertask_LogRecordCheckTask.class, "0 0 2 * * ?" );
-		context.schedule( Timertask_BatchOperationTask.class, "0 */5 * * * ?" );
+		context.schedule(Timertask_LogRecordCheckTask.class, "0 0 2 * * ?");
+		context.schedule(Timertask_BatchOperationTask.class, "0 */5 * * * ?");
 
-		//每天凌晨2点,计算所有的文档的权限信息
-		context.schedule( Timertask_RefreshAllDocumentReviews.class, "0 0 2 * * ?" );
+		// 每天凌晨2点,计算所有的文档的权限信息
+		context.schedule(Timertask_RefreshAllDocumentReviews.class, "0 0 2 * * ?");
 
-		context.scheduleLocal( Timertask_CheckDocumentReviewStatus.class, 1200 );
-		context.scheduleLocal( Timertask_InitOperationRunning.class, 150 );
+		context.scheduleLocal(Timertask_CheckDocumentReviewStatus.class, 1200);
+		context.scheduleLocal(Timertask_InitOperationRunning.class, 150);
 	}
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 			queueBatchOperation.stop();
 			queueDocumentDelete.stop();
 			queueDataRowImport.stop();
@@ -71,17 +87,17 @@ public class ThisApplication {
 			e.printStackTrace();
 		}
 	}
-	
-	public static ConcurrentHashMap<String, DataImportStatus> listImportStatus(){
+
+	public static ConcurrentHashMap<String, DataImportStatus> listImportStatus() {
 		return importStatus;
 	}
-	
-	public static DataImportStatus getDataImportStatus( String batchName ) {
-		if( importStatus.get( batchName ) == null ) {
+
+	public static DataImportStatus getDataImportStatus(String batchName) {
+		if (importStatus.get(batchName) == null) {
 			DataImportStatus dataImportStatus = new DataImportStatus();
 			dataImportStatus.setBatchName(batchName);
-			importStatus.put( batchName,  dataImportStatus );
+			importStatus.put(batchName, dataImportStatus);
 		}
-		return importStatus.get( batchName );
+		return importStatus.get(batchName);
 	}
 }

+ 3 - 1
o2server/x_component_assemble_control/src/main/java/com/x/component/assemble/control/ThisApplication.java

@@ -1,6 +1,7 @@
 package com.x.component.assemble.control;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
@@ -22,6 +23,7 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
 			LoggerFactory.setLevel(Config.logLevel().x_component_assemble_control());
 			context.scheduleLocal(InitComponents.class, 1);
 		} catch (Exception e) {
@@ -31,7 +33,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
-			//nothing
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			logger.error(e);
 		}

+ 3 - 0
o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/ThisApplication.java

@@ -1,6 +1,7 @@
 package com.x.file.assemble.control;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.message.MessageConnector;
@@ -18,6 +19,7 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
 			LoggerFactory.setLevel(Config.logLevel().x_file_assemble_control());
 			fileRemoveQueue = new FileRemoveQueue();
 			MessageConnector.start(context());
@@ -29,6 +31,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 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(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
+@ContainerEntity(dumpSize = 10, 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(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
+@ContainerEntity(dumpSize = 10, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Entity
 @Table(name = PersistenceProperties.Open.OriginFile.table, uniqueConstraints = {
 		@UniqueConstraint(name = PersistenceProperties.Open.OriginFile.table + JpaObject.IndexNameMiddle

+ 3 - 0
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/ThisApplication.java

@@ -1,6 +1,7 @@
 package com.x.general.assemble.control;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.LoggerFactory;
 
@@ -14,6 +15,7 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
 			LoggerFactory.setLevel(Config.logLevel().x_general_assemble_control());
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -22,6 +24,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 12 - 6
o2server/x_hotpic_assemble_control/src/main/java/com/x/hotpic/assemble/control/ThisApplication.java

@@ -1,23 +1,28 @@
 package com.x.hotpic.assemble.control;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.logger.LoggerFactory;
 import com.x.hotpic.assemble.control.queueTask.DocumentExistsCheckTask;
 import com.x.hotpic.assemble.control.schedule.InfoExistsCheckTask;
 
-public class ThisApplication{
-	
+public class ThisApplication {
+
 	public static DocumentExistsCheckTask queueLoginRecord;
 	protected static Context context;
-	
+
 	public static Context context() {
 		return context;
 	}
-	
+
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
+			LoggerFactory.setLevel(Config.logLevel().x_hotpic_assemble_control());
 			queueLoginRecord = new DocumentExistsCheckTask();
-			context.startQueue( queueLoginRecord );
-			context.schedule( InfoExistsCheckTask.class, "0 0/10 * * * ?");
+			context.startQueue(queueLoginRecord);
+			context.schedule(InfoExistsCheckTask.class, "0 0/10 * * * ?");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -25,6 +30,7 @@ public class ThisApplication{
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 10 - 0
o2server/x_jpush_assemble_control/src/main/java/com/x/jpush/assemble/control/ThisApplication.java

@@ -1,6 +1,9 @@
 package com.x.jpush.assemble.control;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.logger.LoggerFactory;
 
 public class ThisApplication {
 
@@ -11,10 +14,17 @@ public class ThisApplication {
 	}
 
 	public static void init() throws Exception {
+		try {
+			CacheManager.init(context.clazz().getSimpleName());
+			LoggerFactory.setLevel(Config.logLevel().x_jpush_assemble_control());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 3 - 0
o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/ThisApplication.java

@@ -1,6 +1,7 @@
 package com.x.meeting.assemble.control;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.message.MessageConnector;
@@ -15,6 +16,7 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
 			LoggerFactory.setLevel(Config.logLevel().x_meeting_assemble_control());
 			MessageConnector.start(context());
 		} catch (Exception e) {
@@ -24,6 +26,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 			MessageConnector.stop();
 		} catch (Exception e) {
 			e.printStackTrace();

+ 9 - 7
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/ThisApplication.java

@@ -4,6 +4,7 @@ import com.x.base.core.project.message.MessageConnector;
 import org.apache.commons.lang3.BooleanUtils;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.message.assemble.communicate.schedule.Clean;
@@ -29,7 +30,7 @@ public class ThisApplication {
 	public static WeLinkConsumeQueue weLinkConsumeQueue = new WeLinkConsumeQueue();
 
 	public static PmsInnerConsumeQueue pmsInnerConsumeQueue = new PmsInnerConsumeQueue();
-	
+
 	public static MQConsumeQueue mqConsumeQueue = new MQConsumeQueue();
 
 	public static Context context() {
@@ -38,6 +39,7 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
 			LoggerFactory.setLevel(Config.logLevel().x_message_assemble_communicate());
 			if (Config.communicate().wsEnable()) {
 				wsConsumeQueue.start();
@@ -68,18 +70,17 @@ public class ThisApplication {
 			if (Config.weLink().getEnable() && Config.weLink().getMessageEnable()) {
 				weLinkConsumeQueue.start();
 			}
-			
+
 			if (Config.mq().getEnable()) {
 				mqConsumeQueue.start();
 			}
-			
+
 			MessageConnector.start(context());
-          
-			
+
 			if (BooleanUtils.isTrue(Config.communicate().cronMq().getEnable())) {
-				  context().schedule(TriggerMq.class,Config.communicate().cronMq().getCron());
+				context().schedule(TriggerMq.class, Config.communicate().cronMq().getCron());
 			}
-			
+
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -87,6 +88,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 			wsConsumeQueue.stop();
 			pmsConsumeQueue.stop();
 			calendarConsumeQueue.stop();

+ 17 - 6
o2server/x_mind_assemble_control/src/main/java/com/x/mind/assemble/control/ThisApplication.java

@@ -1,25 +1,36 @@
 package com.x.mind.assemble.control;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.message.MessageConnector;
 import com.x.mind.assemble.control.queue.QueueShareNotify;
 
-public class ThisApplication{
+public class ThisApplication {
 	protected static Context context;
 	public static QueueShareNotify queueShareNotify;
-	
+
 	public static Context context() {
 		return context;
 	}
-	
+
 	public static void init() {
-		queueShareNotify = new QueueShareNotify();
-		MessageConnector.start(context());
-		context().startQueue( queueShareNotify );
+		try {
+			CacheManager.init(context.clazz().getSimpleName());
+			LoggerFactory.setLevel(Config.logLevel().x_mind_assemble_control());
+			queueShareNotify = new QueueShareNotify();
+			MessageConnector.start(context());
+			context().startQueue(queueShareNotify);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
 	}
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 			queueShareNotify.stop();
 		} catch (Exception e) {
 			e.printStackTrace();

+ 16 - 6
o2server/x_mind_assemble_control/src/main/webapp/describe/sources/com/x/mind/assemble/control/ThisApplication.java

@@ -1,21 +1,31 @@
 package com.x.mind.assemble.control;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.message.MessageConnector;
 import com.x.mind.assemble.control.queue.QueueShareNotify;
 
-public class ThisApplication{
+public class ThisApplication {
 	protected static Context context;
 	public static QueueShareNotify queueShareNotify;
-	
+
 	public static Context context() {
 		return context;
 	}
-	
+
 	public static void init() {
-		queueShareNotify = new QueueShareNotify();
-		MessageConnector.start(context());
-		context().startQueue( queueShareNotify );
+		try {
+			CacheManager.init(context.clazz().getSimpleName());
+			LoggerFactory.setLevel(Config.logLevel().x_mind_assemble_control());
+			queueShareNotify = new QueueShareNotify();
+			MessageConnector.start(context());
+			context().startQueue(queueShareNotify);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
 	}
 
 	public static void destroy() {

+ 6 - 1
o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/ThisApplication.java

@@ -4,6 +4,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.logger.LoggerFactory;
 import com.x.okr.assemble.control.jaxrs.queue.QueueWorkDynamicRecord;
 import com.x.okr.assemble.control.jaxrs.workimport.CacheImportFileStatus;
 import com.x.okr.assemble.control.schedule.ErrorIdentityCheckTask;
@@ -31,7 +34,8 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
-
+			CacheManager.init(context.clazz().getSimpleName());
+			LoggerFactory.setLevel(Config.logLevel().x_okr_assemble_control());
 			queueWorkDynamicRecord = new QueueWorkDynamicRecord();
 			context().startQueue(queueWorkDynamicRecord);
 
@@ -59,6 +63,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 5 - 1
o2server/x_okr_assemble_control/src/main/webapp/describe/sources/com/x/okr/assemble/control/ThisApplication.java

@@ -4,6 +4,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.logger.LoggerFactory;
 import com.x.okr.assemble.control.jaxrs.queue.QueueWorkDynamicRecord;
 import com.x.okr.assemble.control.jaxrs.workimport.CacheImportFileStatus;
 import com.x.okr.assemble.control.schedule.ErrorIdentityCheckTask;
@@ -31,7 +34,8 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
-
+			CacheManager.init(context.clazz().getSimpleName());
+			LoggerFactory.setLevel(Config.logLevel().x_okr_assemble_control());
 			queueWorkDynamicRecord = new QueueWorkDynamicRecord();
 			context().startQueue(queueWorkDynamicRecord);
 

+ 3 - 0
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/ThisApplication.java

@@ -1,6 +1,7 @@
 package com.x.organization.assemble.authentication;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.organization.assemble.authentication.jaxrs.authentication.QueueLoginRecord;
@@ -19,6 +20,7 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
 			LoggerFactory.setLevel(Config.logLevel().x_organization_assemble_authentication());
 			queueLoginRecord = new QueueLoginRecord();
 			context.startQueue(queueLoginRecord);
@@ -31,6 +33,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 3 - 0
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/ThisApplication.java

@@ -1,6 +1,7 @@
 package com.x.organization.assemble.control;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.LoggerFactory;
 
@@ -14,6 +15,7 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
 			LoggerFactory.setLevel(Config.logLevel().x_organization_assemble_control());
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -22,6 +24,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 4 - 1
o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/ThisApplication.java

@@ -2,6 +2,8 @@ package com.x.organization.assemble.express;
 
 import com.x.base.core.project.Context;
 import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.logger.LoggerFactory;
 
 public class ThisApplication {
 
@@ -13,7 +15,8 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
-			CacheManager.setName(context.clazz().getSimpleName());
+			CacheManager.init(context.clazz().getSimpleName());
+			LoggerFactory.setLevel(Config.logLevel().x_organization_assemble_express());
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 6 - 0
o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/ThisApplication.java

@@ -1,6 +1,9 @@
 package com.x.organization.assemble.personal;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.logger.LoggerFactory;
 import com.x.organization.assemble.personal.schedule.DisableExpiredEmpower;
 
 public class ThisApplication {
@@ -13,6 +16,8 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
+			LoggerFactory.setLevel(Config.logLevel().x_organization_assemble_personal());
 			context.schedule(DisableExpiredEmpower.class, "0 0/20 * * * ?");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -21,6 +26,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 6 - 0
o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/ThisApplication.java

@@ -1,6 +1,9 @@
 package com.x.portal.assemble.designer;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.logger.LoggerFactory;
 
 public class ThisApplication {
 
@@ -12,6 +15,8 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
+			LoggerFactory.setLevel(Config.logLevel().x_portal_assemble_designer());
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -19,6 +24,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 6 - 0
o2server/x_portal_assemble_surface/src/main/java/com/x/portal/assemble/surface/ThisApplication.java

@@ -1,6 +1,9 @@
 package com.x.portal.assemble.surface;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.logger.LoggerFactory;
 
 public class ThisApplication {
 
@@ -12,6 +15,8 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
+			LoggerFactory.setLevel(Config.logLevel().x_portal_assemble_surface());
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -19,6 +24,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 5 - 0
o2server/x_portal_assemble_surface/src/main/webapp/describe/sources/com/x/portal/assemble/surface/ThisApplication.java

@@ -1,6 +1,9 @@
 package com.x.portal.assemble.surface;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.logger.LoggerFactory;
 
 public class ThisApplication {
 
@@ -12,6 +15,8 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
+			LoggerFactory.setLevel(Config.logLevel().x_portal_assemble_surface());
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 6 - 0
o2server/x_processplatform_assemble_bam/src/main/java/com/x/processplatform/assemble/bam/ThisApplication.java

@@ -1,6 +1,9 @@
 package com.x.processplatform.assemble.bam;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.logger.LoggerFactory;
 import com.x.processplatform.assemble.bam.jaxrs.period.Period;
 import com.x.processplatform.assemble.bam.jaxrs.state.State;
 import com.x.processplatform.assemble.bam.schedule.PeriodTimer;
@@ -16,6 +19,8 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
+			LoggerFactory.setLevel(Config.logLevel().x_processplatform_assemble_bam());
 			context().scheduleLocal(PeriodTimer.class, 180, 60 * 30);
 			/* state 运行统计需要读取组织库,如果开始运行的时候组织应用还没启动那么会为空 */
 			context().scheduleLocal(StateTimer.class, 180, 60 * 60 * 1);
@@ -26,6 +31,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 5 - 0
o2server/x_processplatform_assemble_bam/src/main/webapp/describe/sources/com/x/processplatform/assemble/bam/ThisApplication.java

@@ -1,6 +1,9 @@
 package com.x.processplatform.assemble.bam;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.logger.LoggerFactory;
 import com.x.processplatform.assemble.bam.jaxrs.period.Period;
 import com.x.processplatform.assemble.bam.jaxrs.state.State;
 import com.x.processplatform.assemble.bam.schedule.PeriodTimer;
@@ -16,6 +19,8 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
+			LoggerFactory.setLevel(Config.logLevel().x_processplatform_assemble_bam());
 			context().scheduleLocal(PeriodTimer.class, 180, 60 * 30);
 			/* state 运行统计需要读取组织库,如果开始运行的时候组织应用还没启动那么会为空 */
 			context().scheduleLocal(StateTimer.class, 180, 60 * 60 * 1);

+ 3 - 0
o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/ThisApplication.java

@@ -1,6 +1,7 @@
 package com.x.processplatform.assemble.designer;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.message.MessageConnector;
@@ -21,6 +22,7 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
 			LoggerFactory.setLevel(Config.logLevel().x_processplatform_assemble_designer());
 			MessageConnector.start(context());
 			projectionExecuteQueue.start();
@@ -35,6 +37,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 			projectionExecuteQueue.stop();
 			mappingExecuteQueue.stop();
 			formVersionQueue.stop();

+ 4 - 1
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/ThisApplication.java

@@ -1,6 +1,7 @@
 package com.x.processplatform.assemble.surface;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.processplatform.assemble.surface.schedule.CleanKeyLock;
@@ -15,8 +16,9 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
-			context.schedule(CleanKeyLock.class, "2 0/2 * * * ?");
+			CacheManager.init(context.clazz().getSimpleName());
 			LoggerFactory.setLevel(Config.logLevel().x_processplatform_assemble_surface());
+			context.schedule(CleanKeyLock.class, "2 0/2 * * * ?");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -24,6 +26,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 3 - 0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/ThisApplication.java

@@ -1,6 +1,7 @@
 package com.x.processplatform.service.processing;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.message.MessageConnector;
@@ -34,6 +35,7 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
 			LoggerFactory.setLevel(Config.logLevel().x_processplatform_service_processing());
 			MessageConnector.start(context());
 			context().startQueue(syncJaxrsInvokeQueue);
@@ -70,6 +72,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 			MessageConnector.stop();
 		} catch (Exception e) {
 			e.printStackTrace();

+ 3 - 0
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/ThisApplication.java

@@ -1,6 +1,7 @@
 package com.x.query.assemble.designer;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.LoggerFactory;
 
@@ -14,6 +15,7 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
 			LoggerFactory.setLevel(Config.logLevel().x_query_assemble_designer());
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -22,6 +24,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 3 - 1
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/ThisApplication.java

@@ -1,6 +1,7 @@
 package com.x.query.assemble.surface;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.LoggerFactory;
 
@@ -14,6 +15,7 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
 			LoggerFactory.setLevel(Config.logLevel().x_query_assemble_surface());
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -22,7 +24,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
-
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 3 - 0
o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/ThisApplication.java

@@ -3,6 +3,7 @@ package com.x.query.service.processing;
 import org.apache.commons.lang3.BooleanUtils;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.query.service.processing.schedule.CrawlCms;
@@ -19,6 +20,7 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
 			LoggerFactory.setLevel(Config.logLevel().x_query_service_processing());
 			if (BooleanUtils.isTrue(Config.query().getCrawlWork().getEnable())) {
 				context.schedule(CrawlWork.class, Config.query().getCrawlWork().getCron());
@@ -36,6 +38,7 @@ public class ThisApplication {
 
 	public static void destroy() {
 		try {
+			CacheManager.shutdown();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

+ 2 - 0
o2server/x_query_service_processing/src/main/webapp/describe/sources/com/x/query/service/processing/ThisApplication.java

@@ -3,6 +3,7 @@ package com.x.query.service.processing;
 import org.apache.commons.lang3.BooleanUtils;
 
 import com.x.base.core.project.Context;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.query.service.processing.schedule.CrawlCms;
@@ -19,6 +20,7 @@ public class ThisApplication {
 
 	public static void init() {
 		try {
+			CacheManager.init(context.clazz().getSimpleName());
 			LoggerFactory.setLevel(Config.logLevel().x_query_service_processing());
 			if (BooleanUtils.isTrue(Config.query().getCrawlWork().getEnable())) {
 				context.schedule(CrawlWork.class, Config.query().getCrawlWork().getCron());