Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
iBiz4j Spring R7
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz-R7后台标准模板
iBiz4j Spring R7
提交
0506375f
提交
0506375f
编写于
6月 19, 2020
作者:
zhouweidong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
xxl-job更换为baomidou jobs
上级
87ec4f4b
变更
5
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
36 行增加
和
101 行删除
+36
-101
pom.xml.ftl
SLN/%PUBPRJ%-core/pom.xml.ftl
+3
-3
XxlJobConfig.java.ftl
...java/%SYS_PKGPATH%/core/util/config/XxlJobConfig.java.ftl
+14
-72
%ITEM%JobHandler.java.ftl
...ava/%SYS_PKGPATH%/core/util/job/%ITEM%JobHandler.java.ftl
+8
-9
pom.xml.ftl
SLN/%PUBPRJ%-dependencies/pom.xml.ftl
+5
-5
application-sys.yml.ftl
SLN/%PUBPRJ%-util/src/main/resources/application-sys.yml.ftl
+6
-12
未找到文件。
SLN/%PUBPRJ%-core/pom.xml.ftl
浏览文件 @
0506375f
...
...
@@ -95,10 +95,10 @@ TARGET=PSSYSTEM
<artifactId>liquibase-core</artifactId>
</dependency>
<!--
xxl-job
定时服务 -->
<!--
baomidou-jobs
定时服务 -->
<dependency>
<groupId>com.
xuxueli
</groupId>
<artifactId>
xxl-job-core
</artifactId>
<groupId>com.
baomidou
</groupId>
<artifactId>
jobs-spring-boot-starter
</artifactId>
</dependency>
</dependencies>
...
...
SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/util/config/XxlJobConfig.java.ftl
浏览文件 @
0506375f
...
...
@@ -2,82 +2,24 @@
TARGET
=
PSSYSTEM
</#
ibiztemplate
>
package
${
pub
.
getPKGCodeName
()}.
core
.
util
.
config
;
<#
assign
enableBackService
=
false
>
<#
if
sys
.
getAllPSSysBackServices
()??>
<#
list
sys
.
getAllPSSysBackServices
()
as
backService
>
<#
assign
enableBackService
=
true
>
<#
break
>
</#
list
>
</#
if
>
import
com
.
xxl
.
job
.
core
.
executor
.
impl
.
XxlJobSpringExecutor
;
import
org
.
slf4j
.
Logger
;
import
org
.
slf4j
.
LoggerFactory
;
import
org
.
springframework
.
beans
.
factory
.
annotation
.
Value
;
import
org
.
springframework
.
context
.
annotation
.
Bean
;
import
org
.
springframework
.
context
.
annotation
.
Configuration
;
import
org
.
springframework
.
util
.
StringUtils
;
<#
if
enableBackService
>
import
com
.
baomidou
.
jobs
.
starter
.
EnableJobs
;
</#
if
>
/**
*
xxl
-
job
config
*
分布式任务调度平台
XXL
-
JOB
配置加载
*
@
author
xuxueli
2017
-
04
-
28
*/
<#
if
enableBackService
>
@
EnableJobs
</#
if
>
@
Configuration
public
class
XxlJobConfig
{
private
Logger
logger
=
LoggerFactory
.
getLogger
(
XxlJobConfig
.
class
);
@
Value
(
"${r'${xxl.job.admin.addresses:}'}"
)
private
String
adminAddresses
;
@
Value
(
"${r'${xxl.job.accessToken:}'}"
)
private
String
accessToken
;
@
Value
(
"${r'$'}{xxl.job.executor.appname:${sys.getName()}}"
)
private
String
appName
;
@
Value
(
"${r'${xxl.job.executor.ip:127.0.0.1}'}"
)
private
String
ip
;
@
Value
(
"${r'${xxl.job.executor.port:9999}'}"
)
private
int
port
;
@
Value
(
"${r'${xxl.job.executor.logpath:/app/joblog}'}"
)
private
String
logPath
;
@
Value
(
"${r'${xxl.job.executor.logretentiondays:-1}'}"
)
private
int
logRetentionDays
;
@
Bean
(
initMethod
=
"start"
,
destroyMethod
=
"destroy"
)
public
XxlJobSpringExecutor
xxlJobExecutor
()
{
if
(
!StringUtils.isEmpty(adminAddresses)){
logger
.
info
(
">>>>>>>>>>> xxl-job config init."
);
logger
.
info
(
">>>>>>>>>>> adminAddresses:"
+
adminAddresses
);
logger
.
info
(
">>>>>>>>>>> appName:"
+
appName
);
logger
.
info
(
">>>>>>>>>>> ip:"
+
ip
);
logger
.
info
(
">>>>>>>>>>> port:"
+
port
);
XxlJobSpringExecutor
xxlJobSpringExecutor
=
new
XxlJobSpringExecutor
();
xxlJobSpringExecutor
.
setAdminAddresses
(
adminAddresses
);
xxlJobSpringExecutor
.
setAppName
(
appName
);
xxlJobSpringExecutor
.
setIp
(
ip
);
xxlJobSpringExecutor
.
setPort
(
port
);
xxlJobSpringExecutor
.
setAccessToken
(
accessToken
);
xxlJobSpringExecutor
.
setLogPath
(
logPath
);
xxlJobSpringExecutor
.
setLogRetentionDays
(
logRetentionDays
);
return
xxlJobSpringExecutor
;
}
logger
.
info
(
">>>>>>>>>>> xxl-job config not init."
);
return
null
;
}
/**
*
针对多网卡、容器内部署等情况,可借助
"spring-cloud-commons"
提供的
"InetUtils"
组件灵活定制注册
IP
;
*
*
1
、引入依赖:
*
<
dependency
>
*
<
groupId
>
org
.
springframework
.
cloud
</
groupId
>
*
<
artifactId
>
spring
-
cloud
-
commons
</
artifactId
>
*
<
version
>${
r
'${version}"'
}</
version
>
*
</
dependency
>
*
*
2
、配置文件,或者容器启动变量
*
spring
.
cloud
.
inetutils
.
preferred
-
networks
:
'xxx.xxx.xxx.'
*
*
3
、获取
IP
*
String
ip_
=
inetUtils
.
findFirstNonLoopbackHostInfo
().
getIpAddress
();
*/
}
SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/util/job/%ITEM%JobHandler.java.ftl
浏览文件 @
0506375f
...
...
@@ -3,18 +3,17 @@ TARGET=PSSYSBACKSERVICE
</#
ibiztemplate
>
package
${
pub
.
getPKGCodeName
()}.
core
.
util
.
job
;
import
com
.
xxl
.
job
.
core
.
biz
.
model
.
ReturnT
;
import
com
.
xxl
.
job
.
core
.
handler
.
IJobHandler
;
import
com
.
xxl
.
job
.
core
.
handler
.
annotation
.
JobHandler
;
import
org
.
springframework
.
beans
.
factory
.
annotation
.
Autowired
;
import
com
.
baomidou
.
jobs
.
api
.
JobsResponse
;
import
com
.
baomidou
.
jobs
.
exception
.
JobsException
;
import
com
.
baomidou
.
jobs
.
handler
.
IJobsHandler
;
import
org
.
springframework
.
stereotype
.
Component
;
@
JobHandler
(
value
=
"${item.codeName}JobHandler"
)
@
Component
public
class
${
item
.
codeName
}
JobHandler
extends
IJobHandler
{
@
Component
(
"${item.codeName}JobHandler"
)
public
class
${
item
.
codeName
}
JobHandler
implements
IJobsHandler
{
@
Override
public
ReturnT
<
String
>
execute
(
String
params
)
throws
Exception
{
return
new
ReturnT
(
200
,
"服务调用成功"
);
public
JobsResponse
execute
(
String
tenantId
,
String
param
)
throws
JobsException
{
System
.
out
.
println
(
"执行 DemoJobHandler tenantId="
+
tenantId
+
",param="
+
param
);
return
JobsResponse
.
ok
();
}
}
SLN/%PUBPRJ%-dependencies/pom.xml.ftl
浏览文件 @
0506375f
...
...
@@ -78,8 +78,8 @@ TARGET=PSSYSTEM
<!--httpClient -->
<openfeign-httpclient.version>11.0</openfeign-httpclient.version>
<!--
xxl-job
定时服务 -->
<
xxl-job.version>2.1.0</xxl-job
.version>
<!--
baomidou-jobs
定时服务 -->
<
baomidou-jobs.version>1.0.3</baomidou-jobs
.version>
<#if sys.getAllPSSystemDBConfigs()??>
<#list sys.getAllPSSystemDBConfigs() as dbConfig>
...
...
@@ -279,9 +279,9 @@ TARGET=PSSYSTEM
</dependency>
<dependency>
<groupId>com.
xuxueli
</groupId>
<artifactId>
xxl-job-core
</artifactId>
<version>${r'${
xxl-job
.version}'}</version>
<groupId>com.
baomidou
</groupId>
<artifactId>
jobs-spring-boot-starter
</artifactId>
<version>${r'${
baomidou-jobs
.version}'}</version>
</dependency>
</dependencies>
...
...
SLN/%PUBPRJ%-util/src/main/resources/application-sys.yml.ftl
浏览文件 @
0506375f
...
...
@@ -213,16 +213,10 @@ ibiz:
enablePermissionValid: ${enableDataAcc}
cacheLevel: L1 #(L1)一级本地caffeine缓存;(L2)caffeine缓存+Redis缓存
#xxl-job定时服务
xxl:
job:
accessToken:
admin:
addresses: #127.0.0.1
executor:
appname: ${sys.getName()}
ip:
port: 9999
logpath: /app/joblog
logretentiondays: -1
### jobs
jobs:
admin-address: http://127.0.0.1:40005
app-name: ${sys.getName()}
app-port: 9999
#app-ip: 127.0.0.1
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录