Merge branch 'feature/java11' into 'develop'

fix

See merge request o2oa/o2oa!1573

o2server/configSample/processPlatform.json

@@ -56,7 +56,7 @@
     "###cron": "定时cron表达式###",
     "###thresholdMinutes": "当工作滞留设定时间后,将尝试触发工作流转,可以自动处理由于人员变动的引起的工作滞留,默认24*60分钟.###"
   },
-  "processingSignalThreshold": 1000.0,
+  "processingSignalThreshold": 500.0,
   "processingSignalPersistEnable": false,
   "###maintenanceIdentity": "维护身份,当工作发生意外错误,无法找到对应的处理人情况下,先尝试将工作分配给创建身份,如果创建身份也不可获取,那么分配给指定人员,默认情况下这个值为空.###",
   "###formVersionCount": "表单历史版本保留数量,0为不保留.###",
@@ -95,6 +95,6 @@
     "###count": "提醒数量限制.###"
   },
   "###extensionEvents": "事件扩充.###",
-  "###processingSignalThreshold": "工作处理异步返回阈值,默认1000毫秒.###",
+  "###processingSignalThreshold": "工作处理异步返回阈值,默认500毫秒.###",
   "###processingSignalPersistEnable": "是否保存工作处理信号内容,默认false.###"
 }
\ No newline at end of file

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

@@ -75,7 +75,6 @@ public class ProcessPlatform extends ConfigObject {
 		this.touchDetained = new TouchDetained();
 		this.deleteDraft = new DeleteDraft();
 		this.passExpired = new PassExpired();
-		this.processingSignalThreshold = DEFAULT_PROCESSINGSIGNALTHRESHOLD;
 		this.processingSignalPersistEnable = DEFAULT_PROCESSINGSIGNALPERSISTENABLE;
 	}
 
@@ -169,9 +168,6 @@ public class ProcessPlatform extends ConfigObject {
 	@FieldDescribe("事件扩充.")
 	private ExtensionEvents extensionEvents;
 
-	@FieldDescribe("工作处理异步返回阈值,默认500毫秒.")
-	private Integer processingSignalThreshold;
-
 	@FieldDescribe("是否保存工作处理信号内容,默认false.")
 	private Boolean processingSignalPersistEnable;
 
@@ -182,13 +178,6 @@ public class ProcessPlatform extends ConfigObject {
 		return processingSignalPersistEnable;
 	}
 
-	public Integer getProcessingSignalThreshold() {
-		if (processingSignalThreshold == null || processingSignalThreshold < 1) {
-			this.processingSignalThreshold = DEFAULT_PROCESSINGSIGNALTHRESHOLD;
-		}
-		return processingSignalThreshold;
-	}
-
 	public ExtensionEvents getExtensionEvents() {
 		if (null == extensionEvents) {
 			this.extensionEvents = new ExtensionEvents();

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionProcessing.java

@@ -343,7 +343,7 @@ class ActionProcessing extends BaseAction {
 			} catch (Exception e) {
 				logger.error(e);
 			}
-		}, String.format("%record:%s", ActionProcessing.class.getName(), this.task.getId())).start();
+		}, String.format("%s:record:%s", ActionProcessing.class.getName(), this.task.getId())).start();
 	}
 
 	private void processingUpdateTaskCompleted() throws Exception {

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionProcessingSignal.java

@@ -4,7 +4,6 @@ import java.util.Optional;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.x.base.core.project.config.Config;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.processplatform.core.entity.log.SignalStack;
@@ -20,13 +19,9 @@ class ActionProcessingSignal extends BaseAction {
 
 		int loop = 0;
 
-		Thread.sleep(Config.processPlatform().getProcessingSignalThreshold());
-
 		while ((null == wo) && (loop++ < 50)) {
+			Thread.sleep(200);
 			wo = dataReady(activityToken, ThisApplication.getProcessingToProcessingSignalStack().find(id, series));
-			if (null == wo) {
-				Thread.sleep(200);
-			}
 		}
 
 		if (null == wo) {