From fc8f983d9a13f4a5ae6dce7aea7a36e9065de859 Mon Sep 17 00:00:00 2001
From: xuyuefeng <aotemiaox@gmail.com>
Date: Tue, 27 Jan 2026 07:58:45 +0000
Subject: [PATCH 1/2] =?UTF-8?q?!255=20fix=20=E4=BF=AE=E5=A4=8D=20RedisMeta?=
 =?UTF-8?q?dataReport=20=E7=BC=BA=E5=B0=91=20username=20=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=9A=84=E9=97=AE=E9=A2=98=20*=20fix=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20RedisMetadataReport=20=E7=BC=BA=E5=B0=91?=
 =?UTF-8?q?=20username=20=E5=8F=82=E6=95=B0=E6=94=AF=E6=8C=81=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dubbo/metadata/store/redis/RedisMetadataReport.java       | 4 +++-
 .../ruoyi-common-dubbo/src/main/resources/common-dubbo.yml    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

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<HostAndPort> jedisClusterNodes;
     private int timeout;
+    private String username;
     private String password;
     private final String root;
     private final ConcurrentHashMap<String, MappingDataListener> 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}

From 69b17634ab09fce33c6928c22e89f9d32a26747d 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: Tue, 27 Jan 2026 16:12:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20springboot?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B03.5.10=E4=B9=8B=E5=90=8E=E5=A4=A7?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E8=AF=B7=E6=B1=82=E6=97=A0?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E9=97=AE=E9=A2=98(=E4=B8=8D=E6=B8=85?=
 =?UTF-8?q?=E6=A5=9A=E5=8E=9F=E5=9B=A0=E7=AD=89spring=E4=BF=AE=E5=A4=8D)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8c889942d..eafc83789 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
-        <spring-boot.version>3.5.10</spring-boot.version>
+        <spring-boot.version>3.5.9</spring-boot.version>
         <spring-cloud.version>2025.0.1</spring-cloud.version>
         <spring-boot-admin.version>3.5.6</spring-boot-admin.version>
         <mybatis.version>3.5.19</mybatis.version>