[INLONG-4900][Manager] Modify the request address of the API for quic…

…k search (#4901)
apache · Jul 7, 2022 · d01e212 · d01e212
1 parent 635074a
commit d01e212
Show file tree

Hide file tree

Showing 22 changed files with 145 additions and 167 deletions.
diff --git a/...er/manager-web/src/main/java/org/apache/inlong/manager/web/controller/AnnoController.java b/...er/manager-web/src/main/java/org/apache/inlong/manager/web/controller/AnnoController.java
@@ -33,22 +33,20 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * Anno controller.
+ * Anno controller, such as login, register, etc.
  */
 @Slf4j
 @RestController
-@RequestMapping("/anno")
-@Api(tags = "User - Anno (No Auth)")
+@Api(tags = "User-Anno-API")
 public class AnnoController {
 
     @Autowired
     UserService userService;
 
-    @PostMapping("/login")
+    @PostMapping("/anno/login")
     public Response<String> login(@Validated @RequestBody LoginUser loginUser) {
 
         Subject subject = SecurityUtils.getSubject();
@@ -59,12 +57,12 @@ public Response<String> login(@Validated @RequestBody LoginUser loginUser) {
         return Response.success("success");
     }
 
-    @PostMapping("/doRegister")
+    @PostMapping("/anno/doRegister")
     public Response<Boolean> doRegister(@Validated @RequestBody UserInfo userInfo) {
         return Response.success(userService.create(userInfo));
     }
 
-    @GetMapping("/logout")
+    @GetMapping("/anno/logout")
     public Response<String> logout() {
         SecurityUtils.getSubject().logout();
         return Response.success("success");

diff --git a/...r/manager-web/src/main/java/org/apache/inlong/manager/web/controller/AuditController.java b/...r/manager-web/src/main/java/org/apache/inlong/manager/web/controller/AuditController.java
@@ -19,30 +19,29 @@
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
-import java.util.List;
-import javax.validation.Valid;
 import org.apache.inlong.manager.common.beans.Response;
 import org.apache.inlong.manager.common.pojo.audit.AuditRequest;
 import org.apache.inlong.manager.common.pojo.audit.AuditVO;
 import org.apache.inlong.manager.service.core.AuditService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
 /**
  * Audit controller.
  */
 @RestController
-@RequestMapping("/audit")
-@Api(tags = "Audit")
+@Api(tags = "Audit-API")
 public class AuditController {
 
     @Autowired
     private AuditService auditService;
 
-    @GetMapping(value = "/list")
+    @GetMapping(value = "/audit/list")
     @ApiOperation(value = "Query audit list according to conditions")
     public Response<List<AuditVO>> listByCondition(@Valid AuditRequest request) throws IOException {
         return Response.success(auditService.listByCondition(request));

diff --git a/...ger-web/src/main/java/org/apache/inlong/manager/web/controller/ConsumptionController.java b/...ger-web/src/main/java/org/apache/inlong/manager/web/controller/ConsumptionController.java
@@ -39,44 +39,42 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Data consumption interface
  */
 @RestController
-@RequestMapping("/consumption")
-@Api(tags = "Data Consumption")
+@Api(tags = "Consumption-API")
 public class ConsumptionController {
 
     @Autowired
     private ConsumptionService consumptionService;
     @Autowired
     private ConsumptionProcessOperation processOperation;
 
-    @GetMapping("/summary")
+    @GetMapping("/consumption/summary")
     @ApiOperation(value = "Get data consumption summary")
     public Response<ConsumptionSummary> getSummary(ConsumptionQuery query) {
         query.setUsername(LoginUserUtils.getLoginUserDetail().getUsername());
         return Response.success(consumptionService.getSummary(query));
     }
 
-    @GetMapping("/list")
+    @GetMapping("/consumption/list")
     @ApiOperation(value = "List data consumptions")
     public Response<PageInfo<ConsumptionListVo>> list(ConsumptionQuery query) {
         query.setUsername(LoginUserUtils.getLoginUserDetail().getUsername());
         return Response.success(consumptionService.list(query));
     }
 
-    @GetMapping("/get/{id}")
+    @GetMapping("/consumption/get/{id}")
     @ApiOperation(value = "Get consumption details")
     @ApiImplicitParam(name = "id", value = "Consumption ID", dataTypeClass = Integer.class, required = true)
     public Response<ConsumptionInfo> getDetail(@PathVariable(name = "id") Integer id) {
         return Response.success(consumptionService.get(id));
     }
 
-    @DeleteMapping("/delete/{id}")
+    @DeleteMapping("/consumption/delete/{id}")
     @OperationLog(operation = OperationType.DELETE)
     @ApiOperation(value = "Delete data consumption")
     @ApiImplicitParam(name = "id", value = "Consumption ID", dataTypeClass = Integer.class, required = true)
@@ -85,15 +83,15 @@ public Response<Object> delete(@PathVariable(name = "id") Integer id) {
         return Response.success();
     }
 
-    @PostMapping("/save")
+    @PostMapping("/consumption/save")
     @OperationLog(operation = OperationType.UPDATE)
     @ApiOperation(value = "Save data consumption", notes = "Full coverage")
     public Response<Integer> save(@Validated @RequestBody ConsumptionInfo consumptionInfo) {
         String currentUser = LoginUserUtils.getLoginUserDetail().getUsername();
         return Response.success(consumptionService.save(consumptionInfo, currentUser));
     }
 
-    @PostMapping("/update/{id}")
+    @PostMapping("/consumption/update/{id}")
     @OperationLog(operation = OperationType.UPDATE)
     @ApiOperation(value = "Update data consumption")
     public Response<String> update(@PathVariable(name = "id") Integer id,
@@ -103,7 +101,7 @@ public Response<String> update(@PathVariable(name = "id") Integer id,
         return Response.success();
     }
 
-    @PostMapping("/startProcess/{id}")
+    @PostMapping("/consumption/startProcess/{id}")
     @OperationLog(operation = OperationType.UPDATE)
     @ApiOperation(value = "Start approval process")
     @ApiImplicitParam(name = "id", value = "Consumption ID", dataTypeClass = Integer.class, required = true)

diff --git a/...anager-web/src/main/java/org/apache/inlong/manager/web/controller/DataNodeController.java b/...anager-web/src/main/java/org/apache/inlong/manager/web/controller/DataNodeController.java
@@ -39,21 +39,19 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Data node controller
  */
 @RestController
-@RequestMapping("/node")
 @Api(tags = "Data-Node-API")
 public class DataNodeController {
 
     @Autowired
     private DataNodeService dataNodeService;
 
-    @PostMapping(value = "/save")
+    @PostMapping(value = "/node/save")
     @ApiOperation(value = "Save node")
     @OperationLog(operation = OperationType.CREATE)
     @RequiresRoles(value = UserRoleCode.ADMIN)
@@ -62,28 +60,28 @@ public Response<Integer> save(@Validated @RequestBody DataNodeRequest request) {
         return Response.success(dataNodeService.save(request, currentUser));
     }
 
-    @GetMapping(value = "/get/{id}")
+    @GetMapping(value = "/node/get/{id}")
     @ApiOperation(value = "Get node by id")
     @ApiImplicitParam(name = "id", value = "data node ID", dataTypeClass = Integer.class, required = true)
     public Response<DataNodeResponse> get(@PathVariable Integer id) {
         return Response.success(dataNodeService.get(id));
     }
 
-    @PostMapping(value = "/list")
+    @PostMapping(value = "/node/list")
     @ApiOperation(value = "List data node")
     public Response<PageInfo<DataNodeResponse>> list(@RequestBody DataNodePageRequest request) {
         return Response.success(dataNodeService.list(request));
     }
 
-    @PostMapping(value = "/update")
+    @PostMapping(value = "/node/update")
     @OperationLog(operation = OperationType.UPDATE)
     @ApiOperation(value = "Update data node")
     public Response<Boolean> update(@Validated(UpdateValidation.class) @RequestBody DataNodeRequest request) {
         String username = LoginUserUtils.getLoginUserDetail().getUsername();
         return Response.success(dataNodeService.update(request, username));
     }
 
-    @DeleteMapping(value = "/delete/{id}")
+    @DeleteMapping(value = "/node/delete/{id}")
     @ApiOperation(value = "Delete data node by id")
     @OperationLog(operation = OperationType.DELETE)
     @ApiImplicitParam(name = "id", value = "Data node ID", dataTypeClass = Integer.class, required = true)
@@ -92,7 +90,7 @@ public Response<Boolean> delete(@PathVariable Integer id) {
         return Response.success(dataNodeService.delete(id, LoginUserUtils.getLoginUserDetail().getUsername()));
     }
 
-    @PostMapping("/testConnection")
+    @PostMapping("/node/testConnection")
     @ApiOperation(value = "Test connection for data node")
     public Response<Boolean> testConnection(@Validated @RequestBody DataNodeRequest request) {
         return Response.success(dataNodeService.testConnection(request));

diff --git a/...nager-web/src/main/java/org/apache/inlong/manager/web/controller/HeartbeatController.java b/...nager-web/src/main/java/org/apache/inlong/manager/web/controller/HeartbeatController.java
@@ -37,45 +37,44 @@
  * Heartbeat controller.
  */
 @RestController
-@RequestMapping("/heartbeat")
 @Api(tags = "Heartbeat-API")
 public class HeartbeatController {
 
     @Autowired
     private HeartbeatService heartbeatService;
 
-    @RequestMapping(value = "/component/get", method = RequestMethod.POST)
+    @RequestMapping(value = "/heartbeat/component/get", method = RequestMethod.POST)
     @ApiOperation(value = "Get component heartbeat")
     public Response<ComponentHeartbeatResponse> getComponentHeartbeat(@RequestBody HeartbeatQueryRequest request) {
         return Response.success(heartbeatService.getComponentHeartbeat(request));
     }
 
-    @RequestMapping(value = "/group/get", method = RequestMethod.POST)
+    @RequestMapping(value = "/heartbeat/group/get", method = RequestMethod.POST)
     @ApiOperation(value = "Get group heartbeat")
     public Response<GroupHeartbeatResponse> getGroupHeartbeat(@RequestBody HeartbeatQueryRequest request) {
         return Response.success(heartbeatService.getGroupHeartbeat(request));
     }
 
-    @RequestMapping(value = "/stream/get", method = RequestMethod.POST)
+    @RequestMapping(value = "/heartbeat/stream/get", method = RequestMethod.POST)
     @ApiOperation(value = "Get stream heartbeat")
     public Response<StreamHeartbeatResponse> getStreamHeartbeat(@RequestBody HeartbeatQueryRequest request) {
         return Response.success(heartbeatService.getStreamHeartbeat(request));
     }
 
-    @RequestMapping(value = "/component/list", method = RequestMethod.POST)
+    @RequestMapping(value = "/heartbeat/component/list", method = RequestMethod.POST)
     @ApiOperation(value = "List component heartbeats")
     public Response<PageInfo<ComponentHeartbeatResponse>> listComponentHeartbeat(
             @RequestBody HeartbeatPageRequest request) {
         return Response.success(heartbeatService.listComponentHeartbeat(request));
     }
 
-    @RequestMapping(value = "/group/list", method = RequestMethod.POST)
+    @RequestMapping(value = "/heartbeat/group/list", method = RequestMethod.POST)
     @ApiOperation(value = "List group heartbeats")
     public Response<PageInfo<GroupHeartbeatResponse>> listGroupHeartbeat(@RequestBody HeartbeatPageRequest request) {
         return Response.success(heartbeatService.listGroupHeartbeat(request));
     }
 
-    @RequestMapping(value = "/stream/list", method = RequestMethod.POST)
+    @RequestMapping(value = "/heartbeat/stream/list", method = RequestMethod.POST)
     @ApiOperation(value = "List stream heartbeats")
     public Response<PageInfo<StreamHeartbeatResponse>> listStreamHeartbeat(@RequestBody HeartbeatPageRequest request) {
         return Response.success(heartbeatService.listStreamHeartbeat(request));