You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by st...@apache.org on 2021/12/16 13:13:53 UTC
[rocketmq-dashboard] branch master updated: [ISSUE #50]Modify the suffix of the interface name. (#52)
This is an automated email from the ASF dual-hosted git repository.
styletang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-dashboard.git
The following commit(s) were added to refs/heads/master by this push:
new 1caeb4c [ISSUE #50]Modify the suffix of the interface name. (#52)
1caeb4c is described below
commit 1caeb4ce314163d556b3e25e89a3dee34645883a
Author: zhangjidi2016 <10...@qq.com>
AuthorDate: Thu Dec 16 21:13:48 2021 +0800
[ISSUE #50]Modify the suffix of the interface name. (#52)
* [ISSUE #50]Modify the suffix of the interface name.
* add perm
* fix dlq perm
Co-authored-by: zhangjidi2016 <zh...@cmss.chinamobile.com>
---
.../apache/rocketmq/dashboard/controller/DlqMessageController.java | 4 ++--
src/main/resources/role-permission.yml | 2 ++
src/main/resources/static/src/dlqMessage.js | 4 ++--
.../rocketmq/dashboard/controller/DlqMessageControllerTest.java | 4 ++--
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/rocketmq/dashboard/controller/DlqMessageController.java b/src/main/java/org/apache/rocketmq/dashboard/controller/DlqMessageController.java
index 7caec9f..d32b1aa 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/controller/DlqMessageController.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/controller/DlqMessageController.java
@@ -59,7 +59,7 @@ public class DlqMessageController {
return dlqMessageService.queryDlqMessageByPage(query);
}
- @GetMapping(value = "/exportDlqMessage.query")
+ @GetMapping(value = "/exportDlqMessage.do")
public void exportDlqMessage(HttpServletResponse response, @RequestParam String consumerGroup,
@RequestParam String msgId) {
MessageExt messageExt = null;
@@ -83,7 +83,7 @@ public class DlqMessageController {
return dlqMessageService.batchResendDlqMessage(dlqMessages);
}
- @PostMapping(value = "/batchExportDlqMessage.query")
+ @PostMapping(value = "/batchExportDlqMessage.do")
public void batchExportDlqMessage(HttpServletResponse response, @RequestBody List<DlqMessageRequest> dlqMessages) {
List<DlqMessageExcelModel> dlqMessageExcelModelList = new ArrayList<>(dlqMessages.size());
for (DlqMessageRequest dlqMessage : dlqMessages) {
diff --git a/src/main/resources/role-permission.yml b/src/main/resources/role-permission.yml
index 0ae1a93..f95fa2f 100644
--- a/src/main/resources/role-permission.yml
+++ b/src/main/resources/role-permission.yml
@@ -35,3 +35,5 @@ rolePerms:
- /consumer/*.query
- /cluster/*.query
- /dlqMessage/*.query
+ - /dlqMessage/exportDlqMessage.do
+ - /dlqMessage/batchResendDlqMessage.do
diff --git a/src/main/resources/static/src/dlqMessage.js b/src/main/resources/static/src/dlqMessage.js
index 66ac514..352e4cc 100644
--- a/src/main/resources/static/src/dlqMessage.js
+++ b/src/main/resources/static/src/dlqMessage.js
@@ -182,7 +182,7 @@ module.controller('dlqMessageController', ['$scope', 'ngDialog', '$http', 'Notif
};
$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 = [];
@@ -227,7 +227,7 @@ module.controller('dlqMessageController', ['$scope', 'ngDialog', '$http', 'Notif
}
$http({
method: "POST",
- url: "dlqMessage/batchExportDlqMessage.query",
+ url: "dlqMessage/batchExportDlqMessage.do",
data: $scope.selectedDlqMessage,
headers: {
'Content-type': 'application/json'
diff --git a/src/test/java/org/apache/rocketmq/dashboard/controller/DlqMessageControllerTest.java b/src/test/java/org/apache/rocketmq/dashboard/controller/DlqMessageControllerTest.java
index 1e6e682..767881a 100644
--- a/src/test/java/org/apache/rocketmq/dashboard/controller/DlqMessageControllerTest.java
+++ b/src/test/java/org/apache/rocketmq/dashboard/controller/DlqMessageControllerTest.java
@@ -113,7 +113,7 @@ public class DlqMessageControllerTest extends BaseControllerTest {
@Test
public void testExportDlqMessage() throws Exception {
- final String url = "/dlqMessage/exportDlqMessage.query";
+ final String url = "/dlqMessage/exportDlqMessage.do";
{
when(mqAdminExt.viewMessage(any(), any()))
.thenThrow(new RuntimeException())
@@ -156,7 +156,7 @@ public class DlqMessageControllerTest extends BaseControllerTest {
@Test
public void testBatchExportDlqMessage() throws Exception {
- final String url = "/dlqMessage/batchExportDlqMessage.query";
+ final String url = "/dlqMessage/batchExportDlqMessage.do";
{
when(mqAdminExt.viewMessage("%DLQ%group_test", "0A9A003F00002A9F0000000000000310"))
.thenThrow(new RuntimeException());