Merge branch 'cherry-pick-ff56acd2' into 'master'

Merge branch 'feature/segment_enable' into 'develop'

See merge request o2oa/o2oa!1052

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

@@ -105,11 +105,11 @@ public class Query extends ConfigObject {
 			return o;
 		}
 
-		public final static Boolean DEFAULT_ENABLE = false;
+		public final static Boolean DEFAULT_ENABLE = true;
 
-		public final static String DEFAULT_CRON = "30 30 7-21 * * ?";
+		public final static String DEFAULT_CRON = "30 30 9,12,15,18 * * ?";
 
-		public final static Integer DEFAULT_CONUT = 100;
+		public final static Integer DEFAULT_CONUT = 30;
 
 		public final static Integer DEFAULT_MAXATTACHMENTSIZE = 1024 * 1024 * 5;
 
@@ -119,7 +119,7 @@ public class Query extends ConfigObject {
 		@FieldDescribe("定时cron表达式.")
 		private String cron = DEFAULT_CRON;
 
-		@FieldDescribe("每次处理的数量,默认每小时处理所以默认为100,同时每次将重爬最旧的50%,按时间轮询50%.")
+		@FieldDescribe("每次处理的数量,默认每小时处理所以默认为30,同时每次将重爬最旧的50%,按时间轮询50%.")
 		private Integer count = DEFAULT_CONUT;
 
 		@FieldDescribe("忽略附件名称.")
@@ -180,12 +180,12 @@ public class Query extends ConfigObject {
 			return o;
 		}
 
-		public final static Boolean DEFAULT_ENABLE = false;
+		public final static Boolean DEFAULT_ENABLE = true;
 
-		public final static String DEFAULT_CRON = "40 40 7-21 * * ?";
+		public final static String DEFAULT_CRON = "40 40 10,12,14,16 * * ?";
 
 		/* 由于每小时运行,那么每次更新100份 */
-		public final static Integer DEFAULT_CONUT = 100;
+		public final static Integer DEFAULT_CONUT = 50;
 
 		public final static Integer DEFAULT_MAXATTACHMENTSIZE = 1024 * 1024 * 5;
 
@@ -195,7 +195,7 @@ public class Query extends ConfigObject {
 		@FieldDescribe("定时cron表达式.")
 		private String cron = DEFAULT_CRON;
 
-		@FieldDescribe("每次处理的数量,默认每小时处理所以默认为100,同时每次将重爬最旧的50%,按时间轮询50%.")
+		@FieldDescribe("每次处理的数量,默认每小时处理所以默认为50,同时每次将重爬最旧的50%,按时间轮询50%.")
 		private Integer count = DEFAULT_CONUT;
 
 		@FieldDescribe("忽略附件名称.")
@@ -268,11 +268,11 @@ public class Query extends ConfigObject {
 			return o;
 		}
 
-		public final static Boolean DEFAULT_ENABLE = false;
+		public final static Boolean DEFAULT_ENABLE = true;
 
-		public final static String DEFAULT_CRON = "50 50 22 * * ?";
+		public final static String DEFAULT_CRON = "50 50 21 * * ?";
 
-		public final static Integer DEFAULT_CONUT = 2000;
+		public final static Integer DEFAULT_CONUT = 500;
 
 		public final static Integer DEFAULT_MAXATTACHMENTSIZE = 1024 * 1024 * 5;
 
@@ -282,7 +282,7 @@ public class Query extends ConfigObject {
 		@FieldDescribe("定时cron表达式.")
 		private String cron = DEFAULT_CRON;
 
-		@FieldDescribe("每次处理的数量,默认每小时处理所以默认为2000,同时每次将重爬最旧的25%,按时间轮询25%.")
+		@FieldDescribe("每次处理的数量,默认每小时处理所以默认为500,同时每次将重爬最旧的25%,按时间轮询25%.")
 		private Integer count = DEFAULT_CONUT;
 
 		@FieldDescribe("忽略附件名称.")

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/segment/ActionCrawlEnable.java

@@ -2,6 +2,7 @@ package com.x.query.assemble.surface.jaxrs.segment;
 
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
+import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.gson.GsonPropertyObject;
 import com.x.base.core.project.http.ActionResult;
@@ -31,12 +32,16 @@ class ActionCrawlEnable extends BaseAction {
 
 	public static class Wo extends GsonPropertyObject {
 
+		@FieldDescribe("是否启用,cms,work,workCompleted中有任意一项启用即为启用.")
 		private Boolean enable;
 
+		@FieldDescribe("是否启用cms检索")
 		private Boolean cms;
 
+		@FieldDescribe("是否启用work检索")
 		private Boolean work;
 
+		@FieldDescribe("是否启用workCompleted检索")
 		private Boolean workCompleted;
 
 		public Boolean getEnable() {