修复搜索分类全选时collector为空时的报错.

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

@@ -21,7 +21,7 @@ public class General extends ConfigObject {
 	private static final Boolean DEFAULT_WEBSOCKETENABLE = true;
 	private static final Boolean DEFAULT_CONFIGAPIENABLE = true;
 	private static final List<String> DEFAULT_SCRIPTINGBLOCKEDCLASSES = Arrays.asList(Runtime.class.getName(),
-			File.class.getName(), Path.class.getName(), ProcessBuilder.class.getName());
+			File.class.getName(), Path.class.getName(), java.lang.ProcessBuilder.class.getName());
 	private static final Boolean DEFAULT_REQUESTLOGENABLE = false;
 	private static final Integer DEFAULT_REQUESTLOGRETAINDAYS = 7;
 	private static final Boolean DEFAULT_REQUESTLOGBODYENABLE = false;

o2server/x_console/src/main/java/com/x/server/console/StackTraceTask.java

@@ -33,7 +33,7 @@ public class StackTraceTask implements Job {
 			String file = Config.dir_logs().getAbsolutePath() + "/jstack_" + Config.node() + "_"
 					+ DateTools.format(now, DateTools.formatCompact_yyyyMMddHHmmss) + ".txt";
 			String command = Config.command_jstack_path().toString() + " -l -e " + pid + " > " + file;
-			ProcessBuilder processBuilder = new ProcessBuilder();
+			java.lang.ProcessBuilder processBuilder = new java.lang.ProcessBuilder();
 			if (SystemUtils.IS_OS_WINDOWS) {
 				processBuilder.command("cmd", "/c", command);
 			} else {

o2server/x_console/src/main/java/com/x/server/console/action/HeapDump.java

@@ -24,7 +24,7 @@ public class HeapDump {
 			String file = Config.dir_logs().getAbsolutePath() + "/jmap_" + Config.node() + "_"
 					+ DateTools.format(now, DateTools.formatCompact_yyyyMMddHHmmss) + ".hprof";
 			String command = Config.command_jmap_path().toString() + " -dump:format=b,file=" + file + " " + pid;
-			ProcessBuilder processBuilder = new ProcessBuilder();
+			java.lang.ProcessBuilder processBuilder = new java.lang.ProcessBuilder();
 			if (SystemUtils.IS_OS_WINDOWS) {
 				processBuilder.command("cmd", "/c", command);
 			} else {

o2server/x_console/src/main/java/com/x/server/console/action/ThreadDump.java

@@ -29,7 +29,7 @@ public class ThreadDump {
 			String file = Config.dir_logs().getAbsolutePath() + "/jstack_" + Config.node() + "_"
 					+ DateTools.format(now, DateTools.formatCompact_yyyyMMddHHmmss) + ".txt";
 			String command = Config.command_jstack_path().toString() + " -l -e " + pid + " > " + file;
-			ProcessBuilder processBuilder = new ProcessBuilder();
+			java.lang.ProcessBuilder processBuilder = new java.lang.ProcessBuilder();
 			if (SystemUtils.IS_OS_WINDOWS) {
 				processBuilder.command("cmd", "/c", command);
 			} else {

o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/Business.java

@@ -334,7 +334,7 @@ public class Business {
 
 		LOGGER.debug("enhance command:{}.", () -> command);
 
-		ProcessBuilder processBuilder = new ProcessBuilder();
+		java.lang.ProcessBuilder processBuilder = new java.lang.ProcessBuilder();
 
 		if (SystemUtils.IS_OS_WINDOWS) {
 			processBuilder.command("cmd", "/c", command);

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/search/ActionPost.java

@@ -19,6 +19,7 @@ import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.Collector;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.MultiCollector;
 import org.apache.lucene.search.Query;
@@ -80,6 +81,9 @@ class ActionPost extends BaseAction {
         }
         Analyzer analyzer = new HanLPAnalyzer();
         Optional<Query> searchQuery = this.searchQuery(wi.getQuery(), analyzer);
+        if (searchQuery.isEmpty()) {
+            return result;
+        }
         Optional<Query> readersQuery = Indexs.readersQuery(readers);
         List<Query> filterQueries = Indexs.filterQueries(wi.getFilterList());
 
@@ -110,8 +114,13 @@ class ActionPost extends BaseAction {
                                             org.apache.lucene.search.Sort.INDEXORDER,
                                             facetMaxGroups)))
                     .collect(Collectors.toList());
-            searcher.search(query, MultiCollector.wrap(topScoreDocCollector, MultiCollector
-                    .wrap(firstPassGroupingCollectorPairs.stream().map(Pair::second).collect(Collectors.toList()))));
+
+            List<Collector> collectors = firstPassGroupingCollectorPairs.stream().map(Pair::second)
+                    .collect(Collectors.toList());
+
+            collectors.add(topScoreDocCollector);
+
+            searcher.search(query, MultiCollector.wrap(collectors));
             writeDocument(searcher, analyzer, highlighter, topScoreDocCollector, start, rows, wo);
             List<Pair<String, TopGroupsCollector<BytesRef>>> topGroupsCollectorPairs = firstPassGroupingCollectorPairs
                     .stream().<Pair<String, Optional<Collection<SearchGroup<BytesRef>>>>>map(param -> {

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/search/BaseAction.java

@@ -42,8 +42,7 @@ abstract class BaseAction extends StandardJaxrsAction {
     protected Optional<Query> searchQuery(String query, Analyzer analyzer) throws Exception {
         query = Indexs.alignQuery(query);
         if (StringUtils.isBlank(query)) {
-            // return Optional.of(new MatchAllDocsQuery());
-            throw new ExceptionQueryEmpty();
+            return Optional.empty();
         }
         Query titleQuery = new QueryParser(Indexs.FIELD_TITLE, analyzer).parse(query);
         Query summaryQuery = new QueryParser(Indexs.FIELD_SUMMARY, analyzer).parse(query);

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/search/ExceptionQueryEmpty.java

-package com.x.query.assemble.surface.jaxrs.search;
-
-import com.x.base.core.project.exception.LanguagePromptException;
-
-class ExceptionQueryEmpty extends LanguagePromptException {
-
-    ExceptionQueryEmpty() {
-        super("搜索条件不能为空.");
-    }
-
-}