You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by mi...@apache.org on 2019/02/20 12:54:33 UTC
[incubator-dubbo-ops] branch develop updated: fix #313 get service
name from simplified url
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/develop by this push:
new 908960b fix #313 get service name from simplified url
908960b is described below
commit 908960bd35f878b8260ecc8e26528cbd12f09b0a
Author: nzomkxia <z8...@gmail.com>
AuthorDate: Wed Feb 20 20:54:28 2019 +0800
fix #313 get service name from simplified url
---
.../dubbo/admin/service/impl/ProviderServiceImpl.java | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/ProviderServiceImpl.java b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/ProviderServiceImpl.java
index 084746f..1ffebe4 100644
--- a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/ProviderServiceImpl.java
+++ b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/ProviderServiceImpl.java
@@ -28,6 +28,7 @@ import org.apache.dubbo.admin.service.ProviderService;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.metadata.identifier.MetadataIdentifier;
+import org.omg.CosNaming.NamingContextExtPackage.StringNameHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -459,11 +460,20 @@ public class ProviderServiceImpl extends AbstractService implements ProviderServ
public Set<ServiceDTO> convertProviders2DTO(List<Provider> providers) {
Set<ServiceDTO> result = new TreeSet<>();
for (Provider provider : providers) {
- Map<String, String> map = StringUtils.parseQueryString(provider.getParameters());
String app = provider.getApplication();
- String service = map.get(Constants.INTERFACE_KEY);
- String group = map.get(Constants.GROUP_KEY);
- String version = map.get(Constants.VERSION_KEY);
+ String service = provider.getService();
+ String group = null;
+ String version = null;
+ int i = service.indexOf("/");
+ if (i >= 0) {
+ group = service.substring(0, i);
+ service = service.substring(i + 1);
+ }
+ i = service.lastIndexOf(":");
+ if (i >= 0) {
+ version = service.substring(i + 1);
+ service = service.substring(0, i);
+ }
ServiceDTO s = new ServiceDTO();
s.setAppName(app);
s.setService(service);