From 63df993402b70f59c5be6da96c8f4b4325ecfefc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 28 May 2026 14:53:58 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"fix=20=E4=BF=AE=E5=A4=8D=20dubbo=20?= =?UTF-8?q?=E5=85=83=E6=95=B0=E6=8D=AE=E5=AE=9E=E7=8E=B0=E7=B1=BB=20json?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E4=BD=BF=E7=94=A8=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 60290175c784cf699400550cb303471cd3bf96c0. --- .../store/redis/RedissonMetadataReport.java | 25 ++----------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedissonMetadataReport.java b/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedissonMetadataReport.java index 4617fe95f..9f50d1225 100644 --- a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedissonMetadataReport.java +++ b/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedissonMetadataReport.java @@ -5,10 +5,10 @@ import org.apache.dubbo.common.URL; import org.apache.dubbo.common.config.configcenter.ConfigItem; import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.common.utils.ConcurrentHashSet; +import org.apache.dubbo.common.utils.JsonUtils; import org.apache.dubbo.metadata.MappingChangedEvent; import org.apache.dubbo.metadata.MappingListener; import org.apache.dubbo.metadata.MetadataInfo; -import org.apache.dubbo.metadata.definition.model.ServiceDefinition; import org.apache.dubbo.metadata.report.identifier.KeyTypeEnum; import org.apache.dubbo.metadata.report.identifier.MetadataIdentifier; import org.apache.dubbo.metadata.report.identifier.ServiceMetadataIdentifier; @@ -16,7 +16,6 @@ import org.apache.dubbo.metadata.report.identifier.SubscriberMetadataIdentifier; import org.apache.dubbo.metadata.report.support.AbstractMetadataReport; import org.apache.dubbo.rpc.RpcException; import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.json.utils.JsonUtils; import org.redisson.api.RScript; import org.redisson.api.RTopic; import org.redisson.api.RedissonClient; @@ -90,21 +89,11 @@ public class RedissonMetadataReport extends AbstractMetadataReport { // AbstractMetadataReport — provider / consumer metadata // ------------------------------------------------------------------------- - @Override - public void storeProviderMetadata(MetadataIdentifier id, ServiceDefinition serviceDefinition) { - doStoreProviderMetadata(id, JsonUtils.toJsonString(serviceDefinition)); - } - @Override protected void doStoreProviderMetadata(MetadataIdentifier id, String serviceDefinitions) { storeMetadata(id.getUniqueKey(KeyTypeEnum.UNIQUE_KEY), serviceDefinitions, true); } - @Override - public void storeConsumerMetadata(MetadataIdentifier id, Map value) { - doStoreConsumerMetadata(id, JsonUtils.toJsonString(value)); - } - @Override protected void doStoreConsumerMetadata(MetadataIdentifier id, String value) { storeMetadata(id.getUniqueKey(KeyTypeEnum.UNIQUE_KEY), value, true); @@ -134,21 +123,11 @@ public class RedissonMetadataReport extends AbstractMetadataReport { storeMetadata(id.getUniqueKey(KeyTypeEnum.UNIQUE_KEY), urlListStr, false); } - @Override - public void saveSubscribedData(SubscriberMetadataIdentifier id, Set urls) { - doSaveSubscriberData(id, JsonUtils.toJsonString(urls)); - } - @Override protected String doGetSubscribedURLs(SubscriberMetadataIdentifier id) { return getMetadata(id.getUniqueKey(KeyTypeEnum.UNIQUE_KEY)); } - @Override - public List getSubscribedURLs(SubscriberMetadataIdentifier id) { - return JsonUtils.parseArray(doGetSubscribedURLs(id), String.class); - } - @Override public String getServiceDefinition(MetadataIdentifier id) { return getMetadata(id.getUniqueKey(KeyTypeEnum.UNIQUE_KEY)); @@ -166,7 +145,7 @@ public class RedissonMetadataReport extends AbstractMetadataReport { @Override public MetadataInfo getAppMetadata(SubscriberMetadataIdentifier id, Map instanceMetadata) { String content = getMetadata(id.getUniqueKey(KeyTypeEnum.UNIQUE_KEY)); - return JsonUtils.parseObject(content, MetadataInfo.class); + return JsonUtils.toJavaObject(content, MetadataInfo.class); } @Override