Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yanghaoyuan.sh
DolphinScheduler
提交
7413b578
DolphinScheduler
项目概览
yanghaoyuan.sh
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
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,发现更多精彩内容 >>
未验证
提交
7413b578
编写于
9月 27, 2021
作者:
B
BenjaminWenqiYu
提交者:
GitHub
9月 27, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix the magic number userId '0' (#6368)
上级
545173fa
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
4 addition
and
4 deletion
+4
-4
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
...lphinscheduler/api/service/impl/ResourcesServiceImpl.java
+4
-4
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
浏览文件 @
7413b578
...
...
@@ -136,7 +136,7 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
return
result
;
}
if
(
checkResourceExists
(
fullName
,
0
,
type
.
ordinal
()))
{
if
(
checkResourceExists
(
fullName
,
loginUser
.
getId
()
,
type
.
ordinal
()))
{
logger
.
error
(
"resource directory {} has exist, can't recreate"
,
fullName
);
putMsg
(
result
,
Status
.
RESOURCE_EXIST
);
return
result
;
...
...
@@ -208,7 +208,7 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
// check resource name exists
String
fullName
=
currentDir
.
equals
(
"/"
)
?
String
.
format
(
"%s%s"
,
currentDir
,
name
)
:
String
.
format
(
"%s/%s"
,
currentDir
,
name
);
if
(
checkResourceExists
(
fullName
,
0
,
type
.
ordinal
()))
{
if
(
checkResourceExists
(
fullName
,
loginUser
.
getId
()
,
type
.
ordinal
()))
{
logger
.
error
(
"resource {} has exist, can't recreate"
,
RegexUtils
.
escapeNRT
(
name
));
putMsg
(
result
,
Status
.
RESOURCE_EXIST
);
return
result
;
...
...
@@ -298,7 +298,7 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
String
originResourceName
=
resource
.
getAlias
();
String
fullName
=
String
.
format
(
"%s%s"
,
originFullName
.
substring
(
0
,
originFullName
.
lastIndexOf
(
"/"
)
+
1
),
name
);
if
(!
originResourceName
.
equals
(
name
)
&&
checkResourceExists
(
fullName
,
0
,
type
.
ordinal
()))
{
if
(!
originResourceName
.
equals
(
name
)
&&
checkResourceExists
(
fullName
,
loginUser
.
getId
()
,
type
.
ordinal
()))
{
logger
.
error
(
"resource {} already exists, can't recreate"
,
name
);
putMsg
(
result
,
Status
.
RESOURCE_EXIST
);
return
result
;
...
...
@@ -751,7 +751,7 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
public
Result
<
Object
>
verifyResourceName
(
String
fullName
,
ResourceType
type
,
User
loginUser
)
{
Result
<
Object
>
result
=
new
Result
<>();
putMsg
(
result
,
Status
.
SUCCESS
);
if
(
checkResourceExists
(
fullName
,
0
,
type
.
ordinal
()))
{
if
(
checkResourceExists
(
fullName
,
loginUser
.
getId
()
,
type
.
ordinal
()))
{
logger
.
error
(
"resource type:{} name:{} has exist, can't create again."
,
type
,
RegexUtils
.
escapeNRT
(
fullName
));
putMsg
(
result
,
Status
.
RESOURCE_EXIST
);
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录