Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
877fe0e7
o2oa
项目概览
ghsby
/
o2oa
落后 Fork 源项目 2880 个版本
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
877fe0e7
编写于
12月 14, 2022
作者:
Z
zhourui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复搜索分类全选时collector为空时的报错.
上级
79b8532e
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
17 addition
and
20 deletion
+17
-20
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/General.java
...src/main/java/com/x/base/core/project/config/General.java
+1
-1
o2server/x_console/src/main/java/com/x/server/console/StackTraceTask.java
...le/src/main/java/com/x/server/console/StackTraceTask.java
+1
-1
o2server/x_console/src/main/java/com/x/server/console/action/HeapDump.java
...e/src/main/java/com/x/server/console/action/HeapDump.java
+1
-1
o2server/x_console/src/main/java/com/x/server/console/action/ThreadDump.java
...src/main/java/com/x/server/console/action/ThreadDump.java
+1
-1
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/Business.java
...src/main/java/com/x/query/assemble/designer/Business.java
+1
-1
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/search/ActionPost.java
...com/x/query/assemble/surface/jaxrs/search/ActionPost.java
+11
-2
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/search/BaseAction.java
...com/x/query/assemble/surface/jaxrs/search/BaseAction.java
+1
-2
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/search/ExceptionQueryEmpty.java
...ry/assemble/surface/jaxrs/search/ExceptionQueryEmpty.java
+0
-11
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/General.java
浏览文件 @
877fe0e7
...
...
@@ -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
浏览文件 @
877fe0e7
...
...
@@ -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
浏览文件 @
877fe0e7
...
...
@@ -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
浏览文件 @
877fe0e7
...
...
@@ -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
浏览文件 @
877fe0e7
...
...
@@ -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
浏览文件 @
877fe0e7
...
...
@@ -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
浏览文件 @
877fe0e7
...
...
@@ -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
已删除
100644 → 0
浏览文件 @
79b8532e
package
com.x.query.assemble.surface.jaxrs.search
;
import
com.x.base.core.project.exception.LanguagePromptException
;
class
ExceptionQueryEmpty
extends
LanguagePromptException
{
ExceptionQueryEmpty
()
{
super
(
"搜索条件不能为空."
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录