From 999a639c0f8753989419314ae4441f62d9115804 Mon Sep 17 00:00:00 2001 From: Pengfei-Lu <459350594@qq.com> Date: Thu, 29 Jun 2023 10:41:27 +0800 Subject: [PATCH 1/4] Fix #5138. Signed-off-by: Pengfei-Lu <459360594@qq.com> --- redisson-spring-boot-starter/README.md | 29 +++++++++++++------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/redisson-spring-boot-starter/README.md b/redisson-spring-boot-starter/README.md index e88976fb0..bda5d1ead 100644 --- a/redisson-spring-boot-starter/README.md +++ b/redisson-spring-boot-starter/README.md @@ -41,20 +41,21 @@ Using common spring boot settings: ```yaml spring: - redis: - database: - host: - port: - password: - ssl: - timeout: - connectTimeout: - clientName: - cluster: - nodes: - sentinel: - master: - nodes: + data: + redis: + database: + host: + port: + password: + ssl: + timeout: + connectTimeout: + clientName: + cluster: + nodes: + sentinel: + master: + nodes: ``` Using Redisson config file ([single mode](https://github.com/redisson/redisson/wiki/2.-Configuration#262-single-instance-yaml-config-format), From 1893169796153ffc7120728dddf1cc28cf40bf1e Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Thu, 29 Jun 2023 07:12:01 +0300 Subject: [PATCH 2/4] Update README.md --- redisson-spring-boot-starter/README.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/redisson-spring-boot-starter/README.md b/redisson-spring-boot-starter/README.md index bda5d1ead..f4ef54b04 100644 --- a/redisson-spring-boot-starter/README.md +++ b/redisson-spring-boot-starter/README.md @@ -37,7 +37,7 @@ Downgrade `redisson-spring-data` module if necessary to support required Spring ### 2. Add settings into `application.settings` file -Using common spring boot settings: +Using common Spring Boot 3.x+ settings: ```yaml spring: @@ -58,6 +58,28 @@ spring: nodes: ``` +Using common Spring Boot up to 2.9.x settings: + +```yaml +spring: + data: + redis: + database: + host: + port: + password: + ssl: + timeout: + connectTimeout: + clientName: + cluster: + nodes: + sentinel: + master: + nodes: +``` + + Using Redisson config file ([single mode](https://github.com/redisson/redisson/wiki/2.-Configuration#262-single-instance-yaml-config-format), [replicated mode](https://github.com/redisson/redisson/wiki/2.-Configuration#252-replicated-yaml-config-format), [cluster mode](https://github.com/redisson/redisson/wiki/2.-Configuration#242-cluster-yaml-config-format), From 6db2ae02c740b2f9b47f142c67a6d510fa5d188a Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Thu, 29 Jun 2023 07:48:40 +0300 Subject: [PATCH 3/4] Update README.md --- redisson-spring-boot-starter/README.md | 29 +++++++++++++------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/redisson-spring-boot-starter/README.md b/redisson-spring-boot-starter/README.md index f4ef54b04..ec34692f5 100644 --- a/redisson-spring-boot-starter/README.md +++ b/redisson-spring-boot-starter/README.md @@ -62,21 +62,20 @@ Using common Spring Boot up to 2.9.x settings: ```yaml spring: - data: - redis: - database: - host: - port: - password: - ssl: - timeout: - connectTimeout: - clientName: - cluster: - nodes: - sentinel: - master: - nodes: + redis: + database: + host: + port: + password: + ssl: + timeout: + connectTimeout: + clientName: + cluster: + nodes: + sentinel: + master: + nodes: ``` From e625671f5f34c743bae7e5bc30dd8c4152cc943c Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Thu, 29 Jun 2023 07:49:18 +0300 Subject: [PATCH 4/4] Update README.md --- redisson-spring-boot-starter/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redisson-spring-boot-starter/README.md b/redisson-spring-boot-starter/README.md index ec34692f5..1ded4fad5 100644 --- a/redisson-spring-boot-starter/README.md +++ b/redisson-spring-boot-starter/README.md @@ -58,7 +58,7 @@ spring: nodes: ``` -Using common Spring Boot up to 2.9.x settings: +Using common Spring Boot up to 2.7.x settings: ```yaml spring: