[dubbo-admin] branch develop updated: Adapt to the dubbo-api-docs-core-2.7.8.3. (#752)

[ranke]

This is an automated email from the ASF dual-hosted git repository.

ranke pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git


The following commit(s) were added to refs/heads/develop by this push:
     new 1884242  Adapt to the dubbo-api-docs-core-2.7.8.3. (#752)
1884242 is described below

commit 1884242b8005a47c5949b6722cbd76ca33b4141d
Author: wuwen <wuwen...@aliyun.com>
AuthorDate: Thu May 20 09:37:43 2021 +0800

    Adapt to the dubbo-api-docs-core-2.7.8.3. (#752)
---
 .../dubbo/admin/controller/ApiDocsController.java  | 32 +++++++++++++++-------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git 
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/ApiDocsController.java
 
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/ApiDocsController.java
index 3941d64..1eddcab 100644
--- 
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/ApiDocsController.java
+++ 
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/ApiDocsController.java
@@ -80,6 +80,12 @@ public class ApiDocsController {
     @Value("${dubbo.consumer.timeout:1000}")
     private int timeout;
 
+    @Value("${dubbo.api.docs.group:apiDocsGroup}")
+    private String apiDocsGroup;
+
+    @Value("${dubbo.api.docs.version:v1}")
+    private String apiDocsVersion;
+
     @InitBinder
     public void initBinder(WebDataBinder binder) {
         binder.registerCustomEditor(String.class, new 
StringTrimmerEditor(true));
@@ -164,22 +170,15 @@ public class ApiDocsController {
     @ApiOperation(value = "Get basic information of all modules, excluding API 
parameter information", notes = "Get basic information of all modules, 
excluding API parameter information", httpMethod = "GET", produces = 
"application/json")
     @GetMapping("/apiModuleList")
     public String apiModuleList(ApiInfoRequest apiInfoRequest){
-        CallDubboServiceRequest req = new CallDubboServiceRequest();
-        req.setRegistryCenterUrl("dubbo://" + apiInfoRequest.getDubboIp() + 
":" + apiInfoRequest.getDubboPort());
-        
req.setInterfaceClassName("org.apache.dubbo.apidocs.core.providers.IDubboDocProvider");
-        req.setMethodName("apiModuleList");
-        req.setAsync(false);
+        CallDubboServiceRequest req = 
createCallApiDocsServiceRequest("apiModuleList", apiInfoRequest);
+
         return callDubboService(req, null);
     }
 
     @ApiOperation(value = "Get the parameter information of the specified 
API", notes = "Get the parameter information of the specified API", httpMethod 
= "GET", produces = "application/json")
     @GetMapping("/apiParamsResp")
     public String apiParamsResp(ApiInfoRequest apiInfoRequest){
-        CallDubboServiceRequest req = new CallDubboServiceRequest();
-        req.setRegistryCenterUrl("dubbo://" + apiInfoRequest.getDubboIp() + 
":" + apiInfoRequest.getDubboPort());
-        
req.setInterfaceClassName("org.apache.dubbo.apidocs.core.providers.IDubboDocProvider");
-        req.setMethodName("apiParamsResponseInfo");
-        req.setAsync(false);
+        CallDubboServiceRequest req = 
createCallApiDocsServiceRequest("apiParamsResponseInfo", apiInfoRequest);
 
         List<CallDubboServiceRequestInterfaceParam> methodparams = new 
ArrayList<>(1);
         CallDubboServiceRequestInterfaceParam param = new 
CallDubboServiceRequestInterfaceParam();
@@ -205,4 +204,17 @@ public class ApiDocsController {
         }
         return false;
     }
+
+    private CallDubboServiceRequest createCallApiDocsServiceRequest(String 
methodName, ApiInfoRequest apiInfoRequest) {
+        CallDubboServiceRequest req = new CallDubboServiceRequest();
+        req.setRegistryCenterUrl("dubbo://" + apiInfoRequest.getDubboIp() + 
":" + apiInfoRequest.getDubboPort());
+        req.setMethodName(methodName);
+
+        
req.setInterfaceClassName("org.apache.dubbo.apidocs.core.providers.IDubboDocProvider");
+        req.setAsync(false);
+        req.setVersion(apiDocsVersion);
+        req.setGroup(apiDocsGroup);
+
+        return req;
+    }
 }