Jelajahi Sumber

!256 fix 修复 springboot升级到3.5.10之后大文件上传请求无响应问题(不清楚原因等spring修复)
Merge pull request !256 from 疯狂的狮子Li/dev

疯狂的狮子Li 5 bulan lalu
induk
melakukan
f31a3060ac

+ 1 - 1
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>

+ 3 - 1
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);
         }
     }
 

+ 1 - 1
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}