From f9e1df00001798c32b84b95e806990b71285148f Mon Sep 17 00:00:00 2001 From: wangshilong Date: Thu, 6 Feb 2025 18:26:46 +0800 Subject: [PATCH] =?UTF-8?q?redis,=20rtcp=E6=9C=8D=E5=8A=A1=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E9=85=8D=E7=BD=AE=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gaswellwatch/modbus/data/Redis2DBPersistenceService.java | 5 ++++- src/main/resources/application-test.yaml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/isu/gaswellwatch/modbus/data/Redis2DBPersistenceService.java b/src/main/java/com/isu/gaswellwatch/modbus/data/Redis2DBPersistenceService.java index b11bd5a..a124b34 100644 --- a/src/main/java/com/isu/gaswellwatch/modbus/data/Redis2DBPersistenceService.java +++ b/src/main/java/com/isu/gaswellwatch/modbus/data/Redis2DBPersistenceService.java @@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.ParameterizedTypeReference; import org.springframework.dao.DataAccessException; import org.springframework.data.redis.core.*; @@ -50,6 +51,8 @@ public class Redis2DBPersistenceService { private JdbcTemplate jdbcTemplate; @Resource(name = "stringRedisTemplate") private RedisTemplate redisTemplate; + @Value("${app.modbus-rtcp-host:http://localhost:9999}") + private String modbusRtcpHost; @Resource private RabbitTemplate rabbitTemplate; @Resource @@ -145,7 +148,7 @@ public class Redis2DBPersistenceService { private void writeOnlineGateway() { try { - RequestEntity request = RequestEntity.get("http://localhost:9999/modbus-tcp/online").build(); + RequestEntity request = RequestEntity.get(this.modbusRtcpHost + "/modbus-tcp/online").build(); ResponseEntity>> response = this.restTemplate.exchange(request, new ParameterizedTypeReference>>() { }); diff --git a/src/main/resources/application-test.yaml b/src/main/resources/application-test.yaml index 3e14832..b839cf1 100644 --- a/src/main/resources/application-test.yaml +++ b/src/main/resources/application-test.yaml @@ -14,5 +14,8 @@ spring: data: redis: host: ${REDIS_HOST:172.17.0.1} - port: ${REDIS_PORT:6379} + port: ${REDIS_PORT:56379} database: ${REDIS_DATABASE:1} + +app: + modbus-rtcp-host: http://172.17.0.1:9999