Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
ecf7edd0
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,发现更多精彩内容 >>
提交
ecf7edd0
编写于
9月 24, 2021
作者:
O
o2null
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'cherry-pick-6243b5d9' into 'wrdp'
扩大timeout See merge request o2oa/o2oa!5589
上级
017edbd7
427ce025
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
4 deletion
+4
-4
o2server/x_console/src/main/java/com/x/server/console/node/RegistApplicationsEvent.java
...va/com/x/server/console/node/RegistApplicationsEvent.java
+2
-2
o2server/x_console/src/main/java/com/x/server/console/node/UpdateApplicationsEvent.java
...va/com/x/server/console/node/UpdateApplicationsEvent.java
+1
-1
o2server/x_console/src/main/java/com/x/server/console/node/VoteCenterEvent.java
.../main/java/com/x/server/console/node/VoteCenterEvent.java
+1
-1
未找到文件。
o2server/x_console/src/main/java/com/x/server/console/node/RegistApplicationsEvent.java
浏览文件 @
ecf7edd0
...
@@ -63,7 +63,7 @@ public class RegistApplicationsEvent implements Event {
...
@@ -63,7 +63,7 @@ public class RegistApplicationsEvent implements Event {
req
.
setValue
(
gson
.
toJson
(
list
));
req
.
setValue
(
gson
.
toJson
(
list
));
for
(
Entry
<
String
,
CenterServer
>
entry
:
Config
.
nodes
().
centerServers
().
orderedEntry
())
{
for
(
Entry
<
String
,
CenterServer
>
entry
:
Config
.
nodes
().
centerServers
().
orderedEntry
())
{
CipherConnectionAction
.
put
(
false
,
1000
,
2
000
,
CipherConnectionAction
.
put
(
false
,
4000
,
8
000
,
Config
.
url_x_program_center_jaxrs
(
entry
,
"center"
,
"regist"
,
"applications"
),
req
);
Config
.
url_x_program_center_jaxrs
(
entry
,
"center"
,
"regist"
,
"applications"
),
req
);
}
}
...
@@ -124,7 +124,7 @@ public class RegistApplicationsEvent implements Event {
...
@@ -124,7 +124,7 @@ public class RegistApplicationsEvent implements Event {
private
CompletableFuture
<
Long
>
healthCheckTask
(
Application
application
)
{
private
CompletableFuture
<
Long
>
healthCheckTask
(
Application
application
)
{
return
CompletableFuture
.
supplyAsync
(()
->
{
return
CompletableFuture
.
supplyAsync
(()
->
{
try
{
try
{
Resp
resp
=
CipherConnectionAction
.
get
(
false
,
1000
,
1
000
,
application
,
"echo"
).
getData
(
Resp
.
class
);
Resp
resp
=
CipherConnectionAction
.
get
(
false
,
2000
,
4
000
,
application
,
"echo"
).
getData
(
Resp
.
class
);
Date
date
=
resp
.
getServerTime
();
Date
date
=
resp
.
getServerTime
();
return
Math
.
abs
(
date
.
getTime
()
-
((
new
Date
()).
getTime
()));
return
Math
.
abs
(
date
.
getTime
()
-
((
new
Date
()).
getTime
()));
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
o2server/x_console/src/main/java/com/x/server/console/node/UpdateApplicationsEvent.java
浏览文件 @
ecf7edd0
...
@@ -24,7 +24,7 @@ public class UpdateApplicationsEvent implements Event {
...
@@ -24,7 +24,7 @@ public class UpdateApplicationsEvent implements Event {
public
void
execute
(
Server
applicationServer
)
{
public
void
execute
(
Server
applicationServer
)
{
try
{
try
{
if
((
null
!=
applicationServer
)
&&
applicationServer
.
isStarted
())
{
if
((
null
!=
applicationServer
)
&&
applicationServer
.
isStarted
())
{
ActionResponse
respone
=
CipherConnectionAction
.
get
(
false
,
1000
,
2
000
,
ActionResponse
respone
=
CipherConnectionAction
.
get
(
false
,
4000
,
8
000
,
Config
.
url_x_program_center_jaxrs
(
"center"
,
"applications"
));
Config
.
url_x_program_center_jaxrs
(
"center"
,
"applications"
));
Applications
applications
=
respone
.
getData
(
Applications
.
class
);
Applications
applications
=
respone
.
getData
(
Applications
.
class
);
Config
.
resource_node_applications
(
XGsonBuilder
.
instance
().
toJsonTree
(
applications
));
Config
.
resource_node_applications
(
XGsonBuilder
.
instance
().
toJsonTree
(
applications
));
...
...
o2server/x_console/src/main/java/com/x/server/console/node/VoteCenterEvent.java
浏览文件 @
ecf7edd0
...
@@ -29,7 +29,7 @@ public class VoteCenterEvent implements Event {
...
@@ -29,7 +29,7 @@ public class VoteCenterEvent implements Event {
List
<
Entry
<
String
,
CenterServer
>>
list
=
listCenterServer
();
List
<
Entry
<
String
,
CenterServer
>>
list
=
listCenterServer
();
for
(
Entry
<
String
,
CenterServer
>
entry
:
list
)
{
for
(
Entry
<
String
,
CenterServer
>
entry
:
list
)
{
try
{
try
{
ActionResponse
response
=
CipherConnectionAction
.
get
(
false
,
1000
,
2
000
,
ActionResponse
response
=
CipherConnectionAction
.
get
(
false
,
4000
,
8
000
,
Config
.
url_x_program_center_jaxrs
(
entry
,
"echo"
));
Config
.
url_x_program_center_jaxrs
(
entry
,
"echo"
));
JsonElement
jsonElement
=
response
.
getData
(
JsonElement
.
class
);
JsonElement
jsonElement
=
response
.
getData
(
JsonElement
.
class
);
if
(
null
!=
jsonElement
&&
(!
jsonElement
.
isJsonNull
()))
{
if
(
null
!=
jsonElement
&&
(!
jsonElement
.
isJsonNull
()))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录