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/13 13:18:24 UTC
[rocketmq-dashboard] branch master updated: update default role-permission (#51)
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 749e6f1 update default role-permission (#51)
749e6f1 is described below
commit 749e6f15f769ce6fb50f58ded2881dad0e450f5f
Author: StyleTang <st...@gmail.com>
AuthorDate: Mon Dec 13 21:18:20 2021 +0800
update default role-permission (#51)
---
.../dashboard/controller/DashboardController.java | 2 +-
.../dashboard/controller/DlqMessageController.java | 4 ++--
.../rocketmq/dashboard/controller/NamesvrController.java | 2 +-
src/main/resources/role-permission.yml | 16 +++++++++-------
src/main/resources/static/src/dlqMessage.js | 4 ++--
src/main/resources/static/src/remoteApi/remoteApi.js | 2 +-
.../dashboard/controller/DashboardControllerTest.java | 2 +-
.../dashboard/controller/DlqMessageControllerTest.java | 4 ++--
.../dashboard/controller/NamesvrControllerTest.java | 2 +-
9 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/apache/rocketmq/dashboard/controller/DashboardController.java b/src/main/java/org/apache/rocketmq/dashboard/controller/DashboardController.java
index 0b46144..5b0379c 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/controller/DashboardController.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/controller/DashboardController.java
@@ -51,7 +51,7 @@ public class DashboardController {
return dashboardService.queryTopicData(date,topicName);
}
- @RequestMapping(value = "/topicCurrent", method = RequestMethod.GET)
+ @RequestMapping(value = "/topicCurrent.query", method = RequestMethod.GET)
@ResponseBody
public Object topicCurrent() {
return dashboardService.queryTopicCurrentData();
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 d32b1aa..7caec9f 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.do")
+ @GetMapping(value = "/exportDlqMessage.query")
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.do")
+ @PostMapping(value = "/batchExportDlqMessage.query")
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/java/org/apache/rocketmq/dashboard/controller/NamesvrController.java b/src/main/java/org/apache/rocketmq/dashboard/controller/NamesvrController.java
index c3f106b..a4a8a4e 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/controller/NamesvrController.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/controller/NamesvrController.java
@@ -32,7 +32,7 @@ public class NamesvrController {
@Resource
private OpsService opsService;
- @RequestMapping(value = "/nsaddr", method = RequestMethod.GET)
+ @RequestMapping(value = "/nsaddr.query", method = RequestMethod.GET)
@ResponseBody
@OriginalControllerReturnValue
public Object nsaddr() {
diff --git a/src/main/resources/role-permission.yml b/src/main/resources/role-permission.yml
index 420081b..0ae1a93 100644
--- a/src/main/resources/role-permission.yml
+++ b/src/main/resources/role-permission.yml
@@ -23,13 +23,15 @@
rolePerms:
ordinary:
- - /rocketmq/nsaddr
- - /ops/*
- - /dashboard/**
+ - /rocketmq/*.query
+ - /ops/*.query
+ - /dashboard/*.query
- /topic/*.query
- /topic/sendTopicMessage.do
- /producer/*.query
- - /message/*
- - /messageTrace/*
- - /monitor/*
-
+ - /message/*.query
+ - /messageTrace/*.query
+ - /monitor/*.query
+ - /consumer/*.query
+ - /cluster/*.query
+ - /dlqMessage/*.query
diff --git a/src/main/resources/static/src/dlqMessage.js b/src/main/resources/static/src/dlqMessage.js
index 352e4cc..66ac514 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.do?msgId=" + msgId + "&consumerGroup=" + consumerGroup;
+ window.location.href = "dlqMessage/exportDlqMessage.query?msgId=" + msgId + "&consumerGroup=" + consumerGroup;
};
$scope.selectedDlqMessage = [];
@@ -227,7 +227,7 @@ module.controller('dlqMessageController', ['$scope', 'ngDialog', '$http', 'Notif
}
$http({
method: "POST",
- url: "dlqMessage/batchExportDlqMessage.do",
+ url: "dlqMessage/batchExportDlqMessage.query",
data: $scope.selectedDlqMessage,
headers: {
'Content-type': 'application/json'
diff --git a/src/main/resources/static/src/remoteApi/remoteApi.js b/src/main/resources/static/src/remoteApi/remoteApi.js
index 1189771..e1accdc 100644
--- a/src/main/resources/static/src/remoteApi/remoteApi.js
+++ b/src/main/resources/static/src/remoteApi/remoteApi.js
@@ -54,7 +54,7 @@ app.service('remoteApi', ['$http','tools', function ($http,tools) {
}
var queryTopicCurrentData = function(callback){
- var url = 'dashboard/topicCurrent';
+ var url = 'dashboard/topicCurrent.query';
var setting = {
type: "GET",
timeout:15000,//data is too large,so master set time out is long enough
diff --git a/src/test/java/org/apache/rocketmq/dashboard/controller/DashboardControllerTest.java b/src/test/java/org/apache/rocketmq/dashboard/controller/DashboardControllerTest.java
index b756885..e196b5f 100644
--- a/src/test/java/org/apache/rocketmq/dashboard/controller/DashboardControllerTest.java
+++ b/src/test/java/org/apache/rocketmq/dashboard/controller/DashboardControllerTest.java
@@ -152,7 +152,7 @@ public class DashboardControllerTest extends BaseControllerTest {
@Test
public void testTopicCurrent() throws Exception {
- final String url = "/dashboard/topicCurrent";
+ final String url = "/dashboard/topicCurrent.query";
requestBuilder = MockMvcRequestBuilders.get(url);
perform = mockMvc.perform(requestBuilder);
perform.andExpect(status().isOk())
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 767881a..1e6e682 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.do";
+ final String url = "/dlqMessage/exportDlqMessage.query";
{
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.do";
+ final String url = "/dlqMessage/batchExportDlqMessage.query";
{
when(mqAdminExt.viewMessage("%DLQ%group_test", "0A9A003F00002A9F0000000000000310"))
.thenThrow(new RuntimeException());
diff --git a/src/test/java/org/apache/rocketmq/dashboard/controller/NamesvrControllerTest.java b/src/test/java/org/apache/rocketmq/dashboard/controller/NamesvrControllerTest.java
index f40c990..6683df1 100644
--- a/src/test/java/org/apache/rocketmq/dashboard/controller/NamesvrControllerTest.java
+++ b/src/test/java/org/apache/rocketmq/dashboard/controller/NamesvrControllerTest.java
@@ -34,7 +34,7 @@ public class NamesvrControllerTest extends BaseControllerTest {
@Test
public void testNsaddr() throws Exception {
- final String url = "/rocketmq/nsaddr";
+ final String url = "/rocketmq/nsaddr.query";
{
super.mockRmqConfigure();
}