Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
X
XXL-JOB
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
靳帅
XXL-JOB
Commits
0e1eb6cb
提交
0e1eb6cb
authored
4月 11, 2020
作者:
xuxueli
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
调度中心与执行器通讯规范为双向restful,方便跨语言,以及第三方执行器实现;通讯组件xxl-rpc方案调整为Jetty+Gson方案;
上级
895ad80e
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
20 行增加
和
20 行删除
+20
-20
XXL-JOB官方文档.md
doc/XXL-JOB官方文档.md
+0
-0
XxlJobExecutor.java
...c/main/java/com/xxl/job/core/executor/XxlJobExecutor.java
+4
-4
EmbedServer.java
...re/src/main/java/com/xxl/job/core/server/EmbedServer.java
+4
-4
ExecutorRegistryThread.java
.../java/com/xxl/job/core/thread/ExecutorRegistryThread.java
+5
-5
FrameLessXxlJobConfig.java
...ecutor/sample/frameless/config/FrameLessXxlJobConfig.java
+1
-1
JbootConfig.java
...com/xuxueli/executor/sample/jboot/config/JbootConfig.java
+1
-1
JFinalCoreConfig.java
...xueli/executor/sample/jfinal/config/JFinalCoreConfig.java
+1
-1
NutzSetup.java
...va/com/xuxueli/executor/sample/nutz/config/NutzSetup.java
+1
-1
applicationcontext-xxl-job.xml
...-spring/src/main/resources/applicationcontext-xxl-job.xml
+1
-1
XxlJobConfig.java
...n/java/com/xxl/job/executor/core/config/XxlJobConfig.java
+2
-2
没有找到文件。
doc/XXL-JOB官方文档.md
浏览文件 @
0e1eb6cb
差异被折叠。
点击展开。
xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java
浏览文件 @
0e1eb6cb
...
...
@@ -28,7 +28,7 @@ public class XxlJobExecutor {
// ---------------------- param ----------------------
private
String
adminAddresses
;
private
String
accessToken
;
private
String
app
N
ame
;
private
String
app
n
ame
;
private
String
address
;
private
String
ip
;
private
int
port
;
...
...
@@ -41,8 +41,8 @@ public class XxlJobExecutor {
public
void
setAccessToken
(
String
accessToken
)
{
this
.
accessToken
=
accessToken
;
}
public
void
setApp
Name
(
String
appN
ame
)
{
this
.
app
Name
=
appN
ame
;
public
void
setApp
name
(
String
appn
ame
)
{
this
.
app
name
=
appn
ame
;
}
public
void
setAddress
(
String
address
)
{
this
.
address
=
address
;
...
...
@@ -78,7 +78,7 @@ public class XxlJobExecutor {
TriggerCallbackThread
.
getInstance
().
start
();
// init executor-server
initEmbedServer
(
address
,
ip
,
port
,
app
N
ame
,
accessToken
);
initEmbedServer
(
address
,
ip
,
port
,
app
n
ame
,
accessToken
);
}
public
void
destroy
(){
// destory executor-server
...
...
xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java
浏览文件 @
0e1eb6cb
...
...
@@ -35,7 +35,7 @@ public class EmbedServer {
private
ExecutorBiz
executorBiz
;
private
Thread
thread
;
public
void
start
(
final
String
address
,
final
int
port
,
final
String
app
N
ame
,
final
String
accessToken
)
{
public
void
start
(
final
String
address
,
final
int
port
,
final
String
app
n
ame
,
final
String
accessToken
)
{
executorBiz
=
new
ExecutorBizImpl
();
thread
=
new
Thread
(
new
Runnable
()
{
...
...
@@ -69,7 +69,7 @@ public class EmbedServer {
logger
.
info
(
">>>>>>>>>>> xxl-job remoting server start success, nettype = {}, port = {}"
,
EmbedServer
.
class
,
port
);
// start registry
startRegistry
(
app
N
ame
,
address
);
startRegistry
(
app
n
ame
,
address
);
// wait util stop
future
.
channel
().
closeFuture
().
sync
();
...
...
@@ -227,9 +227,9 @@ public class EmbedServer {
// ---------------------- registry ----------------------
public
void
startRegistry
(
final
String
app
N
ame
,
final
String
address
)
{
public
void
startRegistry
(
final
String
app
n
ame
,
final
String
address
)
{
// start registry
ExecutorRegistryThread
.
getInstance
().
start
(
app
N
ame
,
address
);
ExecutorRegistryThread
.
getInstance
().
start
(
app
n
ame
,
address
);
}
public
void
stopRegistry
()
{
...
...
xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java
浏览文件 @
0e1eb6cb
...
...
@@ -23,11 +23,11 @@ public class ExecutorRegistryThread {
private
Thread
registryThread
;
private
volatile
boolean
toStop
=
false
;
public
void
start
(
final
String
app
N
ame
,
final
String
address
){
public
void
start
(
final
String
app
n
ame
,
final
String
address
){
// valid
if
(
app
Name
==
null
||
appN
ame
.
trim
().
length
()==
0
)
{
logger
.
warn
(
">>>>>>>>>>> xxl-job, executor registry config fail, app
N
ame is null."
);
if
(
app
name
==
null
||
appn
ame
.
trim
().
length
()==
0
)
{
logger
.
warn
(
">>>>>>>>>>> xxl-job, executor registry config fail, app
n
ame is null."
);
return
;
}
if
(
XxlJobExecutor
.
getAdminBizList
()
==
null
)
{
...
...
@@ -42,7 +42,7 @@ public class ExecutorRegistryThread {
// registry
while
(!
toStop
)
{
try
{
RegistryParam
registryParam
=
new
RegistryParam
(
RegistryConfig
.
RegistType
.
EXECUTOR
.
name
(),
app
N
ame
,
address
);
RegistryParam
registryParam
=
new
RegistryParam
(
RegistryConfig
.
RegistType
.
EXECUTOR
.
name
(),
app
n
ame
,
address
);
for
(
AdminBiz
adminBiz:
XxlJobExecutor
.
getAdminBizList
())
{
try
{
ReturnT
<
String
>
registryResult
=
adminBiz
.
registry
(
registryParam
);
...
...
@@ -78,7 +78,7 @@ public class ExecutorRegistryThread {
// registry remove
try
{
RegistryParam
registryParam
=
new
RegistryParam
(
RegistryConfig
.
RegistType
.
EXECUTOR
.
name
(),
app
N
ame
,
address
);
RegistryParam
registryParam
=
new
RegistryParam
(
RegistryConfig
.
RegistType
.
EXECUTOR
.
name
(),
app
n
ame
,
address
);
for
(
AdminBiz
adminBiz:
XxlJobExecutor
.
getAdminBizList
())
{
try
{
ReturnT
<
String
>
registryResult
=
adminBiz
.
registryRemove
(
registryParam
);
...
...
xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xuxueli/executor/sample/frameless/config/FrameLessXxlJobConfig.java
浏览文件 @
0e1eb6cb
...
...
@@ -46,7 +46,7 @@ public class FrameLessXxlJobConfig {
xxlJobExecutor
=
new
XxlJobExecutor
();
xxlJobExecutor
.
setAdminAddresses
(
xxlJobProp
.
getProperty
(
"xxl.job.admin.addresses"
));
xxlJobExecutor
.
setAccessToken
(
xxlJobProp
.
getProperty
(
"xxl.job.accessToken"
));
xxlJobExecutor
.
setApp
N
ame
(
xxlJobProp
.
getProperty
(
"xxl.job.executor.appname"
));
xxlJobExecutor
.
setApp
n
ame
(
xxlJobProp
.
getProperty
(
"xxl.job.executor.appname"
));
xxlJobExecutor
.
setAddress
(
xxlJobProp
.
getProperty
(
"xxl.job.executor.address"
));
xxlJobExecutor
.
setIp
(
xxlJobProp
.
getProperty
(
"xxl.job.executor.ip"
));
xxlJobExecutor
.
setPort
(
Integer
.
valueOf
(
xxlJobProp
.
getProperty
(
"xxl.job.executor.port"
)));
...
...
xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/config/JbootConfig.java
浏览文件 @
0e1eb6cb
...
...
@@ -29,7 +29,7 @@ public class JbootConfig extends JbootAppListenerBase {
xxlJobExecutor
.
setAdminAddresses
(
Jboot
.
configValue
(
"xxl.job.admin.addresses"
));
xxlJobExecutor
.
setAccessToken
(
Jboot
.
configValue
(
"xxl.job.accessToken"
));
xxlJobExecutor
.
setAddress
(
Jboot
.
configValue
(
"xxl.job.executor.address"
));
xxlJobExecutor
.
setApp
N
ame
(
Jboot
.
configValue
(
"xxl.job.executor.appname"
));
xxlJobExecutor
.
setApp
n
ame
(
Jboot
.
configValue
(
"xxl.job.executor.appname"
));
xxlJobExecutor
.
setIp
(
Jboot
.
configValue
(
"xxl.job.executor.ip"
));
xxlJobExecutor
.
setPort
(
Integer
.
valueOf
(
Jboot
.
configValue
(
"xxl.job.executor.port"
)));
xxlJobExecutor
.
setLogPath
(
Jboot
.
configValue
(
"xxl.job.executor.logpath"
));
...
...
xxl-job-executor-samples/xxl-job-executor-sample-jfinal/src/main/java/com/xuxueli/executor/sample/jfinal/config/JFinalCoreConfig.java
浏览文件 @
0e1eb6cb
...
...
@@ -36,7 +36,7 @@ public class JFinalCoreConfig extends JFinalConfig {
xxlJobExecutor
.
setAdminAddresses
(
xxlJobProp
.
get
(
"xxl.job.admin.addresses"
));
xxlJobExecutor
.
setAccessToken
(
xxlJobProp
.
get
(
"xxl.job.accessToken"
));
xxlJobExecutor
.
setAddress
(
xxlJobProp
.
get
(
"xxl.job.executor.address"
));
xxlJobExecutor
.
setApp
N
ame
(
xxlJobProp
.
get
(
"xxl.job.executor.appname"
));
xxlJobExecutor
.
setApp
n
ame
(
xxlJobProp
.
get
(
"xxl.job.executor.appname"
));
xxlJobExecutor
.
setIp
(
xxlJobProp
.
get
(
"xxl.job.executor.ip"
));
xxlJobExecutor
.
setPort
(
xxlJobProp
.
getInt
(
"xxl.job.executor.port"
));
...
...
xxl-job-executor-samples/xxl-job-executor-sample-nutz/src/main/java/com/xuxueli/executor/sample/nutz/config/NutzSetup.java
浏览文件 @
0e1eb6cb
...
...
@@ -37,7 +37,7 @@ public class NutzSetup implements Setup {
xxlJobExecutor
=
new
XxlJobExecutor
();
xxlJobExecutor
.
setAdminAddresses
(
xxlJobProp
.
get
(
"xxl.job.admin.addresses"
));
xxlJobExecutor
.
setAccessToken
(
xxlJobProp
.
get
(
"xxl.job.accessToken"
));
xxlJobExecutor
.
setApp
N
ame
(
xxlJobProp
.
get
(
"xxl.job.executor.appname"
));
xxlJobExecutor
.
setApp
n
ame
(
xxlJobProp
.
get
(
"xxl.job.executor.appname"
));
xxlJobExecutor
.
setAddress
(
xxlJobProp
.
get
(
"xxl.job.executor.address"
));
xxlJobExecutor
.
setIp
(
xxlJobProp
.
get
(
"xxl.job.executor.ip"
));
xxlJobExecutor
.
setPort
(
xxlJobProp
.
getInt
(
"xxl.job.executor.port"
));
...
...
xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/applicationcontext-xxl-job.xml
浏览文件 @
0e1eb6cb
...
...
@@ -28,7 +28,7 @@
<!-- 访问令牌[选填],非空则进行匹配校验 -->
<property
name=
"accessToken"
value=
"${xxl.job.accessToken}"
/>
<!-- 执行器AppName[选填],为空则关闭自动注册 -->
<property
name=
"app
N
ame"
value=
"${xxl.job.executor.appname}"
/>
<property
name=
"app
n
ame"
value=
"${xxl.job.executor.appname}"
/>
<!-- 注册地址[选填],优先使用该配置作为注册地址,为空时使用内嵌服务 ”IP:PORT“ 作为注册地址 -->
<property
name=
"address"
value=
"${xxl.job.executor.address}"
/>
<!-- 执行器IP[选填],为空则自动获取 -->
...
...
xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
浏览文件 @
0e1eb6cb
...
...
@@ -23,7 +23,7 @@ public class XxlJobConfig {
private
String
accessToken
;
@Value
(
"${xxl.job.executor.appname}"
)
private
String
app
N
ame
;
private
String
app
n
ame
;
@Value
(
"${xxl.job.executor.address}"
)
private
String
address
;
...
...
@@ -46,7 +46,7 @@ public class XxlJobConfig {
logger
.
info
(
">>>>>>>>>>> xxl-job config init."
);
XxlJobSpringExecutor
xxlJobSpringExecutor
=
new
XxlJobSpringExecutor
();
xxlJobSpringExecutor
.
setAdminAddresses
(
adminAddresses
);
xxlJobSpringExecutor
.
setApp
Name
(
appN
ame
);
xxlJobSpringExecutor
.
setApp
name
(
appn
ame
);
xxlJobSpringExecutor
.
setAddress
(
address
);
xxlJobSpringExecutor
.
setIp
(
ip
);
xxlJobSpringExecutor
.
setPort
(
port
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论