Skip to content

Commit 014da62

Browse files
committed
enhance nacos openapi logic (#1227)
1 parent c9bf378 commit 014da62

3 files changed

Lines changed: 26 additions & 17 deletions

File tree

dubbo-admin-distribution/src/bin/config/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ server.port=38080
1919
dubbo.protocol.port=30880
2020
dubbo.application.qos-port=32222
2121

22-
# centers in dubbo2.7, if you want to add parameters, please add them to the url
22+
# centers in dubbo, if you want to add parameters, please add them to the url
2323
admin.registry.address=zookeeper://127.0.0.1:2181
2424
admin.config-center=zookeeper://127.0.0.1:2181
2525
admin.metadata-report.address=zookeeper://127.0.0.1:2181

dubbo-admin-server/src/main/java/org/apache/dubbo/admin/registry/nacos/NacosOpenapiUtil.java

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@
1616
*/
1717
package org.apache.dubbo.admin.registry.nacos;
1818

19+
import org.apache.dubbo.admin.controller.AccessesController;
1920
import org.apache.dubbo.common.URL;
21+
import org.apache.dubbo.common.logger.Logger;
22+
import org.apache.dubbo.common.logger.LoggerFactory;
2023
import org.apache.dubbo.common.utils.StringUtils;
2124

2225
import com.alibaba.fastjson2.JSON;
26+
import net.bytebuddy.implementation.bytecode.Throw;
2327

2428
import java.io.BufferedReader;
2529
import java.io.IOException;
@@ -30,6 +34,9 @@
3034
import java.util.List;
3135

3236
public class NacosOpenapiUtil {
37+
38+
private static final Logger logger = LoggerFactory.getLogger(NacosOpenapiUtil.class);
39+
3340
public static List<NacosData> getSubscribeAddressesWithHttpEndpoint(URL url, String serviceName) {
3441
// 定义Nacos OpenAPI的URL
3542
String nacosUrl = "http://" + url.getAddress() + "/nacos/v1/ns/service/subscribers?serviceName=" + serviceName;
@@ -60,23 +67,25 @@ public static List<NacosData> getSubscribeAddressesWithHttpEndpoint(URL url, Str
6067
// 发送请求并获取响应状态码
6168
int responseCode = connection.getResponseCode();
6269

63-
// 读取响应内容
64-
BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
65-
String line;
66-
StringBuilder response = new StringBuilder();
67-
while ((line = reader.readLine()) != null) {
68-
response.append(line);
69-
}
70-
reader.close();
70+
if (responseCode == 200) {
71+
// 读取响应内容
72+
StringBuilder response = new StringBuilder();
73+
try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
74+
String line;
75+
while ((line = reader.readLine()) != null) {
76+
response.append(line);
77+
}
78+
} catch (Throwable t) {
79+
logger.error("Error requesting nacos openapi, " + nacosUrl, t);
80+
}
7181

72-
// 打印响应结果
73-
System.out.println("Response Code: " + responseCode);
74-
System.out.println("Response Body: " + response.toString());
75-
76-
NacosResponse nacosResponse = JSON.parseObject(response.toString(), NacosResponse.class);
77-
return nacosResponse.getSubscribers();
82+
NacosResponse nacosResponse = JSON.parseObject(response.toString(), NacosResponse.class);
83+
return nacosResponse.getSubscribers();
84+
} else {
85+
logger.error("Error requesting nacos openapi, " + nacosUrl + ", error code is " + responseCode);
86+
}
7887
} catch (IOException e) {
79-
e.printStackTrace();
88+
logger.error("Error requesting nacos openapi, " + nacosUrl, e);
8089
} finally {
8190
// 关闭连接
8291
if (connection != null) {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "0.5.0-SNAPSHOT"
2+
"version": "0.6.0"
33
}

0 commit comments

Comments
 (0)