Merge branch 'release' into 'master'

Release

See merge request o2oa/o2oa!1754

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

@@ -2,17 +2,9 @@ package com.x.base.core.project;
 
 import javax.servlet.ServletContext;
 
-import org.quartz.DateBuilder;
-import org.quartz.JobBuilder;
-import org.quartz.JobDataMap;
-import org.quartz.JobDetail;
-import org.quartz.SimpleScheduleBuilder;
-import org.quartz.Trigger;
-import org.quartz.TriggerBuilder;
-import org.quartz.DateBuilder.IntervalUnit;
-
 import com.x.base.core.project.annotation.Module;
-import com.x.base.core.project.config.Config;
+import com.x.base.core.project.jaxrs.WrapClearCacheRequest;
+import com.x.base.core.project.queue.AbstractQueue;
 import com.x.base.core.project.schedule.AbstractJob;
 import com.x.base.core.project.thread.ThreadFactory;
 
@@ -54,4 +46,6 @@ public abstract class AbstractContext {
 	}
 
 	public abstract <T extends AbstractJob> void fireScheduleOnLocal(Class<T> cls, Integer delay) throws Exception;
+
+	public abstract AbstractQueue<WrapClearCacheRequest> clearCacheRequestQueue();
 }

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

@@ -338,6 +338,13 @@ public class ProcessPlatform extends ConfigObject {
 			return o;
 		}
 
+		public Merge() {
+			this.enable = DEFAULT_ENABLE;
+			this.cron = DEFAULT_CRON;
+			this.thresholdDays = DEFAULT_THRESHOLDDAYS;
+			this.batchSize = DEFAULT_BATCHSIZE;
+		}
+
 		public static final Boolean DEFAULT_ENABLE = false;
 
 		public static final String DEFAULT_CRON = "30 30 6 * * ?";

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

@@ -3,6 +3,7 @@ package com.x.base.core.project.jaxrs.cache;
 import javax.servlet.ServletContext;
 
 import com.google.gson.JsonElement;
+import com.x.base.core.project.AbstractContext;
 import com.x.base.core.project.cache.ApplicationCache;
 import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.http.ActionResult;
@@ -21,15 +22,11 @@ class ActionReceive extends BaseAction {
 		logger.debug(effectivePerson, "receive:{}.", jsonElement);
 		ActionResult<Wo> result = new ActionResult<>();
 		Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
-		Object o = servletContext.getAttribute(com.x.base.core.project.AbstractContext.class.getName());
-		if (null != o) {
-			com.x.base.core.project.Context ctx = (com.x.base.core.project.Context) o;
-			if (null != ctx.clearCacheRequestQueue()) {
-				ctx.clearCacheRequestQueue().send(wi);
-			} else {
-				ApplicationCache.receive(wi);
-				CacheManager.receive(wi);
-			}
+		// Object o =
+		// servletContext.getAttribute(com.x.base.core.project.AbstractContext.class.getName());
+		AbstractContext ctx = AbstractContext.fromServletContext(servletContext);
+		if (null != ctx.clearCacheRequestQueue()) {
+			ctx.clearCacheRequestQueue().send(wi);
 		} else {
 			ApplicationCache.receive(wi);
 			CacheManager.receive(wi);

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

@@ -19,7 +19,7 @@ class ActionExecute extends BaseAction {
 			throws Exception {
 		logger.debug(effectivePerson, "execute:{}.", className);
 		ActionResult<Wo> result = new ActionResult<>();
-		AbstractContext ctx = com.x.base.core.project.Context.fromServletContext(servletContext);
+		AbstractContext ctx = AbstractContext.fromServletContext(servletContext);
 		Class<?> clz = Class.forName(className);
 		ctx.fireScheduleOnLocal((Class<AbstractJob>) clz, 1);
 		Wo wo = new Wo();

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java

@@ -128,8 +128,8 @@ class ActionAppend extends BaseAction {
 						identities = business.organization().identity().list(ListTools.trim(identities, true, true));
 						emc.beginTransaction(Work.class);
 						work.setManualTaskIdentityList(identities);
-						emc.beginTransaction(Task.class);
 						// 转派后设置过期为空
+						emc.beginTransaction(Task.class);
 						task.setExpired(false);
 						task.setExpireTime(null);
 						emc.commit();