Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
e2e3d799
M
metersphere
项目概览
MeterSphere
/
metersphere
上一次同步 3 年多
通知
25
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
metersphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
“6e5811d37005202e1098682d070a9a19a901815b”上不存在“test/webdriver.spec.ts”
提交
e2e3d799
编写于
4月 30, 2020
作者:
C
Captain.B
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev
上级
e7cfbc23
98878cd9
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
32 addition
and
10 deletion
+32
-10
backend/src/main/java/io/metersphere/controller/LoginController.java
.../main/java/io/metersphere/controller/LoginController.java
+2
-2
backend/src/main/java/io/metersphere/controller/UserController.java
...c/main/java/io/metersphere/controller/UserController.java
+2
-4
backend/src/main/java/io/metersphere/controller/WorkspaceController.java
...n/java/io/metersphere/controller/WorkspaceController.java
+1
-0
backend/src/main/java/io/metersphere/service/OrganizationService.java
...main/java/io/metersphere/service/OrganizationService.java
+10
-1
backend/src/main/java/io/metersphere/service/UserService.java
...end/src/main/java/io/metersphere/service/UserService.java
+5
-1
backend/src/main/java/io/metersphere/service/WorkspaceService.java
...rc/main/java/io/metersphere/service/WorkspaceService.java
+12
-2
未找到文件。
backend/src/main/java/io/metersphere/controller/LoginController.java
浏览文件 @
e2e3d799
...
@@ -54,10 +54,10 @@ public class LoginController {
...
@@ -54,10 +54,10 @@ public class LoginController {
List
<
UserRole
>
org
=
userRoles
.
stream
().
filter
(
ur
->
ur
.
getRoleId
().
startsWith
(
"org"
)).
collect
(
Collectors
.
toList
());
List
<
UserRole
>
org
=
userRoles
.
stream
().
filter
(
ur
->
ur
.
getRoleId
().
startsWith
(
"org"
)).
collect
(
Collectors
.
toList
());
if
(
test
.
size
()
>
0
)
{
if
(
test
.
size
()
>
0
)
{
String
wsId
=
test
.
get
(
0
).
getSourceId
();
String
wsId
=
test
.
get
(
0
).
getSourceId
();
userService
.
switchUserRole
(
user
,
"workspace"
,
wsId
);
userService
.
switchUserRole
(
"workspace"
,
wsId
);
}
else
if
(
org
.
size
()
>
0
)
{
}
else
if
(
org
.
size
()
>
0
)
{
String
orgId
=
org
.
get
(
0
).
getSourceId
();
String
orgId
=
org
.
get
(
0
).
getSourceId
();
userService
.
switchUserRole
(
user
,
"organization"
,
orgId
);
userService
.
switchUserRole
(
"organization"
,
orgId
);
}
}
}
}
// 返回 userDTO
// 返回 userDTO
...
...
backend/src/main/java/io/metersphere/controller/UserController.java
浏览文件 @
e2e3d799
...
@@ -129,16 +129,14 @@ public class UserController {
...
@@ -129,16 +129,14 @@ public class UserController {
@PostMapping
(
"/switch/source/org/{sourceId}"
)
@PostMapping
(
"/switch/source/org/{sourceId}"
)
@RequiresRoles
(
RoleConstants
.
ORG_ADMIN
)
@RequiresRoles
(
RoleConstants
.
ORG_ADMIN
)
public
UserDTO
switchOrganization
(
@PathVariable
(
value
=
"sourceId"
)
String
sourceId
)
{
public
UserDTO
switchOrganization
(
@PathVariable
(
value
=
"sourceId"
)
String
sourceId
)
{
UserDTO
user
=
SessionUtils
.
getUser
();
userService
.
switchUserRole
(
"organization"
,
sourceId
);
userService
.
switchUserRole
(
user
,
"organization"
,
sourceId
);
return
SessionUtils
.
getUser
();
return
SessionUtils
.
getUser
();
}
}
@PostMapping
(
"/switch/source/ws/{sourceId}"
)
@PostMapping
(
"/switch/source/ws/{sourceId}"
)
@RequiresRoles
(
value
=
{
RoleConstants
.
TEST_MANAGER
,
RoleConstants
.
TEST_VIEWER
,
RoleConstants
.
TEST_USER
},
logical
=
Logical
.
OR
)
@RequiresRoles
(
value
=
{
RoleConstants
.
TEST_MANAGER
,
RoleConstants
.
TEST_VIEWER
,
RoleConstants
.
TEST_USER
},
logical
=
Logical
.
OR
)
public
UserDTO
switchWorkspace
(
@PathVariable
(
value
=
"sourceId"
)
String
sourceId
)
{
public
UserDTO
switchWorkspace
(
@PathVariable
(
value
=
"sourceId"
)
String
sourceId
)
{
UserDTO
user
=
SessionUtils
.
getUser
();
userService
.
switchUserRole
(
"workspace"
,
sourceId
);
userService
.
switchUserRole
(
user
,
"workspace"
,
sourceId
);
return
SessionUtils
.
getUser
();
return
SessionUtils
.
getUser
();
}
}
...
...
backend/src/main/java/io/metersphere/controller/WorkspaceController.java
浏览文件 @
e2e3d799
...
@@ -27,6 +27,7 @@ public class WorkspaceController {
...
@@ -27,6 +27,7 @@ public class WorkspaceController {
@PostMapping
(
"add"
)
@PostMapping
(
"add"
)
@RequiresRoles
(
RoleConstants
.
ORG_ADMIN
)
@RequiresRoles
(
RoleConstants
.
ORG_ADMIN
)
public
Workspace
addWorkspace
(
@RequestBody
Workspace
workspace
)
{
public
Workspace
addWorkspace
(
@RequestBody
Workspace
workspace
)
{
workspaceService
.
checkWorkspaceOwnerByOrgAdmin
(
workspace
.
getId
());
return
workspaceService
.
saveWorkspace
(
workspace
);
return
workspaceService
.
saveWorkspace
(
workspace
);
}
}
...
...
backend/src/main/java/io/metersphere/service/OrganizationService.java
浏览文件 @
e2e3d799
...
@@ -4,12 +4,14 @@ import io.metersphere.base.domain.*;
...
@@ -4,12 +4,14 @@ import io.metersphere.base.domain.*;
import
io.metersphere.base.mapper.OrganizationMapper
;
import
io.metersphere.base.mapper.OrganizationMapper
;
import
io.metersphere.base.mapper.UserMapper
;
import
io.metersphere.base.mapper.UserMapper
;
import
io.metersphere.base.mapper.UserRoleMapper
;
import
io.metersphere.base.mapper.UserRoleMapper
;
import
io.metersphere.base.mapper.WorkspaceMapper
;
import
io.metersphere.base.mapper.ext.ExtOrganizationMapper
;
import
io.metersphere.base.mapper.ext.ExtOrganizationMapper
;
import
io.metersphere.base.mapper.ext.ExtUserRoleMapper
;
import
io.metersphere.base.mapper.ext.ExtUserRoleMapper
;
import
io.metersphere.commons.constants.RoleConstants
;
import
io.metersphere.commons.constants.RoleConstants
;
import
io.metersphere.commons.exception.MSException
;
import
io.metersphere.commons.exception.MSException
;
import
io.metersphere.controller.request.OrganizationRequest
;
import
io.metersphere.controller.request.OrganizationRequest
;
import
io.metersphere.dto.OrganizationMemberDTO
;
import
io.metersphere.dto.OrganizationMemberDTO
;
import
io.metersphere.dto.UserDTO
;
import
io.metersphere.dto.UserRoleHelpDTO
;
import
io.metersphere.dto.UserRoleHelpDTO
;
import
io.metersphere.i18n.Translator
;
import
io.metersphere.i18n.Translator
;
import
io.metersphere.user.SessionUser
;
import
io.metersphere.user.SessionUser
;
...
@@ -39,6 +41,12 @@ public class OrganizationService {
...
@@ -39,6 +41,12 @@ public class OrganizationService {
private
UserMapper
userMapper
;
private
UserMapper
userMapper
;
@Resource
@Resource
private
ExtOrganizationMapper
extOrganizationMapper
;
private
ExtOrganizationMapper
extOrganizationMapper
;
@Resource
private
WorkspaceMapper
workspaceMapper
;
@Resource
private
WorkspaceService
workspaceService
;
@Resource
private
UserService
userService
;
public
Organization
addOrganization
(
Organization
organization
)
{
public
Organization
addOrganization
(
Organization
organization
)
{
long
currentTimeMillis
=
System
.
currentTimeMillis
();
long
currentTimeMillis
=
System
.
currentTimeMillis
();
...
@@ -123,7 +131,8 @@ public class OrganizationService {
...
@@ -123,7 +131,8 @@ public class OrganizationService {
}
}
public
void
checkOrgOwner
(
String
organizationId
)
{
public
void
checkOrgOwner
(
String
organizationId
)
{
SessionUser
user
=
SessionUtils
.
getUser
();
SessionUser
sessionUser
=
SessionUtils
.
getUser
();
UserDTO
user
=
userService
.
getUserDTO
(
sessionUser
.
getId
());
List
<
String
>
collect
=
user
.
getUserRoles
().
stream
()
List
<
String
>
collect
=
user
.
getUserRoles
().
stream
()
.
filter
(
ur
->
RoleConstants
.
ORG_ADMIN
.
equals
(
ur
.
getRoleId
()))
.
filter
(
ur
->
RoleConstants
.
ORG_ADMIN
.
equals
(
ur
.
getRoleId
()))
.
map
(
UserRole:
:
getSourceId
)
.
map
(
UserRole:
:
getSourceId
)
...
...
backend/src/main/java/io/metersphere/service/UserService.java
浏览文件 @
e2e3d799
...
@@ -128,7 +128,11 @@ public class UserService {
...
@@ -128,7 +128,11 @@ public class UserService {
userMapper
.
updateByPrimaryKeySelective
(
user
);
userMapper
.
updateByPrimaryKeySelective
(
user
);
}
}
public
void
switchUserRole
(
UserDTO
user
,
String
sign
,
String
sourceId
)
{
public
void
switchUserRole
(
String
sign
,
String
sourceId
)
{
SessionUser
sessionUser
=
SessionUtils
.
getUser
();
// 获取最新UserDTO
UserDTO
user
=
getUserDTO
(
sessionUser
.
getId
());
User
newUser
=
new
User
();
User
newUser
=
new
User
();
if
(
StringUtils
.
equals
(
"organization"
,
sign
))
{
if
(
StringUtils
.
equals
(
"organization"
,
sign
))
{
user
.
setLastOrganizationId
(
sourceId
);
user
.
setLastOrganizationId
(
sourceId
);
...
...
backend/src/main/java/io/metersphere/service/WorkspaceService.java
浏览文件 @
e2e3d799
package
io.metersphere.service
;
package
io.metersphere.service
;
import
io.metersphere.base.domain.*
;
import
io.metersphere.base.domain.*
;
import
io.metersphere.base.mapper.ProjectMapper
;
import
io.metersphere.base.mapper.UserMapper
;
import
io.metersphere.base.mapper.UserMapper
;
import
io.metersphere.base.mapper.UserRoleMapper
;
import
io.metersphere.base.mapper.UserRoleMapper
;
import
io.metersphere.base.mapper.WorkspaceMapper
;
import
io.metersphere.base.mapper.WorkspaceMapper
;
...
@@ -10,6 +11,7 @@ import io.metersphere.base.mapper.ext.ExtWorkspaceMapper;
...
@@ -10,6 +11,7 @@ import io.metersphere.base.mapper.ext.ExtWorkspaceMapper;
import
io.metersphere.commons.constants.RoleConstants
;
import
io.metersphere.commons.constants.RoleConstants
;
import
io.metersphere.commons.exception.MSException
;
import
io.metersphere.commons.exception.MSException
;
import
io.metersphere.controller.request.WorkspaceRequest
;
import
io.metersphere.controller.request.WorkspaceRequest
;
import
io.metersphere.dto.UserDTO
;
import
io.metersphere.dto.UserRoleHelpDTO
;
import
io.metersphere.dto.UserRoleHelpDTO
;
import
io.metersphere.dto.WorkspaceDTO
;
import
io.metersphere.dto.WorkspaceDTO
;
import
io.metersphere.dto.WorkspaceMemberDTO
;
import
io.metersphere.dto.WorkspaceMemberDTO
;
...
@@ -41,6 +43,12 @@ public class WorkspaceService {
...
@@ -41,6 +43,12 @@ public class WorkspaceService {
private
UserMapper
userMapper
;
private
UserMapper
userMapper
;
@Resource
@Resource
private
ExtOrganizationMapper
extOrganizationMapper
;
private
ExtOrganizationMapper
extOrganizationMapper
;
@Resource
private
ProjectService
projectService
;
@Resource
private
ProjectMapper
projectMapper
;
@Resource
private
UserService
userService
;
public
Workspace
saveWorkspace
(
Workspace
workspace
)
{
public
Workspace
saveWorkspace
(
Workspace
workspace
)
{
if
(
StringUtils
.
isBlank
(
workspace
.
getName
()))
{
if
(
StringUtils
.
isBlank
(
workspace
.
getName
()))
{
...
@@ -98,7 +106,8 @@ public class WorkspaceService {
...
@@ -98,7 +106,8 @@ public class WorkspaceService {
public
void
checkWorkspaceOwnerByOrgAdmin
(
String
workspaceId
)
{
public
void
checkWorkspaceOwnerByOrgAdmin
(
String
workspaceId
)
{
checkWorkspaceIsExist
(
workspaceId
);
checkWorkspaceIsExist
(
workspaceId
);
WorkspaceExample
example
=
new
WorkspaceExample
();
WorkspaceExample
example
=
new
WorkspaceExample
();
SessionUser
user
=
SessionUtils
.
getUser
();
SessionUser
sessionUser
=
SessionUtils
.
getUser
();
UserDTO
user
=
userService
.
getUserDTO
(
sessionUser
.
getId
());
List
<
String
>
orgIds
=
user
.
getUserRoles
().
stream
()
List
<
String
>
orgIds
=
user
.
getUserRoles
().
stream
()
.
filter
(
ur
->
RoleConstants
.
ORG_ADMIN
.
equals
(
ur
.
getRoleId
()))
.
filter
(
ur
->
RoleConstants
.
ORG_ADMIN
.
equals
(
ur
.
getRoleId
()))
.
map
(
UserRole:
:
getSourceId
)
.
map
(
UserRole:
:
getSourceId
)
...
@@ -114,7 +123,8 @@ public class WorkspaceService {
...
@@ -114,7 +123,8 @@ public class WorkspaceService {
public
void
checkWorkspaceOwner
(
String
workspaceId
)
{
public
void
checkWorkspaceOwner
(
String
workspaceId
)
{
checkWorkspaceIsExist
(
workspaceId
);
checkWorkspaceIsExist
(
workspaceId
);
WorkspaceExample
example
=
new
WorkspaceExample
();
WorkspaceExample
example
=
new
WorkspaceExample
();
SessionUser
user
=
SessionUtils
.
getUser
();
SessionUser
sessionUser
=
SessionUtils
.
getUser
();
UserDTO
user
=
userService
.
getUserDTO
(
sessionUser
.
getId
());
List
<
String
>
orgIds
=
user
.
getUserRoles
().
stream
()
List
<
String
>
orgIds
=
user
.
getUserRoles
().
stream
()
.
filter
(
ur
->
RoleConstants
.
ORG_ADMIN
.
equals
(
ur
.
getRoleId
()))
.
filter
(
ur
->
RoleConstants
.
ORG_ADMIN
.
equals
(
ur
.
getRoleId
()))
.
map
(
UserRole:
:
getSourceId
)
.
map
(
UserRole:
:
getSourceId
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录