From b388a8f49ed3a39b9912d320d30da3504df79164 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 9 Mar 2022 17:49:23 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BC=93=E5=AD=98=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9redis=E5=93=A8=E5=85=B5=E5=92=8C=E5=88=86=E7=89=87?=
 =?UTF-8?q?=E9=9B=86=E7=BE=A4=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                               |  6 ----
 .../src/main/resources/application.properties | 31 ++++++++++++++-----
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 3a8a62a498..7d1e213fc0 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -284,12 +284,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>redis.clients</groupId>
-                    <artifactId>jedis</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 89396ba266..df130211f2 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -61,8 +61,9 @@ quartz.scheduler-name=deServerJob
 spring.servlet.multipart.max-file-size=500MB
 spring.servlet.multipart.max-request-size=500MB
 # actuator
-management.server.port=8083
-management.endpoints.web.exposure.include=*
+management.health.redis.enabled=false
+#management.server.port=8083
+#management.endpoints.web.exposure.include=*
 #spring.freemarker.checkTemplateLocation=false
 #RSA非对称加密参数：私钥
 rsa.private_key=MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
@@ -86,16 +87,30 @@ server.compression.mime-types=application/javascript,text/css,application/json,a
 server.compression.min-response-size=1024
 
 #下面的配置新增到/opt/dataease/conf/dataease/properties
-#spring.redis.database=0
-#spring.redis.host=192.168.0.110
-#spring.redis.port=6379
-#spring.redis.password=DataEase_ZNB@REDIS
+#缓存类型
+##spring.cache.type=redis
+#spring.cache.type=ehcache
+#redis公共配置
 #spring.redis.timeout=10000
 #spring.redis.lettuce.pool.max-active=8
 #spring.redis.lettuce.pool.max-wait=-1
 #spring.redis.lettuce.pool.max-idle=8
-##spring.cache.type=redis
-#spring.cache.type=ehcache
+
+#单机模式redis配置
+#spring.redis.database=0
+#spring.redis.host=192.168.0.110
+#spring.redis.port=6379
+#spring.redis.password=DataEase_ZNB@REDIS
+
+#哨兵模式redis配置
+#spring.redis.sentinel.master=mymaster
+#spring.redis.sentinel.nodes=192.168.0.110:26379,192.168.0.110:26380,192.168.0.110:26381
+#spring.redis.sentinel.password=
+
+#cluster模式redis配置
+#spring.redis.cluster.nodes=192.168.0.110:7001,192.168.0.110:7002,192.168.0.110:7003,192.168.0.110:7004,192.168.0.110:7005,192.168.0.110:7006
+#spring.redis.cluster.max-redirects=3
+#spring.redis.password=DataEase_ZNB@REDIS