diff --git a/pom.xml b/pom.xml index 8c889942d..eafc83789 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ UTF-8 UTF-8 17 - 3.5.10 + 3.5.9 2025.0.1 3.5.6 3.5.19 diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java b/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java index 5acc1f2d9..fa47ed1fe 100644 --- a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java +++ b/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java @@ -55,6 +55,7 @@ public class RedisMetadataReport extends AbstractMetadataReport { protected JedisPool pool; private Set jedisClusterNodes; private int timeout; + private String username; private String password; private final String root; private final ConcurrentHashMap mappingDataListenerMap = new ConcurrentHashMap<>(); @@ -63,6 +64,7 @@ public class RedisMetadataReport extends AbstractMetadataReport { public RedisMetadataReport(URL url) { super(url); timeout = url.getParameter(TIMEOUT_KEY, DEFAULT_TIMEOUT); + username = url.getUsername(); password = url.getPassword(); this.root = url.getGroup(DEFAULT_ROOT); if (url.getParameter(CYCLE_REPORT_KEY, DEFAULT_METADATA_REPORT_CYCLE_REPORT)) { @@ -77,7 +79,7 @@ public class RedisMetadataReport extends AbstractMetadataReport { } } else { int database = url.getParameter(REDIS_DATABASE_KEY, 0); - pool = new JedisPool(new JedisPoolConfig(), url.getHost(), url.getPort(), timeout, password, database); + pool = new JedisPool(new JedisPoolConfig(), url.getHost(), url.getPort(), timeout, username, password, database); } } diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml b/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml index 9f9ed6ea7..ddf7f6980 100644 --- a/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml +++ b/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml @@ -22,7 +22,7 @@ dubbo: metadata-report: address: redis://${spring.data.redis.host:localhost}:${spring.data.redis.port:6379} group: DUBBO_GROUP - username: dubbo + username: ${spring.data.redis.username:default} password: ${spring.data.redis.password} parameters: namespace: ${spring.profiles.active}