Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
pentaLiker
DolphinScheduler
提交
2dde6014
DolphinScheduler
项目概览
pentaLiker
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
1
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,发现更多精彩内容 >>
提交
2dde6014
编写于
4月 01, 2020
作者:
B
break60
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler
into dev
上级
becc2de9
f60edc8e
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
11 deletion
+19
-11
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java
...a/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java
+5
-0
dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/ExcelUtilsTest.java
...g/apache/dolphinscheduler/alert/utils/ExcelUtilsTest.java
+10
-0
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java
.../dolphinscheduler/api/controller/ResourcesController.java
+1
-2
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java
...ava/org/apache/dolphinscheduler/common/utils/OSUtils.java
+2
-8
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/os/OSUtilsTest.java
...va/org/apache/dolphinscheduler/common/os/OSUtilsTest.java
+1
-1
未找到文件。
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java
浏览文件 @
2dde6014
...
...
@@ -26,6 +26,7 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
java.io.File
;
import
java.io.FileOutputStream
;
import
java.io.IOException
;
import
java.util.*
;
...
...
@@ -102,7 +103,11 @@ public class ExcelUtils {
for
(
int
i
=
0
;
i
<
headerList
.
size
();
i
++)
{
sheet
.
setColumnWidth
(
i
,
headerList
.
get
(
i
).
length
()
*
800
);
}
File
file
=
new
File
(
xlsFilePath
);
if
(!
file
.
exists
())
{
file
.
mkdirs
();
}
//setting file output
...
...
dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/ExcelUtilsTest.java
浏览文件 @
2dde6014
...
...
@@ -89,4 +89,14 @@ public class ExcelUtilsTest {
ExcelUtils
.
genExcelFile
(
incorrectContent1
,
title
,
xlsFilePath
);
}
/**
* Test GenExcelFile (check directory)
*/
@Test
public
void
testGenExcelFileByCheckDir
()
{
ExcelUtils
.
genExcelFile
(
"[{\"a\": \"a\"},{\"a\": \"a\"}]"
,
"t"
,
"/tmp/xls"
);
File
file
=
new
File
(
"/tmp/xls"
+
Constants
.
SINGLE_SLASH
+
"t"
+
Constants
.
EXCEL_SUFFIX_XLS
);
file
.
delete
();
}
}
\ No newline at end of file
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java
浏览文件 @
2dde6014
...
...
@@ -154,8 +154,7 @@ public class ResourcesController extends BaseController{
@ApiImplicitParam
(
name
=
"id"
,
value
=
"RESOURCE_ID"
,
required
=
true
,
dataType
=
"Int"
,
example
=
"100"
),
@ApiImplicitParam
(
name
=
"type"
,
value
=
"RESOURCE_TYPE"
,
required
=
true
,
dataType
=
"ResourceType"
),
@ApiImplicitParam
(
name
=
"name"
,
value
=
"RESOURCE_NAME"
,
required
=
true
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"description"
,
value
=
"RESOURCE_DESC"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"file"
,
value
=
"RESOURCE_FILE"
,
required
=
true
,
dataType
=
"MultipartFile"
)
@ApiImplicitParam
(
name
=
"description"
,
value
=
"RESOURCE_DESC"
,
dataType
=
"String"
)
})
@PostMapping
(
value
=
"/update"
)
public
Result
updateResource
(
@ApiIgnore
@RequestAttribute
(
value
=
Constants
.
SESSION_USER
)
User
loginUser
,
...
...
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java
浏览文件 @
2dde6014
...
...
@@ -352,13 +352,7 @@ public class OSUtils {
return
sb
.
toString
();
}
finally
{
if
(
br
!=
null
)
{
try
{
br
.
close
();
}
catch
(
Exception
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
IOUtils
.
closeQuietly
(
br
);
}
}
...
...
@@ -408,7 +402,7 @@ public class OSUtils {
* whether is windows
* @return true if windows
*/
public
static
boolean
isWindows
()
{
;
public
static
boolean
isWindows
()
{
return
getOSName
().
startsWith
(
"Windows"
);
}
...
...
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/os/OSUtilsTest.java
浏览文件 @
2dde6014
...
...
@@ -67,7 +67,7 @@ public class OSUtilsTest {
@Test
public
void
cpuUsage
()
throws
Exception
{
logger
.
info
(
"cpuUsage : {}"
,
OSUtils
.
cpuUsage
());
Thread
.
sleep
(
1000
l
);
Thread
.
sleep
(
1000
L
);
logger
.
info
(
"cpuUsage : {}"
,
OSUtils
.
cpuUsage
());
double
cpuUsage
=
OSUtils
.
cpuUsage
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录