Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
ea1c653e
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 接近 2 年
通知
707
Star
9572
Fork
3514
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
ea1c653e
编写于
6月 22, 2020
作者:
L
lenboo
浏览文件
操作
浏览文件
下载
差异文件
merge from dev
上级
8e7bdfa2
518d03b6
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
19 addition
and
30 deletion
+19
-30
dolphinscheduler-api/src/main/resources/application-api.properties
...heduler-api/src/main/resources/application-api.properties
+3
-0
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DependentUtils.java
.../apache/dolphinscheduler/common/utils/DependentUtils.java
+1
-3
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/IpUtils.java
...ava/org/apache/dolphinscheduler/common/utils/IpUtils.java
+5
-6
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/SchemaUtils.java
...org/apache/dolphinscheduler/common/utils/SchemaUtils.java
+3
-7
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
...ache/dolphinscheduler/server/worker/task/sql/SqlTask.java
+3
-10
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java
...server/master/consumer/TaskPriorityQueueConsumerTest.java
+1
-3
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
.../js/conf/home/pages/security/pages/users/_source/list.vue
+1
-1
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+1
-0
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+1
-0
未找到文件。
dolphinscheduler-api/src/main/resources/application-api.properties
浏览文件 @
ea1c653e
...
...
@@ -23,6 +23,9 @@ server.servlet.session.timeout=7200
server.servlet.context-path
=
/dolphinscheduler/
# Set time zone
spring.jackson.time-zone
=
GMT+8
# file size limit for upload
spring.servlet.multipart.max-file-size
=
1024MB
spring.servlet.multipart.max-request-size
=
1024MB
...
...
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DependentUtils.java
浏览文件 @
ea1c653e
...
...
@@ -40,10 +40,8 @@ public class DependentUtils {
case
AND:
if
(
dependResultList
.
contains
(
DependResult
.
FAILED
)){
dependResult
=
DependResult
.
FAILED
;
}
else
if
(
dependResultList
.
contains
(
DependResult
.
WAITING
)){
}
if
(
dependResultList
.
contains
(
DependResult
.
WAITING
)){
dependResult
=
DependResult
.
WAITING
;
}
else
{
dependResult
=
DependResult
.
SUCCESS
;
}
break
;
case
OR:
...
...
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/IpUtils.java
浏览文件 @
ea1c653e
...
...
@@ -49,12 +49,11 @@ public class IpUtils {
ipNumbers
[
2
]
=
ipLong
>>
8
&
tmp
;
ipNumbers
[
3
]
=
ipLong
&
tmp
;
StringBuilder
sb
=
new
StringBuilder
(
16
);
sb
.
append
(
ipNumbers
[
0
]).
append
(
DOT
)
.
append
(
ipNumbers
[
1
]).
append
(
DOT
)
.
append
(
ipNumbers
[
2
]).
append
(
DOT
)
.
append
(
ipNumbers
[
3
]);
return
sb
.
toString
();
String
sb
=
ipNumbers
[
0
]
+
DOT
+
ipNumbers
[
1
]
+
DOT
+
ipNumbers
[
2
]
+
DOT
+
ipNumbers
[
3
];
return
sb
;
}
}
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/SchemaUtils.java
浏览文件 @
ea1c653e
...
...
@@ -22,7 +22,6 @@ import org.slf4j.LoggerFactory;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.FileNotFoundException
;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.Comparator
;
...
...
@@ -96,11 +95,11 @@ public class SchemaUtils {
String
[]
schemaVersionArr
=
schemaVersion
.
split
(
"\\."
);
String
[]
versionArr
=
version
.
split
(
"\\."
);
int
arrLength
=
schemaVersionArr
.
length
<
versionArr
.
length
?
schemaVersionArr
.
length
:
versionArr
.
length
;
int
arrLength
=
Math
.
min
(
schemaVersionArr
.
length
,
versionArr
.
length
)
;
for
(
int
i
=
0
;
i
<
arrLength
;
i
++)
{
if
(
Integer
.
valueOf
(
schemaVersionArr
[
i
])
>
Integer
.
valueOf
(
versionArr
[
i
]))
{
if
(
Integer
.
parseInt
(
schemaVersionArr
[
i
])
>
Integer
.
parseInt
(
versionArr
[
i
]))
{
return
true
;
}
else
if
(
Integer
.
valueOf
(
schemaVersionArr
[
i
])
<
Integer
.
valueOf
(
versionArr
[
i
]))
{
}
else
if
(
Integer
.
parseInt
(
schemaVersionArr
[
i
])
<
Integer
.
parseInt
(
versionArr
[
i
]))
{
return
false
;
}
}
...
...
@@ -121,9 +120,6 @@ public class SchemaUtils {
}
catch
(
FileNotFoundException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
throw
new
RuntimeException
(
"Failed to get the product version description file. The file could not be found"
,
e
);
}
catch
(
IOException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
throw
new
RuntimeException
(
"Failed to get product version number description file, failed to read the file"
,
e
);
}
return
soft_version
;
}
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
浏览文件 @
ea1c653e
...
...
@@ -270,16 +270,9 @@ public class SqlTask extends AbstractTask {
String
result
=
JSONUtils
.
toJsonString
(
resultJSONArray
);
logger
.
debug
(
"execute sql : {}"
,
result
);
// if there is a result set
if
(!
resultJSONArray
.
isEmpty
(
null
)
)
{
if
(
StringUtils
.
isNotEmpty
(
sqlParameters
.
getTitle
()))
{
sendAttachment
(
sqlParameters
.
getTitle
(),
JSONUtils
.
toJsonString
(
resultJSONArray
));
}
else
{
sendAttachment
(
taskExecutionContext
.
getTaskName
()
+
" query resultsets "
,
JSONUtils
.
toJsonString
(
resultJSONArray
));
}
}
sendAttachment
(
StringUtils
.
isNotEmpty
(
sqlParameters
.
getTitle
())
?
sqlParameters
.
getTitle
():
taskExecutionContext
.
getTaskName
()
+
" query result sets"
,
JSONUtils
.
toJsonString
(
resultJSONArray
));
}
/**
...
...
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java
浏览文件 @
ea1c653e
...
...
@@ -32,7 +32,6 @@ import org.apache.dolphinscheduler.server.zk.SpringZKServer;
import
org.apache.dolphinscheduler.service.bean.SpringApplicationContext
;
import
org.apache.dolphinscheduler.service.process.ProcessService
;
import
org.apache.dolphinscheduler.service.queue.TaskPriorityQueue
;
import
org.apache.dolphinscheduler.service.queue.TaskPriorityQueueImpl
;
import
org.apache.dolphinscheduler.service.zk.ZookeeperCachedOperator
;
import
org.apache.dolphinscheduler.service.zk.ZookeeperConfig
;
import
org.junit.Before
;
...
...
@@ -233,8 +232,7 @@ public class TaskPriorityQueueConsumerTest {
dataSource
.
setConnectionParams
(
"{\"address\":\"jdbc:mysql://192.168.221.185:3306\",\"database\":\"dolphinscheduler_qiaozhanwei\",\"jdbcUrl\":\"jdbc:mysql://192.168.221.185:3306/dolphinscheduler_qiaozhanwei\",\"user\":\"root\",\"password\":\"root@123\"}"
);
dataSource
.
setCreateTime
(
new
Date
());
dataSource
.
setUpdateTime
(
new
Date
());
Mockito
.
when
(
processService
.
findDataSourceById
(
1
)).
thenReturn
(
dataSource
);
Mockito
.
doReturn
(
dataSource
).
when
(
processService
).
findDataSourceById
(
1
);
Thread
.
sleep
(
10000
);
}
...
...
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
浏览文件 @
ea1c653e
...
...
@@ -26,7 +26,7 @@
<span>
{{
$t
(
'
User Name
'
)
}}
</span>
</th>
<th>
<span>
用户类型
</span>
<span>
{{
$t
(
'
User Type
'
)
}}
</span>
</th>
<th>
<span>
{{
$t
(
'
Tenant
'
)
}}
</span>
...
...
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
浏览文件 @
ea1c653e
...
...
@@ -181,6 +181,7 @@ export default {
Tenant
:
'
Tenant
'
,
Email
:
'
Email
'
,
Phone
:
'
Phone
'
,
'
User Type
'
:
'
User Type
'
,
'
Please enter phone number
'
:
'
Please enter phone number
'
,
'
Please enter main class
'
:
'
Please enter main class
'
,
'
Please enter email
'
:
'
Please enter email
'
,
...
...
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
浏览文件 @
ea1c653e
...
...
@@ -184,6 +184,7 @@ export default {
Tenant
:
'
租户
'
,
Email
:
'
邮件
'
,
Phone
:
'
手机
'
,
'
User Type
'
:
'
用户类型
'
,
'
Please enter phone number
'
:
'
请输入手机
'
,
'
Please enter email
'
:
'
请输入邮箱
'
,
'
Please enter the correct email format
'
:
'
请输入正确的邮箱格式
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录