From c99e56c682a13f2584dd6fb60bf5130e69e97cbb Mon Sep 17 00:00:00 2001
From: wangshilong <shilong.wang@alpha-ess.com>
Date: Thu, 6 Feb 2025 18:10:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3redis=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-test.yaml |  9 ++--
 src/main/resources/application.yaml      | 69 ++++++++++++------------
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/src/main/resources/application-test.yaml b/src/main/resources/application-test.yaml
index 59d1dc6..3e14832 100644
--- a/src/main/resources/application-test.yaml
+++ b/src/main/resources/application-test.yaml
@@ -5,13 +5,14 @@ spring:
     url: jdbc:mysql://${MYSQL_HOST:172.17.0.1}:${MYSQL_PORT:3306}/gas_well_watch?characterEncoding=UTF-8&useUnicode=true&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: ${MYSQL_USERNAME:root}
     password: ${MYSQL_USERNAME:@Root123}
-  redis:
-    host: ${REDIS_HOST:172.17.0.1}
-    port: ${REDIS_PORT:6379}
-    database: ${REDIS_DATABASE:1}
   rabbitmq:
     host: ${RABBIT_MQ_HOST:172.17.0.1}
     port: ${RABBIT_MQ_PORT:5672}
     username: ${RABBIT_MQ_USERNAME:huaxia}
     password: ${RABBIT_MQ_PASSWORD:huaxia@2024}
     virtual-host: /gas
+  data:
+    redis:
+      host: ${REDIS_HOST:172.17.0.1}
+      port: ${REDIS_PORT:6379}
+      database: ${REDIS_DATABASE:1}
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 2dcdea6..075a1d1 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -7,41 +7,42 @@ spring:
       max-request-size: 200MB #指定为100MB -1无限制
   profiles:
     active: dev
-  redis:
-    host: ${REDIS_HOST:localhost}
-    port: ${REDIS_PORT:6379}
-    #  Redis索引（默认为 0）
-    database: ${REDIS_DATABASE:0}
-    # Redis 服务器连接密码（默认为空）
-    password: ${REDIS_PASSWORD:}
-    timeout: 5000
+  data:
+    redis:
+      host: ${REDIS_HOST:localhost}
+      port: ${REDIS_PORT:6379}
+      #  Redis索引（默认为 0）
+      database: ${REDIS_DATABASE:0}
+      # Redis 服务器连接密码（默认为空）
+      password: ${REDIS_PASSWORD:}
+      timeout: 5000
   rabbitmq:
-      host: ${RABBIT_MQ_HOST:localhost}
-      port: ${RABBIT_MQ_PORT:5672}
-      username: ${RABBIT_MQ_USERNAME:ModbusAdmin}
-      password: ${RABBIT_MQ_PASSWORD:ModbusPassword}
-      virtual-host: /
-      # public confirms机制用于解决生产者与Rabbitmq服务器之间消息可靠传输，它在消息服务器持久化消息后通知消息生产者发送成功。
-      # 发送确认
-      publisher-confirms: false
-      listener:
-        simple:
-          # manual：手动ack，需要在业务代码结束后，调用api发送ack。
-          # auto：自动ack，由spring监测listener代码是否出现异常，没有异常则返回ack；抛出异常则返回nack
-          # none：关闭ack，MQ假定消费者获取消息后会成功处理，因此消息投递后立即被删除
-          acknowledge-mode: none
-          concurrency: 10
-        retry:
-          # 开启消费者失败重试
-          enabled: false
-          # 初始的失败等待时长为1秒
-          initial-interval: 1000ms
-          # 失败的等待时长倍数，下次等待时长 = multiplier * initial-interval
-          multiplier: 1
-          # 最大重试次数
-          max-attempts: 3
-          # true无状态；false有状态。如果业务中包含事务，这里改为false
-          stateless: false
+    host: ${RABBIT_MQ_HOST:localhost}
+    port: ${RABBIT_MQ_PORT:5672}
+    username: ${RABBIT_MQ_USERNAME:ModbusAdmin}
+    password: ${RABBIT_MQ_PASSWORD:ModbusPassword}
+    virtual-host: /
+    # public confirms机制用于解决生产者与Rabbitmq服务器之间消息可靠传输，它在消息服务器持久化消息后通知消息生产者发送成功。
+    # 发送确认
+    publisher-confirms: false
+    listener:
+      simple:
+        # manual：手动ack，需要在业务代码结束后，调用api发送ack。
+        # auto：自动ack，由spring监测listener代码是否出现异常，没有异常则返回ack；抛出异常则返回nack
+        # none：关闭ack，MQ假定消费者获取消息后会成功处理，因此消息投递后立即被删除
+        acknowledge-mode: none
+        concurrency: 10
+      retry:
+        # 开启消费者失败重试
+        enabled: false
+        # 初始的失败等待时长为1秒
+        initial-interval: 1000ms
+        # 失败的等待时长倍数，下次等待时长 = multiplier * initial-interval
+        multiplier: 1
+        # 最大重试次数
+        max-attempts: 3
+        # true无状态；false有状态。如果业务中包含事务，这里改为false
+        stateless: false
 
 
 server: