You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2022/07/14 06:06:46 UTC
[dubbo-admin] branch develop updated: Add seriialization & timeout (#914)
This is an automated email from the ASF dual-hosted git repository.
albumenj 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 0c90908 Add seriialization & timeout (#914)
0c90908 is described below
commit 0c9090837c328f2b2e2039af0a4d6c12cdafb2f9
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Thu Jul 14 14:06:41 2022 +0800
Add seriialization & timeout (#914)
* update year
* fix search
* add relation support
* disable swagger
* fix interface
* fix interface
---
.../apache/dubbo/admin/common/util/SyncUtils.java | 3 ++
.../apache/dubbo/admin/model/domain/Provider.java | 34 ++++++++++++++--------
.../service/impl/InstanceRegistryQueryHelper.java | 3 ++
dubbo-admin-ui/src/components/ServiceDetail.vue | 11 ++-----
dubbo-admin-ui/src/components/ServiceSearch.vue | 4 +++
5 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/SyncUtils.java b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/SyncUtils.java
index 1c8188b..2499454 100644
--- a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/SyncUtils.java
+++ b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/SyncUtils.java
@@ -21,6 +21,7 @@ import org.apache.dubbo.admin.model.domain.Provider;
import org.apache.dubbo.admin.model.domain.RegistrySource;
import org.apache.dubbo.common.BaseServiceMetadata;
import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.common.utils.StringUtils;
import java.util.ArrayList;
@@ -62,6 +63,8 @@ public class SyncUtils {
p.setDynamic(url.getParameter("dynamic", true));
p.setEnabled(url.getParameter(Constants.ENABLED_KEY, true));
+ p.setSerialization(url.getParameter(org.apache.dubbo.remoting.Constants.SERIALIZATION_KEY, "hessian2"));
+ p.setTimeout(url.getParameter(CommonConstants.TIMEOUT_KEY, CommonConstants.DEFAULT_TIMEOUT));
p.setWeight(url.getParameter(Constants.WEIGHT_KEY, Constants.DEFAULT_WEIGHT));
p.setUsername(url.getParameter("owner"));
p.setRegistrySource(RegistrySource.INTERFACE);
diff --git a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Provider.java b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Provider.java
index 182225b..3d4b151 100644
--- a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Provider.java
+++ b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Provider.java
@@ -46,6 +46,10 @@ public class Provider extends Entity {
private boolean enabled; /* provider enabled or not */
+ private int timeout; /* provider timeout */
+
+ private String serialization; /* provider serialization */
+
private int weight; /* provider weight */
private String application; /* application name */
@@ -191,6 +195,22 @@ public class Provider extends Entity {
this.registrySource = registrySource;
}
+ public int getTimeout() {
+ return timeout;
+ }
+
+ public void setTimeout(int timeout) {
+ this.timeout = timeout;
+ }
+
+ public String getSerialization() {
+ return serialization;
+ }
+
+ public void setSerialization(String serialization) {
+ this.serialization = serialization;
+ }
+
public URL toUrl() {
Map<String, String> serviceName2Map = ConvertUtil.serviceName2Map(getService());
/*if(!serviceName2Map.containsKey(Constants.INTERFACE_KEY)) {
@@ -221,16 +241,6 @@ public class Provider extends Entity {
return url;
}
- public boolean equalsWithoutRegistry(Provider provider) {
- if (this == provider) {
- return true;
- }
- if (!super.equals(provider)) {
- return false;
- }
- return dynamic == provider.dynamic && enabled == provider.enabled && weight == provider.weight && alived == provider.alived && Objects.equals(service, provider.service) && Objects.equals(parameters, provider.parameters) && Objects.equals(address, provider.address) && Objects.equals(registry, provider.registry) && Objects.equals(application, provider.application) && Objects.equals(username, provider.username) && Objects.equals(expired, provider.expired) && Objects.equals(override, [...]
- }
-
@java.lang.Override
public boolean equals(Object o) {
if (this == o) {
@@ -243,11 +253,11 @@ public class Provider extends Entity {
return false;
}
Provider provider = (Provider) o;
- return dynamic == provider.dynamic && enabled == provider.enabled && weight == provider.weight && alived == provider.alived && Objects.equals(service, provider.service) && Objects.equals(url, provider.url) && Objects.equals(parameters, provider.parameters) && Objects.equals(address, provider.address) && Objects.equals(registry, provider.registry) && Objects.equals(application, provider.application) && Objects.equals(username, provider.username) && Objects.equals(expired, provider [...]
+ return dynamic == provider.dynamic && enabled == provider.enabled && timeout == provider.timeout && weight == provider.weight && alived == provider.alived && Objects.equals(service, provider.service) && Objects.equals(url, provider.url) && Objects.equals(parameters, provider.parameters) && Objects.equals(address, provider.address) && Objects.equals(registry, provider.registry) && Objects.equals(serialization, provider.serialization) && Objects.equals(application, provider.applica [...]
}
@java.lang.Override
public int hashCode() {
- return Objects.hash(super.hashCode(), service, url, parameters, address, registry, dynamic, enabled, weight, application, username, expired, alived, override, overrides, registrySource);
+ return Objects.hash(super.hashCode(), service, url, parameters, address, registry, dynamic, enabled, timeout, serialization, weight, application, username, expired, alived, override, overrides, registrySource);
}
}
diff --git a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/InstanceRegistryQueryHelper.java b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/InstanceRegistryQueryHelper.java
index 36793b7..c401ff8 100644
--- a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/InstanceRegistryQueryHelper.java
+++ b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/InstanceRegistryQueryHelper.java
@@ -24,6 +24,7 @@ import org.apache.dubbo.admin.model.domain.Consumer;
import org.apache.dubbo.admin.model.domain.Provider;
import org.apache.dubbo.admin.model.domain.RegistrySource;
import org.apache.dubbo.common.URLBuilder;
+import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.common.url.component.ServiceConfigURL;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.metadata.MetadataInfo;
@@ -178,6 +179,8 @@ public class InstanceRegistryQueryHelper {
p.setUrl(url.toFullString());
p.setDynamic(url.getParameter("dynamic", true));
p.setEnabled(url.getParameter(Constants.ENABLED_KEY, true));
+ p.setSerialization(url.getParameter(org.apache.dubbo.remoting.Constants.SERIALIZATION_KEY, "hessian2"));
+ p.setTimeout(url.getParameter(CommonConstants.TIMEOUT_KEY, CommonConstants.DEFAULT_TIMEOUT));
p.setWeight(url.getParameter(Constants.WEIGHT_KEY, Constants.DEFAULT_WEIGHT));
p.setUsername(url.getParameter("owner"));
p.setRegistrySource(RegistrySource.INSTANCE);
diff --git a/dubbo-admin-ui/src/components/ServiceDetail.vue b/dubbo-admin-ui/src/components/ServiceDetail.vue
index 3f9121e..e8ebe6b 100644
--- a/dubbo-admin-ui/src/components/ServiceDetail.vue
+++ b/dubbo-admin-ui/src/components/ServiceDetail.vue
@@ -55,8 +55,8 @@
<td>{{getIp(props.item.address)}}</td>
<td>{{getPort(props.item.address)}}</td>
<td>{{props.item.registrySource}}</td>
- <td></td>
- <td></td>
+ <td>{{props.item.timeout}}</td>
+ <td>{{props.item.serialization}}</td>
<td>{{props.item.weight}}</td>
<td>
<v-tooltip top>
@@ -84,7 +84,6 @@
>
<template slot="items" slot-scope="props">
<td>{{getIp(props.item.address)}}</td>
- <td>{{getPort(props.item.address)}}</td>
<td>{{props.item.application}}</td>
</template>
</v-data-table>
@@ -177,7 +176,7 @@
},
{
text: this.$t('serialization'),
- value: 'serial'
+ value: 'serialization'
},
{
text: this.$t('weight'),
@@ -194,10 +193,6 @@
text: this.$t('ip'),
value: 'ip'
},
- {
- text: this.$t('port'),
- value: 'port'
- },
{
text: this.$t('appName'),
value: 'appName'
diff --git a/dubbo-admin-ui/src/components/ServiceSearch.vue b/dubbo-admin-ui/src/components/ServiceSearch.vue
index c5ce4fb..4627fbd 100644
--- a/dubbo-admin-ui/src/components/ServiceSearch.vue
+++ b/dubbo-admin-ui/src/components/ServiceSearch.vue
@@ -201,6 +201,7 @@ export default {
}
const instanceRegistry = this.$t('instanceRegistry')
const interfaceRegistry = this.$t('interfaceRegistry')
+ const allRegistry = this.$t('allRegistry')
return this.resultPage.content.filter(function (item) {
if (item.registrySource === 'INSTANCE') {
item.registrySource = instanceRegistry
@@ -208,6 +209,9 @@ export default {
if (item.registrySource === 'INTERFACE') {
item.registrySource = interfaceRegistry
}
+ if (item.registrySource === 'ALL') {
+ item.registrySource = allRegistry
+ }
return item
})
}