Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenDocCN
xxl-job
提交
650682d2
X
xxl-job
项目概览
OpenDocCN
/
xxl-job
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
X
xxl-job
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
650682d2
编写于
5月 11, 2017
作者:
X
xueli.xue
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
底层优化
上级
9ab7d469
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
30 addition
and
11 deletion
+30
-11
xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java
...c/main/java/com/xxl/job/core/executor/XxlJobExecutor.java
+5
-1
xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java
.../java/com/xxl/job/core/thread/ExecutorRegistryThread.java
+3
-1
xxl-job-core/src/main/java/com/xxl/job/core/util/AdminApiUtil.java
...ore/src/main/java/com/xxl/job/core/util/AdminApiUtil.java
+22
-9
未找到文件。
xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java
浏览文件 @
650682d2
...
...
@@ -8,6 +8,7 @@ import com.xxl.job.core.rpc.netcom.NetComServerFactory;
import
com.xxl.job.core.thread.ExecutorRegistryThread
;
import
com.xxl.job.core.thread.JobThread
;
import
com.xxl.job.core.thread.TriggerCallbackThread
;
import
com.xxl.job.core.util.AdminApiUtil
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.BeansException
;
...
...
@@ -29,7 +30,7 @@ public class XxlJobExecutor implements ApplicationContextAware, ApplicationListe
private
String
ip
;
private
int
port
=
9999
;
private
String
appName
;
p
ublic
static
String
adminAddresses
;
p
rivate
String
adminAddresses
;
public
static
String
logPath
;
public
void
setIp
(
String
ip
)
{
...
...
@@ -51,6 +52,9 @@ public class XxlJobExecutor implements ApplicationContextAware, ApplicationListe
// ---------------------------------- job server ------------------------------------
private
NetComServerFactory
serverFactory
=
new
NetComServerFactory
();
public
void
start
()
throws
Exception
{
// admin api util init
AdminApiUtil
.
init
(
adminAddresses
);
// executor start
NetComServerFactory
.
putService
(
ExecutorBiz
.
class
,
new
ExecutorBizImpl
());
serverFactory
.
start
(
port
,
ip
,
appName
);
...
...
xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java
浏览文件 @
650682d2
...
...
@@ -24,7 +24,9 @@ public class ExecutorRegistryThread extends Thread {
private
Thread
registryThread
;
private
boolean
toStop
=
false
;
public
void
start
(
final
int
port
,
final
String
ip
,
final
String
appName
){
if
(
appName
==
null
||
appName
.
trim
().
length
()==
0
)
{
// valid
if
(
AdminApiUtil
.
allowCallApi
&&
(
appName
!=
null
&&
appName
.
trim
().
length
()>
0
)
)
{
logger
.
warn
(
">>>>>>>>>>>> xxl-job, executor registry config fail"
);
return
;
}
...
...
xxl-job-core/src/main/java/com/xxl/job/core/util/AdminApiUtil.java
浏览文件 @
650682d2
package
com.xxl.job.core.util
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
com.xxl.job.core.executor.XxlJobExecutor
;
import
org.apache.http.HttpEntity
;
import
org.apache.http.HttpResponse
;
import
org.apache.http.client.config.RequestConfig
;
...
...
@@ -15,7 +14,9 @@ import org.slf4j.LoggerFactory;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Set
;
/**
* @author xuxueli 2017-05-10 21:28:15
...
...
@@ -26,19 +27,31 @@ public class AdminApiUtil {
public
static
final
String
CALLBACK
=
"/api/callback"
;
public
static
final
String
REGISTRY
=
"/api/registry"
;
public
static
ReturnT
<
String
>
callApiFailover
(
String
subUrl
,
Object
requestObj
)
throws
Exception
{
private
static
List
<
String
>
adminAddressList
=
null
;
public
static
boolean
allowCallApi
=
true
;
public
static
void
init
(
String
adminAddresses
){
// admin assress list
List
<
String
>
adminAddressList
=
new
ArrayList
<
String
>();
if
(
XxlJobExecutor
.
adminAddresses
!=
null
)
{
for
(
String
adminAddressItem:
XxlJobExecutor
.
adminAddresses
.
split
(
","
))
{
if
(
adminAddressItem
.
trim
().
length
()>
0
&&
!
adminAddress
Lis
t
.
contains
(
adminAddressItem
))
{
adminAddress
Lis
t
.
add
(
adminAddressItem
);
if
(
adminAddresses
!=
null
)
{
Set
<
String
>
adminAddressSet
=
new
HashSet
<
String
>();
for
(
String
adminAddressItem:
adminAddresses
.
split
(
","
))
{
if
(
adminAddressItem
.
trim
().
length
()>
0
&&
!
adminAddress
Se
t
.
contains
(
adminAddressItem
))
{
adminAddress
Se
t
.
add
(
adminAddressItem
);
}
}
if
(
adminAddressSet
==
null
||
adminAddressSet
.
size
()==
0
)
{
adminAddressList
=
new
ArrayList
<
String
>(
adminAddressSet
);
}
}
if
(
adminAddressList
==
null
||
adminAddressList
.
size
()==
0
)
{
return
ReturnT
.
FAIL
;
// parse
allowCallApi
=
(
adminAddressList
!=
null
&&
adminAddressList
.
size
()>
0
);
}
public
static
ReturnT
<
String
>
callApiFailover
(
String
subUrl
,
Object
requestObj
)
throws
Exception
{
if
(!
allowCallApi
)
{
return
new
ReturnT
<
String
>(
ReturnT
.
FAIL_CODE
,
"allowCallback fail."
);
}
for
(
String
adminAddress:
adminAddressList
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录