Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
三久
DolphinScheduler
提交
039d517c
DolphinScheduler
项目概览
三久
/
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
039d517c
编写于
4月 11, 2021
作者:
W
wenjun
提交者:
GitHub
4月 11, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Improvement][API] the QueryAuthorizedProject interface adds permission judgment (#5170) (#5184)
上级
73e917d3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
11 deletion
+7
-11
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
...dolphinscheduler/api/service/impl/ProjectServiceImpl.java
+2
-6
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProjectServiceTest.java
...ache/dolphinscheduler/api/service/ProjectServiceTest.java
+5
-5
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
浏览文件 @
039d517c
...
...
@@ -301,7 +301,7 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectServic
@Override
public
Map
<
String
,
Object
>
queryUnauthorizedProject
(
User
loginUser
,
Integer
userId
)
{
Map
<
String
,
Object
>
result
=
new
HashMap
<>();
if
(
isNotAdmin
(
loginUser
,
result
))
{
if
(
loginUser
.
getId
()
!=
userId
&&
isNotAdmin
(
loginUser
,
result
))
{
return
result
;
}
/**
...
...
@@ -353,7 +353,7 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectServic
public
Map
<
String
,
Object
>
queryAuthorizedProject
(
User
loginUser
,
Integer
userId
)
{
Map
<
String
,
Object
>
result
=
new
HashMap
<>();
if
(
isNotAdmin
(
loginUser
,
result
))
{
if
(
loginUser
.
getId
()
!=
userId
&&
isNotAdmin
(
loginUser
,
result
))
{
return
result
;
}
...
...
@@ -374,10 +374,6 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectServic
public
Map
<
String
,
Object
>
queryProjectCreatedByUser
(
User
loginUser
)
{
Map
<
String
,
Object
>
result
=
new
HashMap
<>();
if
(
isNotAdmin
(
loginUser
,
result
))
{
return
result
;
}
List
<
Project
>
projects
=
projectMapper
.
queryProjectCreatedByUser
(
loginUser
.
getId
());
result
.
put
(
Constants
.
DATA_LIST
,
projects
);
putMsg
(
result
,
Status
.
SUCCESS
);
...
...
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProjectServiceTest.java
浏览文件 @
039d517c
...
...
@@ -276,6 +276,10 @@ public class ProjectServiceTest {
List
<
Project
>
projects
=
(
List
<
Project
>)
result
.
get
(
Constants
.
DATA_LIST
);
Assert
.
assertTrue
(
CollectionUtils
.
isNotEmpty
(
projects
));
loginUser
.
setUserType
(
UserType
.
GENERAL_USER
);
result
=
projectService
.
queryAuthorizedProject
(
loginUser
,
loginUser
.
getId
());
projects
=
(
List
<
Project
>)
result
.
get
(
Constants
.
DATA_LIST
);
Assert
.
assertTrue
(
CollectionUtils
.
isNotEmpty
(
projects
));
}
@Test
...
...
@@ -284,14 +288,10 @@ public class ProjectServiceTest {
User
loginUser
=
getLoginUser
();
Mockito
.
when
(
projectMapper
.
queryProjectCreatedByUser
(
1
)).
thenReturn
(
getList
());
//USER_NO_OPERATION_PERM
Map
<
String
,
Object
>
result
=
projectService
.
queryProjectCreatedByUser
(
loginUser
);
logger
.
info
(
result
.
toString
());
Assert
.
assertEquals
(
Status
.
USER_NO_OPERATION_PERM
,
result
.
get
(
Constants
.
STATUS
));
//success
loginUser
.
setUserType
(
UserType
.
ADMIN_USER
);
result
=
projectService
.
queryProjectCreatedByUser
(
loginUser
);
Map
<
String
,
Object
>
result
=
projectService
.
queryProjectCreatedByUser
(
loginUser
);
logger
.
info
(
result
.
toString
());
List
<
Project
>
projects
=
(
List
<
Project
>)
result
.
get
(
Constants
.
DATA_LIST
);
Assert
.
assertTrue
(
CollectionUtils
.
isNotEmpty
(
projects
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录