Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 服务测试模块内的方法测试执行后，动态生成consumer信息，host为空时，控制台和服务'消费者'标签无法显示问题 #920

Merged
merged 4 commits into from
Sep 6, 2022
Merged

Fix 服务测试模块内的方法测试执行后，动态生成consumer信息，host为空时，控制台和服务'消费者'标签无法显示问题 #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3c8a9b
解决重复点功能，浏览器控制台报错问题，如点击：服务查询-搜索按钮
cnjxzhao Aug 26, 2022
cfc581d
Merge branch 'apache:develop' into develop
cnjxzhao Aug 27, 2022
e677a58
解决可能产生的空指针问题，导致 '消费者'标签无法显示数据
cnjxzhao Sep 5, 2022
0cfbc55
解决在服务测试，方法执行成功后。动态生成的consumer元数据，host取值为空的问题情况（dubbo version 3.0.8）
cnjxzhao Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/SyncUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.dubbo.common.BaseServiceMetadata;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.common.url.component.DubboServiceAddressURL;
import org.apache.dubbo.common.utils.StringUtils;

import java.util.ArrayList;
Expand Down Expand Up @@ -97,7 +98,13 @@ public static Consumer url2Consumer(Pair<String, URL> pair) {
String version = url.getUrlParam().getParameter(Constants.VERSION_KEY);
String service = BaseServiceMetadata.buildServiceKey(getServiceInterface(url), group, version);
c.setService(service);
c.setAddress(url.getHost());
if (url.getHost() == null) {
if (url instanceof DubboServiceAddressURL) {
c.setAddress(((DubboServiceAddressURL) url).getConsumerURL().getRawParameter("host"));
}
} else {
c.setAddress(url.getHost());
}
c.setApplication(url.getParameter(Constants.APPLICATION_KEY));
c.setParameters(url.toParameterString());

Expand Down
4 changes: 2 additions & 2 deletions dubbo-admin-ui/src/components/ServiceDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,10 @@
})
},
getIp: function (address) {
return address.split(':')[0]
return address != null ? address.split(':')[0] : null
},
getPort: function (address) {
return address.split(':')[1]
return address != null && address.split(':').length >= 1 ? address.split(':')[1] : null
},
toCopyText (text) {
this.$copyText(text).then(() => {
Expand Down