Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
xiaofang li
MeterSphere
Commits
ef114491
Commit
ef114491
authored
4 years ago
by
Captain.B
Committed by
刘瑞斌
4 years ago
Browse files
Options
Download
Email Patches
Plain Diff
refactor: 代码格式
parent
0bc98d28
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
backend/src/main/java/io/metersphere/api/controller/ApiDatabaseController.java
+0
-1
.../io/metersphere/api/controller/ApiDatabaseController.java
backend/src/main/java/io/metersphere/controller/CustomFieldTemplateController.java
+0
-1
...metersphere/controller/CustomFieldTemplateController.java
backend/src/main/java/io/metersphere/controller/JarConfigController.java
+0
-5
...n/java/io/metersphere/controller/JarConfigController.java
backend/src/main/java/io/metersphere/controller/OrganizationController.java
+0
-6
...ava/io/metersphere/controller/OrganizationController.java
backend/src/main/java/io/metersphere/controller/ResourceController.java
+0
-3
...in/java/io/metersphere/controller/ResourceController.java
backend/src/main/java/io/metersphere/controller/RoleController.java
+0
-1
...c/main/java/io/metersphere/controller/RoleController.java
backend/src/main/java/io/metersphere/controller/TestCaseTemplateController.java
+0
-3
...io/metersphere/controller/TestCaseTemplateController.java
backend/src/main/java/io/metersphere/controller/TestResourcePoolController.java
+0
-2
...io/metersphere/controller/TestResourcePoolController.java
backend/src/main/java/io/metersphere/controller/UserController.java
+0
-22
...c/main/java/io/metersphere/controller/UserController.java
backend/src/main/java/io/metersphere/controller/UserKeysController.java
+0
-1
...in/java/io/metersphere/controller/UserKeysController.java
backend/src/main/java/io/metersphere/controller/UserRoleController.java
+0
-3
...in/java/io/metersphere/controller/UserRoleController.java
backend/src/main/java/io/metersphere/controller/WorkspaceController.java
+0
-9
...n/java/io/metersphere/controller/WorkspaceController.java
backend/src/main/java/io/metersphere/log/controller/OperatingLogController.java
+0
-1
...io/metersphere/log/controller/OperatingLogController.java
backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
+0
-4
...a/io/metersphere/track/controller/TestCaseController.java
backend/src/main/java/io/metersphere/track/controller/TestCaseReportTemplateController.java
+0
-3
...re/track/controller/TestCaseReportTemplateController.java
backend/src/main/java/io/metersphere/track/controller/TestCaseReviewScenarioCaseController.java
+0
-3
...rack/controller/TestCaseReviewScenarioCaseController.java
backend/src/main/java/io/metersphere/track/controller/TestPlanScenarioCaseController.java
+0
-3
...here/track/controller/TestPlanScenarioCaseController.java
backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
+0
-5
...ersphere/track/controller/TestPlanTestCaseController.java
backend/src/main/java/io/metersphere/track/controller/TestReviewTestCaseController.java
+0
-7
...sphere/track/controller/TestReviewTestCaseController.java
backend/src/main/java/io/metersphere/track/controller/TrackController.java
+0
-1
...java/io/metersphere/track/controller/TrackController.java
with
0 additions
and
84 deletions
+0
-84
backend/src/main/java/io/metersphere/api/controller/ApiDatabaseController.java
+
0
-
1
View file @
ef114491
...
...
@@ -11,7 +11,6 @@ import javax.annotation.Resource;
@RestController
@RequestMapping
(
value
=
"/api/database"
)
public
class
ApiDatabaseController
{
@Resource
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/controller/CustomFieldTemplateController.java
+
0
-
1
View file @
ef114491
...
...
@@ -16,7 +16,6 @@ import java.util.List;
@RestController
@RequestMapping
(
"custom/field/template"
)
public
class
CustomFieldTemplateController
{
@Resource
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/controller/JarConfigController.java
+
0
-
5
View file @
ef114491
...
...
@@ -19,14 +19,12 @@ import java.util.List;
@RestController
@RequestMapping
(
value
=
"/jar"
)
public
class
JarConfigController
{
@Resource
JarConfigService
JarConfigService
;
@PostMapping
(
"list/{goPage}/{pageSize}"
)
public
Pager
<
List
<
JarConfig
>>
list
(
@PathVariable
int
goPage
,
@PathVariable
int
pageSize
,
@RequestBody
JarConfig
request
)
{
Page
<
Object
>
page
=
PageHelper
.
startPage
(
goPage
,
pageSize
,
true
);
return
PageUtils
.
setPageInfo
(
page
,
JarConfigService
.
list
(
request
));
...
...
@@ -48,21 +46,18 @@ public class JarConfigController {
}
@PostMapping
(
value
=
"/add"
,
consumes
=
{
"multipart/form-data"
})
@MsAuditLog
(
module
=
"project_project_jar"
,
type
=
OperLogConstants
.
CREATE
,
content
=
"#msClass.getLogDetails(#request.id)"
,
msClass
=
JarConfigService
.
class
)
public
String
add
(
@RequestPart
(
"request"
)
JarConfig
request
,
@RequestPart
(
value
=
"file"
)
MultipartFile
file
)
{
return
JarConfigService
.
add
(
request
,
file
);
}
@PostMapping
(
value
=
"/update"
,
consumes
=
{
"multipart/form-data"
})
@MsAuditLog
(
module
=
"project_project_jar"
,
type
=
OperLogConstants
.
UPDATE
,
beforeEvent
=
"#msClass.getLogDetails(#request.id)"
,
content
=
"#msClass.getLogDetails(#request.id)"
,
msClass
=
JarConfigService
.
class
)
public
void
update
(
@RequestPart
(
"request"
)
JarConfig
request
,
@RequestPart
(
value
=
"file"
,
required
=
false
)
MultipartFile
file
)
{
JarConfigService
.
update
(
request
,
file
);
}
@GetMapping
(
"/delete/{id}"
)
@MsAuditLog
(
module
=
"project_project_jar"
,
type
=
OperLogConstants
.
DELETE
,
beforeEvent
=
"#msClass.getLogDetails(#id)"
,
msClass
=
JarConfigService
.
class
)
public
void
delete
(
@PathVariable
String
id
)
{
JarConfigService
.
delete
(
id
);
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/controller/OrganizationController.java
+
0
-
6
View file @
ef114491
...
...
@@ -31,7 +31,6 @@ public class OrganizationController {
private
UserService
userService
;
@PostMapping
(
"/add"
)
@MsAuditLog
(
module
=
"system_organization"
,
type
=
OperLogConstants
.
CREATE
,
content
=
"#msClass.getLogDetails(#organization.id)"
,
msClass
=
OrganizationService
.
class
)
public
Organization
addOrganization
(
@RequestBody
Organization
organization
)
{
organization
.
setId
(
UUID
.
randomUUID
().
toString
());
...
...
@@ -39,20 +38,17 @@ public class OrganizationController {
}
@GetMapping
(
"/list"
)
public
List
<
Organization
>
getOrganizationList
()
{
return
organizationService
.
getOrganizationList
(
new
OrganizationRequest
());
}
@PostMapping
(
"/list/{goPage}/{pageSize}"
)
public
Pager
<
List
<
Organization
>>
getOrganizationList
(
@RequestBody
OrganizationRequest
request
,
@PathVariable
int
goPage
,
@PathVariable
int
pageSize
)
{
Page
<
Object
>
page
=
PageHelper
.
startPage
(
goPage
,
pageSize
,
true
);
return
PageUtils
.
setPageInfo
(
page
,
organizationService
.
getOrganizationList
(
request
));
}
@GetMapping
(
"/delete/{organizationId}"
)
@MsAuditLog
(
module
=
"system_organization"
,
type
=
OperLogConstants
.
DELETE
,
beforeEvent
=
"#msClass.getLogDetails(#organizationId)"
,
msClass
=
OrganizationService
.
class
)
public
void
deleteOrganization
(
@PathVariable
(
value
=
"organizationId"
)
String
organizationId
)
{
userService
.
refreshSessionUser
(
"organization"
,
organizationId
);
...
...
@@ -60,7 +56,6 @@ public class OrganizationController {
}
@PostMapping
(
"/update"
)
@MsAuditLog
(
module
=
"system_organization"
,
type
=
OperLogConstants
.
UPDATE
,
beforeEvent
=
"#msClass.getLogDetails(#organization.id)"
,
content
=
"#msClass.getLogDetails(#organization.id)"
,
msClass
=
OrganizationService
.
class
)
public
void
updateOrganization
(
@RequestBody
Organization
organization
)
{
organizationService
.
updateOrganization
(
organization
);
...
...
@@ -72,7 +67,6 @@ public class OrganizationController {
}
@PostMapping
(
"/member/update"
)
@MsAuditLog
(
module
=
"organization_member"
,
type
=
OperLogConstants
.
UPDATE
,
beforeEvent
=
"#msClass.getLogDetails(#memberDTO.id)"
,
content
=
"#msClass.getLogDetails(#memberDTO.id)"
,
msClass
=
OrganizationService
.
class
)
public
void
updateOrgMember
(
@RequestBody
OrganizationMemberDTO
memberDTO
)
{
organizationService
.
updateOrgMember
(
memberDTO
);
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/controller/ResourceController.java
+
0
-
3
View file @
ef114491
...
...
@@ -14,13 +14,11 @@ import javax.annotation.Resource;
@RestController
@RequestMapping
(
value
=
"/resource"
)
public
class
ResourceController
{
@Resource
ResourceService
resourceService
;
@PostMapping
(
value
=
"/md/upload"
,
consumes
=
{
"multipart/form-data"
})
public
void
upload
(
@RequestPart
(
value
=
"request"
)
MdUploadRequest
request
,
@RequestPart
(
value
=
"file"
)
MultipartFile
file
)
{
resourceService
.
mdUpload
(
request
,
file
);
}
...
...
@@ -31,7 +29,6 @@ public class ResourceController {
}
@GetMapping
(
"/md/delete/{fileName}"
)
public
void
delete
(
@PathVariable
(
"fileName"
)
String
fileName
)
{
resourceService
.
mdDelete
(
fileName
);
}
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/controller/RoleController.java
+
0
-
1
View file @
ef114491
...
...
@@ -25,7 +25,6 @@ public class RoleController {
}
@GetMapping
(
"/all"
)
public
List
<
Role
>
getAllRole
()
{
return
roleService
.
getAllRole
();
}
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/controller/TestCaseTemplateController.java
+
0
-
3
View file @
ef114491
...
...
@@ -35,7 +35,6 @@ public class TestCaseTemplateController {
}
@PostMapping
(
"/list/{goPage}/{pageSize}"
)
public
Pager
<
List
<
TestCaseTemplateWithBLOBs
>>
list
(
@PathVariable
int
goPage
,
@PathVariable
int
pageSize
,
@RequestBody
BaseQueryRequest
request
)
{
Page
<
List
<
TestCaseTemplateWithBLOBs
>>
page
=
PageHelper
.
startPage
(
goPage
,
pageSize
,
true
);
return
PageUtils
.
setPageInfo
(
page
,
testCaseTemplateService
.
list
(
request
));
...
...
@@ -54,13 +53,11 @@ public class TestCaseTemplateController {
}
@GetMapping
(
"/option/{workspaceId}"
)
public
List
<
TestCaseTemplate
>
list
(
@PathVariable
String
workspaceId
)
{
return
testCaseTemplateService
.
getOption
(
workspaceId
);
}
@GetMapping
(
"/get/relate/{projectId}"
)
public
TestCaseTemplateDao
getTemplate
(
@PathVariable
String
projectId
)
{
return
testCaseTemplateService
.
getTemplate
(
projectId
);
}
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/controller/TestResourcePoolController.java
+
0
-
2
View file @
ef114491
...
...
@@ -62,13 +62,11 @@ public class TestResourcePoolController {
}
@GetMapping
(
"list/all/valid"
)
public
List
<
TestResourcePoolDTO
>
listValidResourcePools
()
{
return
testResourcePoolService
.
listValidResourcePools
();
}
@GetMapping
(
"list/quota/valid"
)
public
List
<
TestResourcePoolDTO
>
listValidQuotaResourcePools
()
{
return
testResourcePoolService
.
listValidQuotaResourcePools
();
}
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/controller/UserController.java
+
0
-
22
View file @
ef114491
...
...
@@ -52,7 +52,6 @@ public class UserController {
private
CheckPermissionService
checkPermissionService
;
@PostMapping
(
"/special/add"
)
@RequiresRoles
(
RoleConstants
.
ADMIN
)
@MsAuditLog
(
module
=
"system_user"
,
type
=
OperLogConstants
.
CREATE
,
content
=
"#msClass.getLogDetails(#user)"
,
msClass
=
UserService
.
class
)
public
UserDTO
insertUser
(
@RequestBody
UserRequest
user
)
{
...
...
@@ -60,26 +59,22 @@ public class UserController {
}
@PostMapping
(
"/special/list/{goPage}/{pageSize}"
)
public
Pager
<
List
<
User
>>
getUserList
(
@PathVariable
int
goPage
,
@PathVariable
int
pageSize
,
@RequestBody
io
.
metersphere
.
controller
.
request
.
UserRequest
request
)
{
Page
<
Object
>
page
=
PageHelper
.
startPage
(
goPage
,
pageSize
,
true
);
return
PageUtils
.
setPageInfo
(
page
,
userService
.
getUserListWithRequest
(
request
));
}
@GetMapping
(
"/special/user/role/{userId}"
)
public
UserRoleDTO
getUserRole
(
@PathVariable
(
"userId"
)
String
userId
)
{
return
userService
.
getUserRole
(
userId
);
}
@GetMapping
(
"/special/user/group/{userId}"
)
public
UserGroupPermissionDTO
getUserGroup
(
@PathVariable
(
"userId"
)
String
userId
)
{
return
userService
.
getUserGroup
(
userId
);
}
@GetMapping
(
"/special/delete/{userId}"
)
@MsAuditLog
(
module
=
"system_user"
,
type
=
OperLogConstants
.
DELETE
,
beforeEvent
=
"#msClass.getLogDetails(#userId)"
,
msClass
=
UserService
.
class
)
public
void
deleteUser
(
@PathVariable
(
value
=
"userId"
)
String
userId
)
{
userService
.
deleteUser
(
userId
);
...
...
@@ -88,69 +83,59 @@ public class UserController {
}
@PostMapping
(
"/special/update"
)
@MsAuditLog
(
module
=
"system_user"
,
type
=
OperLogConstants
.
UPDATE
,
beforeEvent
=
"#msClass.getLogDetails(#user.id)"
,
content
=
"#msClass.getLogDetails(#user.id)"
,
msClass
=
UserService
.
class
)
public
void
updateUser
(
@RequestBody
UserRequest
user
)
{
userService
.
updateUserRole
(
user
);
}
@PostMapping
(
"/special/update_status"
)
@MsAuditLog
(
module
=
"system_user"
,
type
=
OperLogConstants
.
UPDATE
,
beforeEvent
=
"#msClass.getLogDetails(#user.id)"
,
content
=
"#msClass.getLogDetails(#user.id)"
,
msClass
=
UserService
.
class
)
public
void
updateStatus
(
@RequestBody
User
user
)
{
userService
.
updateUser
(
user
);
}
@PostMapping
(
"/special/ws/member/list/{goPage}/{pageSize}"
)
public
Pager
<
List
<
User
>>
getMemberListByAdmin
(
@PathVariable
int
goPage
,
@PathVariable
int
pageSize
,
@RequestBody
QueryMemberRequest
request
)
{
Page
<
Object
>
page
=
PageHelper
.
startPage
(
goPage
,
pageSize
,
true
);
return
PageUtils
.
setPageInfo
(
page
,
userService
.
getMemberList
(
request
));
}
@PostMapping
(
"/special/ws/member/list/all"
)
public
List
<
User
>
getMemberListByAdmin
(
@RequestBody
QueryMemberRequest
request
)
{
return
userService
.
getMemberList
(
request
);
}
@PostMapping
(
"/special/ws/member/add"
)
@MsAuditLog
(
module
=
"workspace_member"
,
type
=
OperLogConstants
.
CREATE
,
content
=
"#msClass.getLogDetails(#request.id)"
,
msClass
=
WorkspaceService
.
class
)
public
void
addMemberByAdmin
(
@RequestBody
AddMemberRequest
request
)
{
userService
.
addMember
(
request
);
}
@GetMapping
(
"/special/ws/member/delete/{workspaceId}/{userId}"
)
@MsAuditLog
(
module
=
"workspace_member"
,
type
=
OperLogConstants
.
DELETE
,
beforeEvent
=
"#msClass.getLogDetails(#userId)"
,
msClass
=
UserService
.
class
)
public
void
deleteMemberByAdmin
(
@PathVariable
String
workspaceId
,
@PathVariable
String
userId
)
{
userService
.
deleteMember
(
workspaceId
,
userId
);
}
@PostMapping
(
"/special/org/member/add"
)
@MsAuditLog
(
module
=
"organization_member"
,
type
=
OperLogConstants
.
CREATE
,
content
=
"#msClass.getLogDetails(#request.id)"
,
msClass
=
OrganizationService
.
class
)
public
void
addOrganizationMemberByAdmin
(
@RequestBody
AddOrgMemberRequest
request
)
{
userService
.
addOrganizationMember
(
request
);
}
@GetMapping
(
"/special/org/member/delete/{organizationId}/{userId}"
)
@MsAuditLog
(
module
=
"organization_member"
,
type
=
OperLogConstants
.
DELETE
,
beforeEvent
=
"#msClass.getLogDetails(#userId)"
,
msClass
=
UserService
.
class
)
public
void
delOrganizationMemberByAdmin
(
@PathVariable
String
organizationId
,
@PathVariable
String
userId
)
{
userService
.
delOrganizationMember
(
organizationId
,
userId
);
}
@PostMapping
(
"/special/org/member/list/{goPage}/{pageSize}"
)
public
Pager
<
List
<
User
>>
getOrgMemberListByAdmin
(
@PathVariable
int
goPage
,
@PathVariable
int
pageSize
,
@RequestBody
QueryOrgMemberRequest
request
)
{
Page
<
Object
>
page
=
PageHelper
.
startPage
(
goPage
,
pageSize
,
true
);
return
PageUtils
.
setPageInfo
(
page
,
userService
.
getOrgMemberList
(
request
));
}
@PostMapping
(
"/special/org/member/list/all"
)
public
List
<
User
>
getOrgMemberListByAdmin
(
@RequestBody
QueryOrgMemberRequest
request
)
{
return
userService
.
getOrgMemberList
(
request
);
}
...
...
@@ -293,7 +278,6 @@ public class UserController {
* 查询组织成员列表
*/
@PostMapping
(
"/org/member/list/{goPage}/{pageSize}"
)
public
Pager
<
List
<
User
>>
getOrgMemberList
(
@PathVariable
int
goPage
,
@PathVariable
int
pageSize
,
@RequestBody
QueryOrgMemberRequest
request
)
{
Page
<
Object
>
page
=
PageHelper
.
startPage
(
goPage
,
pageSize
,
true
);
return
PageUtils
.
setPageInfo
(
page
,
userService
.
getOrgMemberList
(
request
));
...
...
@@ -303,7 +287,6 @@ public class UserController {
* 组织成员列表不分页
*/
@PostMapping
(
"/org/member/list/all"
)
public
List
<
User
>
getOrgMemberList
(
@RequestBody
QueryOrgMemberRequest
request
)
{
return
userService
.
getOrgMemberList
(
request
);
}
...
...
@@ -333,31 +316,26 @@ public class UserController {
* 获取工作空间成员用户 不分页
*/
@PostMapping
(
"/ws/member/tester/list"
)
public
List
<
User
>
getTestManagerAndTestUserList
(
@RequestBody
QueryMemberRequest
request
)
{
return
userService
.
getTestManagerAndTestUserList
(
request
);
}
@GetMapping
(
"/search/{condition}"
)
public
List
<
User
>
searchUser
(
@PathVariable
String
condition
)
{
return
userService
.
searchUser
(
condition
);
}
@GetMapping
(
"/export/template"
)
public
void
testCaseTemplateExport
(
HttpServletResponse
response
)
{
userService
.
userTemplateExport
(
response
);
}
@PostMapping
(
"/import/{userId}"
)
public
ExcelResponse
testCaseImport
(
MultipartFile
file
,
@PathVariable
String
userId
,
HttpServletRequest
request
)
{
return
userService
.
userImport
(
file
,
userId
,
request
);
}
@PostMapping
(
"/special/batchProcessUserInfo"
)
@MsAuditLog
(
module
=
"system_user"
,
type
=
OperLogConstants
.
BATCH_UPDATE
,
beforeEvent
=
"#msClass.getLogDetails(#request)"
,
content
=
"#msClass.getLogDetails(#request)"
,
msClass
=
UserService
.
class
)
public
String
batchProcessUserInfo
(
@RequestBody
UserBatchProcessRequest
request
)
{
String
returnString
=
"success"
;
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/controller/UserKeysController.java
+
0
-
1
View file @
ef114491
...
...
@@ -21,7 +21,6 @@ import java.util.List;
@RestController
@RequestMapping
(
"user/key"
)
public
class
UserKeysController
{
@Resource
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/controller/UserRoleController.java
+
0
-
3
View file @
ef114491
...
...
@@ -22,19 +22,16 @@ public class UserRoleController {
private
UserRoleService
userRoleService
;
@GetMapping
(
"/list/org/{orgId}/{userId}"
)
public
List
<
Role
>
getOrganizationMemberRoles
(
@PathVariable
String
orgId
,
@PathVariable
String
userId
)
{
return
userRoleService
.
getOrganizationMemberRoles
(
orgId
,
userId
);
}
@GetMapping
(
"/list/ws/{workspaceId}/{userId}"
)
public
List
<
Role
>
getWorkspaceMemberRoles
(
@PathVariable
String
workspaceId
,
@PathVariable
String
userId
)
{
return
userRoleService
.
getWorkspaceMemberRoles
(
workspaceId
,
userId
);
}
@GetMapping
(
"/all/{userId}"
)
public
List
<
Map
<
String
,
Object
>>
getUserRole
(
@PathVariable
(
"userId"
)
String
userId
)
{
return
userRoleService
.
getUserRole
(
userId
);
}
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/controller/WorkspaceController.java
+
0
-
9
View file @
ef114491
...
...
@@ -33,7 +33,6 @@ public class WorkspaceController {
private
UserService
userService
;
@PostMapping
(
"add"
)
@MsAuditLog
(
module
=
"system_workspace"
,
type
=
OperLogConstants
.
CREATE
,
content
=
"#msClass.getLogDetails(#workspace.id)"
,
msClass
=
WorkspaceService
.
class
)
public
Workspace
addWorkspace
(
@RequestBody
Workspace
workspace
)
{
String
currentOrganizationId
=
SessionUtils
.
getCurrentOrganizationId
();
...
...
@@ -47,14 +46,12 @@ public class WorkspaceController {
}
@PostMapping
(
"special/add"
)
@MsAuditLog
(
module
=
"system_workspace"
,
type
=
OperLogConstants
.
CREATE
,
content
=
"#msClass.getLogDetails(#workspace.id)"
,
msClass
=
WorkspaceService
.
class
)
public
Workspace
addWorkspaceByAdmin
(
@RequestBody
Workspace
workspace
)
{
return
workspaceService
.
addWorkspaceByAdmin
(
workspace
);
}
@PostMapping
(
"update"
)
@MsAuditLog
(
module
=
"system_workspace"
,
type
=
OperLogConstants
.
UPDATE
,
beforeEvent
=
"#msClass.getLogDetails(#workspace.id)"
,
content
=
"#msClass.getLogDetails(#workspace.id)"
,
msClass
=
WorkspaceService
.
class
)
public
Workspace
updateWorkspace
(
@RequestBody
Workspace
workspace
)
{
// workspaceService.checkWorkspaceOwnerByOrgAdmin(workspace.getId());
...
...
@@ -62,14 +59,12 @@ public class WorkspaceController {
}
@PostMapping
(
"special/update"
)
@MsAuditLog
(
module
=
"system_workspace"
,
type
=
OperLogConstants
.
UPDATE
,
beforeEvent
=
"#msClass.getLogDetails(#workspace.id)"
,
content
=
"#msClass.getLogDetails(#workspace.id)"
,
msClass
=
WorkspaceService
.
class
)
public
void
updateWorkspaceByAdmin
(
@RequestBody
Workspace
workspace
)
{
workspaceService
.
updateWorkspaceByAdmin
(
workspace
);
}
@GetMapping
(
"special/delete/{workspaceId}"
)
@MsAuditLog
(
module
=
"system_workspace"
,
type
=
OperLogConstants
.
DELETE
,
beforeEvent
=
"#msClass.getLogDetails(#workspaceId)"
,
msClass
=
WorkspaceService
.
class
)
public
void
deleteWorkspaceByAdmin
(
@PathVariable
String
workspaceId
)
{
userService
.
refreshSessionUser
(
"workspace"
,
workspaceId
);
...
...
@@ -77,7 +72,6 @@ public class WorkspaceController {
}
@GetMapping
(
"delete/{workspaceId}"
)
@MsAuditLog
(
module
=
"system_workspace"
,
type
=
OperLogConstants
.
DELETE
,
beforeEvent
=
"#msClass.getLogDetails(#workspaceId)"
,
msClass
=
WorkspaceService
.
class
)
public
void
deleteWorkspace
(
@PathVariable
String
workspaceId
)
{
// workspaceService.checkWorkspaceOwnerByOrgAdmin(workspaceId);
...
...
@@ -86,7 +80,6 @@ public class WorkspaceController {
}
@PostMapping
(
"list/{goPage}/{pageSize}"
)
public
Pager
<
List
<
Workspace
>>
getWorkspaceList
(
@PathVariable
int
goPage
,
@PathVariable
int
pageSize
,
@RequestBody
WorkspaceRequest
request
)
{
request
.
setOrganizationId
(
SessionUtils
.
getCurrentOrganizationId
());
Page
<
Object
>
page
=
PageHelper
.
startPage
(
goPage
,
pageSize
,
true
);
...
...
@@ -94,7 +87,6 @@ public class WorkspaceController {
}
@PostMapping
(
"list/all/{goPage}/{pageSize}"
)
public
Pager
<
List
<
WorkspaceDTO
>>
getAllWorkspaceList
(
@PathVariable
int
goPage
,
@PathVariable
int
pageSize
,
@RequestBody
WorkspaceRequest
request
)
{
Page
<
Object
>
page
=
PageHelper
.
startPage
(
goPage
,
pageSize
,
true
);
return
PageUtils
.
setPageInfo
(
page
,
workspaceService
.
getAllWorkspaceList
(
request
));
...
...
@@ -112,7 +104,6 @@ public class WorkspaceController {
}
@PostMapping
(
"/member/update"
)
@MsAuditLog
(
module
=
"workspace_member"
,
type
=
OperLogConstants
.
UPDATE
,
title
=
"#memberDTO.name"
)
public
void
updateOrgMember
(
@RequestBody
WorkspaceMemberDTO
memberDTO
)
{
workspaceService
.
updateWorkspaceMember
(
memberDTO
);
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/log/controller/OperatingLogController.java
+
0
-
1
View file @
ef114491
...
...
@@ -18,7 +18,6 @@ import java.util.List;
@RestController
@RequestMapping
(
value
=
"/operating/log"
)
public
class
OperatingLogController
{
@Resource
private
OperatingLogService
operatingLogService
;
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
+
0
-
4
View file @
ef114491
...
...
@@ -135,21 +135,18 @@ public class TestCaseController {
}
@PostMapping
(
value
=
"/edit"
,
consumes
=
{
"multipart/form-data"
})
@MsAuditLog
(
module
=
"track_test_case"
,
type
=
OperLogConstants
.
UPDATE
,
beforeEvent
=
"#msClass.getLogDetails(#request.id)"
,
title
=
"#request.name"
,
content
=
"#msClass.getLogDetails(#request.id)"
,
msClass
=
TestCaseService
.
class
)
public
String
editTestCase
(
@RequestPart
(
"request"
)
EditTestCaseRequest
request
,
@RequestPart
(
value
=
"file"
)
List
<
MultipartFile
>
files
)
{
return
testCaseService
.
edit
(
request
,
files
);
}
@PostMapping
(
value
=
"/edit/testPlan"
,
consumes
=
{
"multipart/form-data"
})
@MsAuditLog
(
module
=
"track_test_case"
,
type
=
OperLogConstants
.
UPDATE
,
beforeEvent
=
"#msClass.getLogBeforeDetails(#request.id)"
,
title
=
"#request.name"
,
content
=
"#msClass.getLogDetails(#request.id)"
,
msClass
=
TestCaseService
.
class
)
public
String
editTestCaseByTestPlan
(
@RequestPart
(
"request"
)
EditTestCaseRequest
request
,
@RequestPart
(
value
=
"file"
)
List
<
MultipartFile
>
files
)
{
return
testCaseService
.
editTestCase
(
request
,
files
);
}
@PostMapping
(
"/delete/{testCaseId}"
)
@MsAuditLog
(
module
=
"track_test_case"
,
type
=
OperLogConstants
.
DELETE
,
beforeEvent
=
"#msClass.getLogDetails(#testCaseId)"
,
msClass
=
TestCaseService
.
class
)
public
int
deleteTestCase
(
@PathVariable
String
testCaseId
)
{
checkPermissionService
.
checkTestCaseOwner
(
testCaseId
);
...
...
@@ -157,7 +154,6 @@ public class TestCaseController {
}
@PostMapping
(
"/import/{projectId}/{userId}"
)
@MsAuditLog
(
module
=
"track_test_case"
,
type
=
OperLogConstants
.
IMPORT
,
project
=
"#projectId"
)
public
ExcelResponse
testCaseImport
(
MultipartFile
file
,
@PathVariable
String
projectId
,
@PathVariable
String
userId
,
HttpServletRequest
request
)
{
checkPermissionService
.
checkProjectOwner
(
projectId
);
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/track/controller/TestCaseReportTemplateController.java
+
0
-
3
View file @
ef114491
...
...
@@ -31,21 +31,18 @@ public class TestCaseReportTemplateController {
}
@PostMapping
(
"/add"
)
@MsAuditLog
(
module
=
"workspace_template_settings"
,
type
=
OperLogConstants
.
CREATE
,
title
=
"#testCaseReportTemplate.name"
,
sourceId
=
"#testCaseReportTemplate.id"
)
public
void
add
(
@RequestBody
TestCaseReportTemplate
testCaseReportTemplate
)
{
testCaseReportTemplateService
.
addTestCaseReportTemplate
(
testCaseReportTemplate
);
}
@PostMapping
(
"/edit"
)
@MsAuditLog
(
module
=
"workspace_template_settings"
,
type
=
OperLogConstants
.
UPDATE
,
title
=
"#testCaseReportTemplate.name"
,
sourceId
=
"#testCaseReportTemplate.id"
)
public
void
edit
(
@RequestBody
TestCaseReportTemplate
testCaseReportTemplate
)
{
testCaseReportTemplateService
.
editTestCaseReportTemplate
(
testCaseReportTemplate
);
}
@PostMapping
(
"/delete/{id}"
)
@MsAuditLog
(
module
=
"workspace_template_settings"
,
type
=
OperLogConstants
.
DELETE
,
beforeEvent
=
"#msClass.getLogDetails(#id)"
,
msClass
=
TestCaseReportTemplateService
.
class
)
public
int
delete
(
@PathVariable
String
id
)
{
return
testCaseReportTemplateService
.
deleteTestCaseReportTemplate
(
id
);
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/track/controller/TestCaseReviewScenarioCaseController.java
+
0
-
3
View file @
ef114491
...
...
@@ -38,13 +38,11 @@ public class TestCaseReviewScenarioCaseController {
}
@GetMapping
(
"/delete/{id}"
)
public
int
deleteTestCase
(
@PathVariable
String
id
)
{
return
testCaseReviewScenarioCaseService
.
delete
(
id
);
}
@PostMapping
(
"/batch/delete"
)
public
void
deleteApiCaseBath
(
@RequestBody
TestPlanApiCaseBatchRequest
request
)
{
testCaseReviewScenarioCaseService
.
deleteApiCaseBath
(
request
);
}
...
...
@@ -56,7 +54,6 @@ public class TestCaseReviewScenarioCaseController {
}
@PostMapping
(
"/batch/update/env"
)
public
void
batchUpdateEnv
(
@RequestBody
RelevanceScenarioRequest
request
)
{
testCaseReviewScenarioCaseService
.
batchUpdateEnv
(
request
);
}
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/track/controller/TestPlanScenarioCaseController.java
+
0
-
3
View file @
ef114491
...
...
@@ -46,14 +46,12 @@ public class TestPlanScenarioCaseController {
}
@GetMapping
(
"/delete/{id}"
)
@MsAuditLog
(
module
=
"track_test_case_review"
,
type
=
OperLogConstants
.
UN_ASSOCIATE_CASE
,
beforeEvent
=
"#msClass.getLogDetails(#id)"
,
msClass
=
TestPlanScenarioCaseService
.
class
)
public
int
deleteTestCase
(
@PathVariable
String
id
)
{
return
testPlanScenarioCaseService
.
delete
(
id
);
}
@PostMapping
(
"/batch/delete"
)
@MsAuditLog
(
module
=
"track_test_plan"
,
type
=
OperLogConstants
.
UN_ASSOCIATE_CASE
,
beforeEvent
=
"#msClass.getLogDetails(#request.ids)"
,
msClass
=
TestPlanScenarioCaseService
.
class
)
public
void
deleteApiCaseBath
(
@RequestBody
TestPlanScenarioCaseBatchRequest
request
)
{
testPlanScenarioCaseService
.
deleteApiCaseBath
(
request
);
...
...
@@ -76,7 +74,6 @@ public class TestPlanScenarioCaseController {
}
@PostMapping
(
"/batch/update/env"
)
@MsAuditLog
(
module
=
"track_test_plan"
,
type
=
OperLogConstants
.
BATCH_UPDATE
,
beforeEvent
=
"#msClass.batchLogDetails(#request.ids)"
,
content
=
"#msClass.getLogDetails(#request.ids)"
,
msClass
=
TestPlanScenarioCaseService
.
class
)
public
void
batchUpdateEnv
(
@RequestBody
RelevanceScenarioRequest
request
)
{
testPlanScenarioCaseService
.
batchUpdateEnv
(
request
);
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
+
0
-
5
View file @
ef114491
...
...
@@ -106,35 +106,30 @@ public class TestPlanTestCaseController {
}
@PostMapping
(
"/edit"
)
@MsAuditLog
(
module
=
"track_test_case_review"
,
type
=
OperLogConstants
.
UPDATE
,
content
=
"#msClass.getLogDetails(#testPlanTestCase.id)"
,
msClass
=
TestPlanTestCaseService
.
class
)
public
void
editTestCase
(
@RequestBody
TestPlanTestCaseWithBLOBs
testPlanTestCase
)
{
testPlanTestCaseService
.
editTestCase
(
testPlanTestCase
);
}
@PostMapping
(
"/minder/edit"
)
@MsAuditLog
(
module
=
"track_test_plan"
,
type
=
OperLogConstants
.
ASSOCIATE_CASE
,
content
=
"#msClass.getCaseLogDetails(#testPlanTestCases)"
,
msClass
=
TestPlanTestCaseService
.
class
)
public
void
editTestCaseForMinder
(
@RequestBody
List
<
TestPlanTestCaseWithBLOBs
>
testPlanTestCases
)
{
testPlanTestCaseService
.
editTestCaseForMinder
(
testPlanTestCases
);
}
@PostMapping
(
"/batch/edit"
)
@MsAuditLog
(
module
=
"track_test_plan"
,
type
=
OperLogConstants
.
BATCH_UPDATE
,
beforeEvent
=
"#msClass.batchLogDetails(#request.ids)"
,
content
=
"#msClass.getLogDetails(#request.ids)"
,
msClass
=
TestPlanTestCaseService
.
class
)
public
void
editTestCaseBath
(
@RequestBody
TestPlanCaseBatchRequest
request
)
{
testPlanTestCaseService
.
editTestCaseBath
(
request
);
}
@PostMapping
(
"/batch/delete"
)
@MsAuditLog
(
module
=
"track_test_plan"
,
type
=
OperLogConstants
.
UN_ASSOCIATE_CASE
,
beforeEvent
=
"#msClass.getLogDetails(#request.ids)"
,
msClass
=
TestPlanTestCaseService
.
class
)
public
void
deleteTestCaseBath
(
@RequestBody
TestPlanCaseBatchRequest
request
)
{
testPlanTestCaseService
.
deleteTestCaseBath
(
request
);
}
@PostMapping
(
"/delete/{id}"
)
@MsAuditLog
(
module
=
"track_test_plan"
,
type
=
OperLogConstants
.
UN_ASSOCIATE_CASE
,
beforeEvent
=
"#msClass.getLogDetails(#id)"
,
msClass
=
TestPlanTestCaseService
.
class
)
public
int
deleteTestCase
(
@PathVariable
String
id
)
{
return
testPlanTestCaseService
.
deleteTestCase
(
id
);
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/track/controller/TestReviewTestCaseController.java
+
0
-
7
View file @
ef114491
...
...
@@ -34,28 +34,24 @@ public class TestReviewTestCaseController {
}
@PostMapping
(
"/delete"
)
@MsAuditLog
(
module
=
"track_test_case_review"
,
type
=
OperLogConstants
.
UN_ASSOCIATE_CASE
,
beforeEvent
=
"#msClass.getLogDetails(#request)"
,
msClass
=
TestReviewTestCaseService
.
class
)
public
int
deleteTestCase
(
@RequestBody
DeleteRelevanceRequest
request
)
{
return
testReviewTestCaseService
.
deleteTestCase
(
request
);
}
@PostMapping
(
"/batch/delete"
)
@MsAuditLog
(
module
=
"track_test_case_review"
,
type
=
OperLogConstants
.
UN_ASSOCIATE_CASE
,
beforeEvent
=
"#msClass.getLogDetails(#request)"
,
msClass
=
TestReviewTestCaseService
.
class
)
public
void
deleteTestCaseBatch
(
@RequestBody
TestReviewCaseBatchRequest
request
)
{
testReviewTestCaseService
.
deleteTestCaseBatch
(
request
);
}
@PostMapping
(
"/batch/edit/status"
)
@MsAuditLog
(
module
=
"track_test_case_review"
,
type
=
OperLogConstants
.
BATCH_UPDATE
,
beforeEvent
=
"#msClass.batchLogDetails(#request)"
,
content
=
"#msClass.getLogDetails(#request)"
,
msClass
=
TestReviewTestCaseService
.
class
)
public
void
editTestCaseBatch
(
@RequestBody
TestReviewCaseBatchRequest
request
)
{
testReviewTestCaseService
.
editTestCaseBatchStatus
(
request
);
}
@PostMapping
(
"/minder/edit"
)
@MsAuditLog
(
module
=
"track_test_case_review"
,
type
=
OperLogConstants
.
ASSOCIATE_CASE
,
content
=
"#msClass.getLogDetails(#testCases)"
,
msClass
=
TestReviewTestCaseService
.
class
)
public
void
editTestCaseForMinder
(
@RequestBody
List
<
TestCaseReviewTestCase
>
testCases
)
{
testReviewTestCaseService
.
editTestCaseForMinder
(
testCases
);
...
...
@@ -67,20 +63,17 @@ public class TestReviewTestCaseController {
}
@PostMapping
(
"/edit"
)
@MsAuditLog
(
module
=
"track_test_case_review"
,
type
=
OperLogConstants
.
REVIEW
,
content
=
"#msClass.getLogDetails(#testCaseReviewTestCase)"
,
msClass
=
TestReviewTestCaseService
.
class
)
public
void
editTestCase
(
@RequestBody
TestCaseReviewTestCase
testCaseReviewTestCase
)
{
testReviewTestCaseService
.
editTestCase
(
testCaseReviewTestCase
);
}
@GetMapping
(
"/get/{reviewId}"
)
public
TestReviewCaseDTO
get
(
@PathVariable
String
reviewId
)
{
return
testReviewTestCaseService
.
get
(
reviewId
);
}
@PostMapping
(
"/list/ids"
)
public
List
<
TestReviewCaseDTO
>
getTestReviewCaseList
(
@RequestBody
QueryCaseReviewRequest
request
)
{
return
testReviewTestCaseService
.
getTestCaseReviewDTOList
(
request
);
}
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/track/controller/TrackController.java
+
0
-
1
View file @
ef114491
...
...
@@ -22,7 +22,6 @@ import java.util.List;
@RestController
@RequestMapping
(
"/track"
)
public
class
TrackController
{
@Resource
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help