Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
liyuanzhong001
DolphinScheduler
提交
ea22bff9
DolphinScheduler
项目概览
liyuanzhong001
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
11
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
ea22bff9
编写于
5月 31, 2019
作者:
B
bao liang
提交者:
GitHub
5月 31, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #418 from lenboo/dev-1.1.0
merge from branch-1.0.2
上级
ceb2fd87
08a664d6
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
61 addition
and
1 deletion
+61
-1
docs/zh_CN/快速上手.md
docs/zh_CN/快速上手.md
+1
-1
escheduler-common/src/main/java/cn/escheduler/common/utils/DependentUtils.java
.../main/java/cn/escheduler/common/utils/DependentUtils.java
+6
-0
escheduler-common/src/main/java/cn/escheduler/common/utils/dependent/DependentDateUtils.java
...escheduler/common/utils/dependent/DependentDateUtils.java
+20
-0
escheduler-common/src/test/java/cn/escheduler/common/utils/DependentUtilsTest.java
...t/java/cn/escheduler/common/utils/DependentUtilsTest.java
+20
-0
escheduler-server/src/main/java/cn/escheduler/server/quartz/QuartzExecutors.java
...ain/java/cn/escheduler/server/quartz/QuartzExecutors.java
+2
-0
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/commcon.js
...home/pages/dag/_source/formModel/tasks/_source/commcon.js
+8
-0
escheduler-ui/src/js/module/i18n/locale/en_US.js
escheduler-ui/src/js/module/i18n/locale/en_US.js
+2
-0
escheduler-ui/src/js/module/i18n/locale/zh_CN.js
escheduler-ui/src/js/module/i18n/locale/zh_CN.js
+2
-0
未找到文件。
docs/zh_CN/快速上手.md
浏览文件 @
ea22bff9
# 快速上手
# 快速上手
*
管理员用户登录
*
管理员用户登录
>地址:192.168.xx.xx:8888 用户名密码:admin/esheduler123
>地址:192.168.xx.xx:8888 用户名密码:admin/es
c
heduler123
<p
align=
"center"
>
<p
align=
"center"
>
<img
src=
"https://analysys.github.io/easyscheduler_docs_cn/images/login.jpg"
width=
"60%"
/>
<img
src=
"https://analysys.github.io/easyscheduler_docs_cn/images/login.jpg"
width=
"60%"
/>
...
...
escheduler-common/src/main/java/cn/escheduler/common/utils/DependentUtils.java
浏览文件 @
ea22bff9
...
@@ -95,6 +95,9 @@ public class DependentUtils {
...
@@ -95,6 +95,9 @@ public class DependentUtils {
case
"last7Days"
:
case
"last7Days"
:
result
=
DependentDateUtils
.
getLastDayInterval
(
businessDate
,
7
);
result
=
DependentDateUtils
.
getLastDayInterval
(
businessDate
,
7
);
break
;
break
;
case
"thisWeek"
:
result
=
DependentDateUtils
.
getThisWeekInterval
(
businessDate
);
break
;
case
"lastWeek"
:
case
"lastWeek"
:
result
=
DependentDateUtils
.
getLastWeekInterval
(
businessDate
);
result
=
DependentDateUtils
.
getLastWeekInterval
(
businessDate
);
break
;
break
;
...
@@ -119,6 +122,9 @@ public class DependentUtils {
...
@@ -119,6 +122,9 @@ public class DependentUtils {
case
"lastSunday"
:
case
"lastSunday"
:
result
=
DependentDateUtils
.
getLastWeekOneDayInterval
(
businessDate
,
7
);
result
=
DependentDateUtils
.
getLastWeekOneDayInterval
(
businessDate
,
7
);
break
;
break
;
case
"thisMonth"
:
result
=
DependentDateUtils
.
getThisMonthInterval
(
businessDate
);
break
;
case
"lastMonth"
:
case
"lastMonth"
:
result
=
DependentDateUtils
.
getLastMonthInterval
(
businessDate
);
result
=
DependentDateUtils
.
getLastMonthInterval
(
businessDate
);
break
;
break
;
...
...
escheduler-common/src/main/java/cn/escheduler/common/utils/dependent/DependentDateUtils.java
浏览文件 @
ea22bff9
...
@@ -76,6 +76,16 @@ public class DependentDateUtils {
...
@@ -76,6 +76,16 @@ public class DependentDateUtils {
return
dateIntervals
;
return
dateIntervals
;
}
}
/**
* get interval between this month first day and businessDate
* @param businessDate
* @return
*/
public
static
List
<
DateInterval
>
getThisMonthInterval
(
Date
businessDate
)
{
Date
firstDay
=
DateUtils
.
getFirstDayOfMonth
(
businessDate
);
return
getDateIntervalListBetweenTwoDates
(
firstDay
,
businessDate
);
}
/**
/**
* get interval between last month first day and last day
* get interval between last month first day and last day
* @param businessDate
* @param businessDate
...
@@ -108,6 +118,16 @@ public class DependentDateUtils {
...
@@ -108,6 +118,16 @@ public class DependentDateUtils {
}
}
}
}
/**
* get interval between monday to businessDate of this week
* @param businessDate
* @return
*/
public
static
List
<
DateInterval
>
getThisWeekInterval
(
Date
businessDate
)
{
Date
mondayThisWeek
=
DateUtils
.
getMonday
(
businessDate
);
return
getDateIntervalListBetweenTwoDates
(
mondayThisWeek
,
businessDate
);
}
/**
/**
* get interval between monday to sunday of last week
* get interval between monday to sunday of last week
* default set monday the first day of week
* default set monday the first day of week
...
...
escheduler-common/src/test/java/cn/escheduler/common/utils/DependentUtilsTest.java
浏览文件 @
ea22bff9
...
@@ -80,6 +80,26 @@ public class DependentUtilsTest {
...
@@ -80,6 +80,26 @@ public class DependentUtilsTest {
Assert
.
assertEquals
(
dateIntervals
.
get
(
0
),
diCur
);
Assert
.
assertEquals
(
dateIntervals
.
get
(
0
),
diCur
);
dateValue
=
"thisWeek"
;
Date
firstWeekDay
=
DateUtils
.
getMonday
(
curDay
);
dateIntervals
=
DependentUtils
.
getDateIntervalList
(
curDay
,
dateValue
);
DateInterval
weekHead
=
new
DateInterval
(
DateUtils
.
getStartOfDay
(
firstWeekDay
),
DateUtils
.
getEndOfDay
(
firstWeekDay
));
DateInterval
weekThis
=
new
DateInterval
(
DateUtils
.
getStartOfDay
(
curDay
),
DateUtils
.
getEndOfDay
(
curDay
));
Assert
.
assertEquals
(
dateIntervals
.
get
(
0
),
weekHead
);
Assert
.
assertEquals
(
dateIntervals
.
get
(
dateIntervals
.
size
()
-
1
),
weekThis
);
dateValue
=
"thisMonth"
;
Date
firstMonthDay
=
DateUtils
.
getFirstDayOfMonth
(
curDay
);
dateIntervals
=
DependentUtils
.
getDateIntervalList
(
curDay
,
dateValue
);
DateInterval
monthHead
=
new
DateInterval
(
DateUtils
.
getStartOfDay
(
firstMonthDay
),
DateUtils
.
getEndOfDay
(
firstMonthDay
));
DateInterval
monthThis
=
new
DateInterval
(
DateUtils
.
getStartOfDay
(
curDay
),
DateUtils
.
getEndOfDay
(
curDay
));
Assert
.
assertEquals
(
dateIntervals
.
get
(
0
),
monthHead
);
Assert
.
assertEquals
(
dateIntervals
.
get
(
dateIntervals
.
size
()
-
1
),
monthThis
);
}
}
...
...
escheduler-server/src/main/java/cn/escheduler/server/quartz/QuartzExecutors.java
浏览文件 @
ea22bff9
...
@@ -230,6 +230,8 @@ public class QuartzExecutors {
...
@@ -230,6 +230,8 @@ public class QuartzExecutors {
if
(
scheduler
.
checkExists
(
jobKey
)){
if
(
scheduler
.
checkExists
(
jobKey
)){
logger
.
info
(
"try to delete job, job name: {}, job group name: {},"
,
jobName
,
jobGroupName
);
logger
.
info
(
"try to delete job, job name: {}, job group name: {},"
,
jobName
,
jobGroupName
);
return
scheduler
.
deleteJob
(
jobKey
);
return
scheduler
.
deleteJob
(
jobKey
);
}
else
{
return
true
;
}
}
}
catch
(
SchedulerException
e
)
{
}
catch
(
SchedulerException
e
)
{
...
...
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/commcon.js
浏览文件 @
ea22bff9
...
@@ -64,6 +64,10 @@ const dateValueList = {
...
@@ -64,6 +64,10 @@ const dateValueList = {
}
}
],
],
'
week
'
:
[
'
week
'
:
[
{
value
:
'
thisWeek
'
,
label
:
`
${
i18n
.
$t
(
'
ThisWeek
'
)}
`
},
{
{
value
:
'
lastWeek
'
,
value
:
'
lastWeek
'
,
label
:
`
${
i18n
.
$t
(
'
LastWeek
'
)}
`
label
:
`
${
i18n
.
$t
(
'
LastWeek
'
)}
`
...
@@ -98,6 +102,10 @@ const dateValueList = {
...
@@ -98,6 +102,10 @@ const dateValueList = {
}
}
],
],
'
month
'
:
[
'
month
'
:
[
{
value
:
'
thisMonth
'
,
label
:
`
${
i18n
.
$t
(
'
ThisMonth
'
)}
`
},
{
{
value
:
'
lastMonth
'
,
value
:
'
lastMonth
'
,
label
:
`
${
i18n
.
$t
(
'
LastMonth
'
)}
`
label
:
`
${
i18n
.
$t
(
'
LastMonth
'
)}
`
...
...
escheduler-ui/src/js/module/i18n/locale/en_US.js
浏览文件 @
ea22bff9
...
@@ -395,6 +395,7 @@ export default {
...
@@ -395,6 +395,7 @@ export default {
'
Last2Days
'
:
'
Last2Days
'
,
'
Last2Days
'
:
'
Last2Days
'
,
'
Last3Days
'
:
'
Last3Days
'
,
'
Last3Days
'
:
'
Last3Days
'
,
'
Last7Days
'
:
'
Last7Days
'
,
'
Last7Days
'
:
'
Last7Days
'
,
'
ThisWeek
'
:
'
ThisWeek
'
,
'
LastWeek
'
:
'
LastWeek
'
,
'
LastWeek
'
:
'
LastWeek
'
,
'
LastMonday
'
:
'
LastMonday
'
,
'
LastMonday
'
:
'
LastMonday
'
,
'
LastTuesday
'
:
'
LastTuesday
'
,
'
LastTuesday
'
:
'
LastTuesday
'
,
...
@@ -403,6 +404,7 @@ export default {
...
@@ -403,6 +404,7 @@ export default {
'
LastFriday
'
:
'
LastFriday
'
,
'
LastFriday
'
:
'
LastFriday
'
,
'
LastSaturday
'
:
'
LastSaturday
'
,
'
LastSaturday
'
:
'
LastSaturday
'
,
'
LastSunday
'
:
'
LastSunday
'
,
'
LastSunday
'
:
'
LastSunday
'
,
'
ThisMonth
'
:
'
ThisMonth
'
,
'
LastMonth
'
:
'
LastMonth
'
,
'
LastMonth
'
:
'
LastMonth
'
,
'
LastMonthBegin
'
:
'
LastMonthBegin
'
,
'
LastMonthBegin
'
:
'
LastMonthBegin
'
,
'
LastMonthEnd
'
:
'
LastMonthEnd
'
,
'
LastMonthEnd
'
:
'
LastMonthEnd
'
,
...
...
escheduler-ui/src/js/module/i18n/locale/zh_CN.js
浏览文件 @
ea22bff9
...
@@ -395,6 +395,7 @@ export default {
...
@@ -395,6 +395,7 @@ export default {
'
Last2Days
'
:
'
前两天
'
,
'
Last2Days
'
:
'
前两天
'
,
'
Last3Days
'
:
'
前三天
'
,
'
Last3Days
'
:
'
前三天
'
,
'
Last7Days
'
:
'
前七天
'
,
'
Last7Days
'
:
'
前七天
'
,
'
ThisWeek
'
:
'
本周
'
,
'
LastWeek
'
:
'
上周
'
,
'
LastWeek
'
:
'
上周
'
,
'
LastMonday
'
:
'
上周一
'
,
'
LastMonday
'
:
'
上周一
'
,
'
LastTuesday
'
:
'
上周二
'
,
'
LastTuesday
'
:
'
上周二
'
,
...
@@ -403,6 +404,7 @@ export default {
...
@@ -403,6 +404,7 @@ export default {
'
LastFriday
'
:
'
上周五
'
,
'
LastFriday
'
:
'
上周五
'
,
'
LastSaturday
'
:
'
上周六
'
,
'
LastSaturday
'
:
'
上周六
'
,
'
LastSunday
'
:
'
上周日
'
,
'
LastSunday
'
:
'
上周日
'
,
'
ThisMonth
'
:
'
本月
'
,
'
LastMonth
'
:
'
上月
'
,
'
LastMonth
'
:
'
上月
'
,
'
LastMonthBegin
'
:
'
上月初
'
,
'
LastMonthBegin
'
:
'
上月初
'
,
'
LastMonthEnd
'
:
'
上月末
'
,
'
LastMonthEnd
'
:
'
上月末
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录