Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
holmes
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
QA
holmes
Commits
24398d8f
Commit
24398d8f
authored
Jul 05, 2022
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提侧说明和测试流程去掉权限设置及从缓存获取用户信息
parent
f9c4c75a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
PipelineController.java
...va/cn/qg/holmes/controller/gitlab/PipelineController.java
+6
-6
QualityController.java
...va/cn/qg/holmes/controller/quality/QualityController.java
+3
-3
No files found.
src/main/java/cn/qg/holmes/controller/gitlab/PipelineController.java
View file @
24398d8f
...
...
@@ -145,15 +145,15 @@ public class PipelineController {
* 新增ding robot 以及对应的pipeline
* @return
*/
@RequiresPermissions
(
"qa:process:add"
)
//
@RequiresPermissions("qa:process:add")
@PostMapping
(
"/add"
)
public
JsonResult
addRobotAndPipeline
(
@RequestBody
DingRobotPipelineVo
dingRobotPipelineVo
)
{
try
{
DingRobot
dingRobot
=
dingRobotPipelineVo
.
getDingRobot
();
// 设置创建人
String
token
=
servletRequest
.
getHeader
(
"token"
);
UserInfoVo
userInfoVo
=
tokenService
.
getUserInfoFromCache
(
token
);
dingRobot
.
setCreator
(
userInfoVo
.
getChineseName
());
//
UserInfoVo userInfoVo = tokenService.getUserInfoFromCache(token);
//
dingRobot.setCreator(userInfoVo.getChineseName());
String
projectName
=
dingRobot
.
getProjectName
();
String
jiraProjectKey
=
dingRobot
.
getJiraProjectKey
();
QueryWrapper
<
DingRobot
>
dingRobotQueryWrapper
=
new
QueryWrapper
<>();
...
...
@@ -223,7 +223,7 @@ public class PipelineController {
* @param dingRobotPipelineVo
* @return
*/
@RequiresPermissions
(
"qa:process:edit"
)
//
@RequiresPermissions("qa:process:edit")
@PostMapping
(
"/modify"
)
public
JsonResult
modifyPipeline
(
@RequestBody
DingRobotPipelineVo
dingRobotPipelineVo
)
{
try
{
...
...
@@ -275,7 +275,7 @@ public class PipelineController {
* @param dingRobotId
* @return
*/
@RequiresPermissions
(
"qa:process:del"
)
//
@RequiresPermissions("qa:process:del")
@GetMapping
(
"/delete"
)
public
JsonResult
deletePipeline
(
@RequestParam
Integer
dingRobotId
)
{
try
{
...
...
@@ -299,7 +299,7 @@ public class PipelineController {
* @param status 状态,1-进行中,2-已完成
* @return
*/
@RequiresPermissions
(
"qa:process:finish"
)
//
@RequiresPermissions("qa:process:finish")
@PostMapping
(
"/finish"
)
public
JsonResult
finishPipeline
(
@RequestParam
Integer
dingRobotId
,
@RequestParam
Integer
status
)
{
try
{
...
...
src/main/java/cn/qg/holmes/controller/quality/QualityController.java
View file @
24398d8f
...
...
@@ -85,7 +85,7 @@ public class QualityController {
* @param submitTestInstruction 提测说明实体类
* @return
*/
@RequiresPermissions
(
"qa:testDescription:add"
)
//
@RequiresPermissions("qa:testDescription:add")
@PostMapping
(
"/testInstruction/save"
)
public
JsonResult
saveSubmitTestInstruction
(
@RequestBody
SubmitTestInstruction
submitTestInstruction
)
{
String
projectName
=
submitTestInstruction
.
getProjectName
();
...
...
@@ -104,7 +104,7 @@ public class QualityController {
* @param submitTestInstruction 提测说明实体
* @return
*/
@RequiresPermissions
(
"qa:testDescription:edit"
)
//
@RequiresPermissions("qa:testDescription:edit")
@PostMapping
(
"/testInstruction/update"
)
public
JsonResult
updateSubmitTestInstruction
(
@RequestBody
SubmitTestInstruction
submitTestInstruction
)
{
Integer
id
=
submitTestInstruction
.
getId
();
...
...
@@ -179,7 +179,7 @@ public class QualityController {
* @param submitTestInstruction 提测说明实体
* @return
*/
@RequiresPermissions
(
"qa:testDescription:del"
)
//
@RequiresPermissions("qa:testDescription:del")
@PostMapping
(
"/testInstruction/delete"
)
public
JsonResult
deleteSubmitTestInstruction
(
@RequestBody
SubmitTestInstruction
submitTestInstruction
)
{
return
JsonResult
.
buildSuccessResult
(
"删除成功!"
,
instructionService
.
removeById
(
submitTestInstruction
.
getId
()));
...
...
Write
Preview
Markdown
is supported
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