jiulinxiri/rocketmq-dashboard
1
0
Fork 0
mirror of https://github.com/apache/rocketmq-dashboard.git synced 2026-05-30 06:45:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ISSUE #50]Modify the suffix of the interface name. (#52)

Browse Source 
* [ISSUE #50]Modify the suffix of the interface name.

* add perm

* fix dlq perm

Co-authored-by: zhangjidi2016 <zhangjidi@cmss.chinamobile.com>
This commit is contained in:
zhangjidi2016
2021-12-16 21:13:48 +08:00
committed by GitHub
parent 749e6f15f7
commit 1caeb4ce31
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/apache/rocketmq/dashboard/controller/DlqMessageController.java
View File

@@ -59,7 +59,7 @@ public class DlqMessageController {
return dlqMessageService.queryDlqMessageByPage(query); return dlqMessageService.queryDlqMessageByPage(query);
} }
@GetMapping(value = "/exportDlqMessage.query") @GetMapping(value = "/exportDlqMessage.do")
public void exportDlqMessage(HttpServletResponse response, @RequestParam String consumerGroup, public void exportDlqMessage(HttpServletResponse response, @RequestParam String consumerGroup,
@RequestParam String msgId) { @RequestParam String msgId) {
MessageExt messageExt = null; MessageExt messageExt = null;
@@ -83,7 +83,7 @@ public class DlqMessageController {
return dlqMessageService.batchResendDlqMessage(dlqMessages); return dlqMessageService.batchResendDlqMessage(dlqMessages);
} }
@PostMapping(value = "/batchExportDlqMessage.query") @PostMapping(value = "/batchExportDlqMessage.do")
public void batchExportDlqMessage(HttpServletResponse response, @RequestBody List<DlqMessageRequest> dlqMessages) { public void batchExportDlqMessage(HttpServletResponse response, @RequestBody List<DlqMessageRequest> dlqMessages) {
List<DlqMessageExcelModel> dlqMessageExcelModelList = new ArrayList<>(dlqMessages.size()); List<DlqMessageExcelModel> dlqMessageExcelModelList = new ArrayList<>(dlqMessages.size());
for (DlqMessageRequest dlqMessage : dlqMessages) { for (DlqMessageRequest dlqMessage : dlqMessages) {

2
src/main/resources/role-permission.yml
View File

@@ -35,3 +35,5 @@ rolePerms:
- /consumer/*.query - /consumer/*.query
- /cluster/*.query - /cluster/*.query
- /dlqMessage/*.query - /dlqMessage/*.query
- /dlqMessage/exportDlqMessage.do
- /dlqMessage/batchResendDlqMessage.do

4
src/main/resources/static/src/dlqMessage.js
View File

@@ -182,7 +182,7 @@ module.controller('dlqMessageController', ['$scope', 'ngDialog', '$http', 'Notif
}; };
$scope.exportDlqMessage = function (msgId, consumerGroup) { $scope.exportDlqMessage = function (msgId, consumerGroup) {
window.location.href = "dlqMessage/exportDlqMessage.query?msgId=" + msgId + "&consumerGroup=" + consumerGroup; window.location.href = "dlqMessage/exportDlqMessage.do?msgId=" + msgId + "&consumerGroup=" + consumerGroup;
}; };
$scope.selectedDlqMessage = []; $scope.selectedDlqMessage = [];
@@ -227,7 +227,7 @@ module.controller('dlqMessageController', ['$scope', 'ngDialog', '$http', 'Notif
} }
$http({ $http({
method: "POST", method: "POST",
url: "dlqMessage/batchExportDlqMessage.query", url: "dlqMessage/batchExportDlqMessage.do",
data: $scope.selectedDlqMessage, data: $scope.selectedDlqMessage,
headers: { headers: {
'Content-type': 'application/json' 'Content-type': 'application/json'

4
src/test/java/org/apache/rocketmq/dashboard/controller/DlqMessageControllerTest.java
View File

@@ -113,7 +113,7 @@ public class DlqMessageControllerTest extends BaseControllerTest {
@Test @Test
public void testExportDlqMessage() throws Exception { public void testExportDlqMessage() throws Exception {
final String url = "/dlqMessage/exportDlqMessage.query"; final String url = "/dlqMessage/exportDlqMessage.do";
{ {
when(mqAdminExt.viewMessage(any(), any())) when(mqAdminExt.viewMessage(any(), any()))
.thenThrow(new RuntimeException()) .thenThrow(new RuntimeException())
@@ -156,7 +156,7 @@ public class DlqMessageControllerTest extends BaseControllerTest {
@Test @Test
public void testBatchExportDlqMessage() throws Exception { public void testBatchExportDlqMessage() throws Exception {
final String url = "/dlqMessage/batchExportDlqMessage.query"; final String url = "/dlqMessage/batchExportDlqMessage.do";
{ {
when(mqAdminExt.viewMessage("%DLQ%group_test", "0A9A003F00002A9F0000000000000310")) when(mqAdminExt.viewMessage("%DLQ%group_test", "0A9A003F00002A9F0000000000000310"))
.thenThrow(new RuntimeException()); .thenThrow(new RuntimeException());