diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/logger/log4j2/Log4j2LoggerAdapter.java b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/log4j2/Log4j2LoggerAdapter.java
index 0a74a63739..c8f25d59e5 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/logger/log4j2/Log4j2LoggerAdapter.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/log4j2/Log4j2LoggerAdapter.java
@@ -21,6 +21,7 @@ import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerAdapter;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.config.Configurator;
import java.io.File;
@@ -30,6 +31,12 @@ public class Log4j2LoggerAdapter implements LoggerAdapter {
private Level level;
public Log4j2LoggerAdapter() {
+ try {
+ org.apache.logging.log4j.Logger logger = LogManager.getRootLogger();
+ this.level = fromLog4j2Level(logger.getLevel());
+ } catch (Exception t) {
+ // ignore
+ }
}
private static org.apache.logging.log4j.Level toLog4j2Level(Level level) {
@@ -94,6 +101,7 @@ public class Log4j2LoggerAdapter implements LoggerAdapter {
@Override
public void setLevel(Level level) {
this.level = level;
+ Configurator.setLevel(LogManager.getRootLogger(), toLog4j2Level(level));
}
@Override
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLogger.java b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLogger.java
index 7b8ca7b3c7..47ab865cab 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLogger.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLogger.java
@@ -16,6 +16,7 @@
*/
package org.apache.dubbo.common.logger.slf4j;
+import org.apache.dubbo.common.logger.Level;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.support.FailsafeLogger;
@@ -250,4 +251,27 @@ public class Slf4jLogger implements Logger {
return logger.isErrorEnabled();
}
+ public static Level getLevel(org.slf4j.Logger logger) {
+ if (logger.isTraceEnabled()) {
+ return Level.TRACE;
+ }
+ if (logger.isDebugEnabled()) {
+ return Level.DEBUG;
+ }
+ if (logger.isInfoEnabled()) {
+ return Level.INFO;
+ }
+ if (logger.isWarnEnabled()) {
+ return Level.WARN;
+ }
+ if (logger.isErrorEnabled()) {
+ return Level.ERROR;
+ }
+ return Level.OFF;
+ }
+
+ public Level getLevel() {
+ return getLevel(logger);
+ }
+
}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLoggerAdapter.java b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLoggerAdapter.java
index 1f56242dda..47f4c170c3 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLoggerAdapter.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLoggerAdapter.java
@@ -20,14 +20,21 @@ import org.apache.dubbo.common.logger.Level;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerAdapter;
import org.apache.dubbo.common.utils.ClassUtils;
-
+import org.slf4j.LoggerFactory;
import java.io.File;
public class Slf4jLoggerAdapter implements LoggerAdapter {
public static final String NAME = "slf4j";
+
private Level level;
private File file;
+ private static final org.slf4j.Logger ROOT_LOGGER = LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
+
+ public Slf4jLoggerAdapter() {
+ this.level = Slf4jLogger.getLevel(ROOT_LOGGER);
+ }
+
@Override
public Logger getLogger(String key) {
return new Slf4jLogger(org.slf4j.LoggerFactory.getLogger(key));
@@ -45,6 +52,7 @@ public class Slf4jLoggerAdapter implements LoggerAdapter {
@Override
public void setLevel(Level level) {
+ System.err.printf("The level of slf4j logger current can not be set, using the default level: %s \n", Slf4jLogger.getLevel(ROOT_LOGGER));
this.level = level;
}
diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml
index 416eb14596..c335d50632 100644
--- a/dubbo-config/dubbo-config-spring/pom.xml
+++ b/dubbo-config/dubbo-config-spring/pom.xml
@@ -27,7 +27,7 @@
The spring config module of dubbo project
false
- 2.7.13
+ 2.7.14
diff --git a/dubbo-demo/dubbo-demo-annotation/pom.xml b/dubbo-demo/dubbo-demo-annotation/pom.xml
index ea1af4ed9f..8e46e0d3c0 100644
--- a/dubbo-demo/dubbo-demo-annotation/pom.xml
+++ b/dubbo-demo/dubbo-demo-annotation/pom.xml
@@ -30,7 +30,7 @@
true
- 2.7.13
+ 2.7.14
diff --git a/dubbo-demo/dubbo-demo-api/pom.xml b/dubbo-demo/dubbo-demo-api/pom.xml
index 270d23969d..6b59e1a693 100644
--- a/dubbo-demo/dubbo-demo-api/pom.xml
+++ b/dubbo-demo/dubbo-demo-api/pom.xml
@@ -36,7 +36,7 @@
true
- 2.7.13
+ 2.7.14
dubbo-demo-api
diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml
index 167793e315..4497c0f756 100644
--- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml
+++ b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml
@@ -31,7 +31,7 @@
8
8
1.7.33
- 2.7.13
+ 2.7.14
true
diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml
index a381207d9d..1a22083b7e 100644
--- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml
+++ b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml
@@ -31,7 +31,7 @@
8
8
1.7.33
- 2.7.13
+ 2.7.14
true
diff --git a/dubbo-demo/dubbo-demo-spring-boot/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/pom.xml
index 1ccad7f96f..9170101e54 100644
--- a/dubbo-demo/dubbo-demo-spring-boot/pom.xml
+++ b/dubbo-demo/dubbo-demo-spring-boot/pom.xml
@@ -36,8 +36,8 @@
8
8
true
- 2.7.13
- 2.7.13
+ 2.7.14
+ 2.7.14
1.11.2
diff --git a/dubbo-demo/dubbo-demo-xml/pom.xml b/dubbo-demo/dubbo-demo-xml/pom.xml
index 6115b3c769..aee6254372 100644
--- a/dubbo-demo/dubbo-demo-xml/pom.xml
+++ b/dubbo-demo/dubbo-demo-xml/pom.xml
@@ -32,7 +32,7 @@
true
- 2.7.13
+ 2.7.14
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index ae5542cf46..9ba68f2fea 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -92,11 +92,11 @@
5.3.25
- 5.8.4
+ 5.8.5
3.29.2-GA
1.14.5
3.2.10.Final
- 4.1.94.Final
+ 4.1.95.Final
2.2.1
2.4.4
4.5.14
@@ -182,13 +182,12 @@
3.2.13
1.6.11
- 1.1.10.2
+ 1.1.10.3
1.70
2.0.6
5.4.3
2.10.1
2.15.2
- 1.6
6.1.26
2.0
1.5.0
@@ -789,11 +788,6 @@
jackson-datatype-jsr310
${jackson_version}
-
- com.github.briandilley.jsonrpc4j
- jsonrpc4j
- ${jsonrpc_version}
-
javax.portlet
portlet-api
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscoveryFactory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscoveryFactory.java
index 57b4213433..469a507510 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscoveryFactory.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscoveryFactory.java
@@ -50,9 +50,14 @@ public abstract class AbstractServiceDiscoveryFactory implements ServiceDiscover
@Override
public ServiceDiscovery getServiceDiscovery(URL registryURL) {
- String key = registryURL.toServiceStringWithoutResolving();
+ String key = createRegistryCacheKey(registryURL);
return ConcurrentHashMapUtils.computeIfAbsent(discoveries, key, k -> createDiscovery(registryURL));
}
+ protected String createRegistryCacheKey(URL url) {
+ return url.toServiceStringWithoutResolving();
+ }
+
protected abstract ServiceDiscovery createDiscovery(URL registryURL);
+
}
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryFactory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryFactory.java
index c5d5ab9c53..def02318b0 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryFactory.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryFactory.java
@@ -26,6 +26,11 @@ import static org.apache.dubbo.registry.Constants.DEFAULT_REGISTRY;
public class ServiceDiscoveryRegistryFactory extends AbstractRegistryFactory {
+ @Override
+ protected String createRegistryCacheKey(URL url) {
+ return url.toFullString();
+ }
+
@Override
protected Registry createRegistry(URL url) {
if (UrlUtils.hasServiceDiscoveryRegistryProtocol(url)) {
diff --git a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscoveryFactory.java b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscoveryFactory.java
index 56e1c26a42..c6a350a3c0 100644
--- a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscoveryFactory.java
+++ b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscoveryFactory.java
@@ -17,11 +17,25 @@
package org.apache.dubbo.registry.nacos;
import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.registry.client.AbstractServiceDiscoveryFactory;
import org.apache.dubbo.registry.client.ServiceDiscovery;
+import static org.apache.dubbo.common.constants.CommonConstants.CONFIG_NAMESPACE_KEY;
+
public class NacosServiceDiscoveryFactory extends AbstractServiceDiscoveryFactory {
+ @Override
+ protected String createRegistryCacheKey(URL url) {
+ String namespace = url.getParameter(CONFIG_NAMESPACE_KEY);
+ url = URL.valueOf(url.toServiceStringWithoutResolving());
+ if (StringUtils.isNotEmpty(namespace)) {
+ url = url.addParameter(CONFIG_NAMESPACE_KEY, namespace);
+ }
+
+ return url.toFullString();
+ }
+
@Override
protected ServiceDiscovery createDiscovery(URL registryURL) {
return new NacosServiceDiscovery(applicationModel, registryURL);
diff --git a/dubbo-spring-boot/pom.xml b/dubbo-spring-boot/pom.xml
index 48f9f83204..fe1b850dff 100644
--- a/dubbo-spring-boot/pom.xml
+++ b/dubbo-spring-boot/pom.xml
@@ -41,7 +41,7 @@
- 2.7.13
+ 2.7.14
${revision}
2.20.0