Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
6b2454b1
o2oa
项目概览
weixin_42566577
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
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,发现更多精彩内容 >>
提交
6b2454b1
编写于
11月 26, 2021
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
自建表分应用编译2
上级
d817bca8
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
26 addition
and
22 deletion
+26
-22
o2server/x_console/src/main/java/com/x/server/console/server/JettySeverTools.java
...ain/java/com/x/server/console/server/JettySeverTools.java
+7
-4
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionBuildTable.java
...query/assemble/designer/jaxrs/table/ActionBuildTable.java
+1
-0
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionBuildTableDispatch.java
...semble/designer/jaxrs/table/ActionBuildTableDispatch.java
+18
-18
未找到文件。
o2server/x_console/src/main/java/com/x/server/console/server/JettySeverTools.java
浏览文件 @
6b2454b1
...
@@ -9,6 +9,9 @@ import java.util.ArrayList;
...
@@ -9,6 +9,9 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Stream
;
import
java.util.stream.Stream
;
import
com.x.base.core.entity.dynamic.DynamicBaseEntity
;
import
com.x.base.core.entity.dynamic.DynamicEntity
;
import
com.x.base.core.project.tools.ListTools
;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.io.filefilter.FileFilterUtils
;
import
org.apache.commons.io.filefilter.FileFilterUtils
;
import
org.apache.commons.io.filefilter.IOFileFilter
;
import
org.apache.commons.io.filefilter.IOFileFilter
;
...
@@ -90,10 +93,10 @@ public abstract class JettySeverTools {
...
@@ -90,10 +93,10 @@ public abstract class JettySeverTools {
jars
.
add
(
file
.
getAbsolutePath
());
jars
.
add
(
file
.
getAbsolutePath
());
}
}
}
}
for
(
String
str
:
module
.
dynamicJars
()
)
{
if
(
module
.
dynamicJars
()!=
null
&&
module
.
dynamicJars
().
length
>
0
)
{
File
file
=
new
File
(
Config
.
dir_dynamic_jars
(),
str
+
"
.jar"
);
IOFileFilter
filter
=
new
WildcardFileFilter
(
DynamicEntity
.
JAR_PREFIX
+
"*
.jar"
);
if
(
file
.
exists
(
))
{
for
(
File
o
:
FileUtils
.
listFiles
(
Config
.
dir_dynamic_jars
(),
filter
,
null
))
{
jars
.
add
(
file
.
getAbsolutePath
());
jars
.
add
(
o
.
getAbsolutePath
());
}
}
}
}
for
(
Path
path
:
paths
)
{
for
(
Path
path
:
paths
)
{
...
...
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionBuildTable.java
浏览文件 @
6b2454b1
...
@@ -40,6 +40,7 @@ class ActionBuildTable extends BaseAction {
...
@@ -40,6 +40,7 @@ class ActionBuildTable extends BaseAction {
for
(
Query
query
:
queryList
){
for
(
Query
query
:
queryList
){
business
.
buildAllTable
(
query
.
getId
());
business
.
buildAllTable
(
query
.
getId
());
}
}
jar
.
delete
();
wo
.
setValue
(
true
);
wo
.
setValue
(
true
);
}
else
{
}
else
{
wo
.
setValue
(
business
.
buildAllTable
(
queryId
));
wo
.
setValue
(
business
.
buildAllTable
(
queryId
));
...
...
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionBuildTableDispatch.java
浏览文件 @
6b2454b1
...
@@ -25,9 +25,9 @@ class ActionBuildTableDispatch extends BaseAction {
...
@@ -25,9 +25,9 @@ class ActionBuildTableDispatch extends BaseAction {
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ActionBuildTableDispatch
.
class
);
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ActionBuildTableDispatch
.
class
);
ActionResult
<
Wo
>
execute
(
EffectivePerson
effectivePerson
,
String
queryId
)
throws
Exception
{
ActionResult
<
Wo
>
execute
(
EffectivePerson
effectivePerson
,
String
queryId
)
throws
Exception
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
Wo
wo
=
new
Wo
();
Wo
wo
=
new
Wo
();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Business
business
=
new
Business
(
emc
);
Business
business
=
new
Business
(
emc
);
if
(!
business
.
controllable
(
effectivePerson
))
{
if
(!
business
.
controllable
(
effectivePerson
))
{
throw
new
ExceptionAccessDenied
(
effectivePerson
);
throw
new
ExceptionAccessDenied
(
effectivePerson
);
...
@@ -36,6 +36,7 @@ class ActionBuildTableDispatch extends BaseAction {
...
@@ -36,6 +36,7 @@ class ActionBuildTableDispatch extends BaseAction {
if
(
null
==
query
)
{
if
(
null
==
query
)
{
throw
new
ExceptionEntityNotExist
(
queryId
,
Query
.
class
);
throw
new
ExceptionEntityNotExist
(
queryId
,
Query
.
class
);
}
}
}
List
<
Application
>
apps
=
ThisApplication
.
context
().
applications
().
get
(
x_query_assemble_designer
.
class
);
List
<
Application
>
apps
=
ThisApplication
.
context
().
applications
().
get
(
x_query_assemble_designer
.
class
);
if
(
ListTools
.
isNotEmpty
(
apps
))
{
if
(
ListTools
.
isNotEmpty
(
apps
))
{
apps
.
stream
().
forEach
(
o
->
{
apps
.
stream
().
forEach
(
o
->
{
...
@@ -54,7 +55,6 @@ class ActionBuildTableDispatch extends BaseAction {
...
@@ -54,7 +55,6 @@ class ActionBuildTableDispatch extends BaseAction {
return
result
;
return
result
;
}
}
}
public
static
class
Wo
extends
WrapBoolean
{
public
static
class
Wo
extends
WrapBoolean
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录