From 3fa56da2570bb1b41c7a76fc1fb341a48901105c Mon Sep 17 00:00:00 2001 From: Sven Carstensen Date: Mon, 15 Sep 2025 16:07:28 +0200 Subject: [PATCH] Erweiterungen --- .../assecutor/votianlt/mqtt/MqttV5ClientManager.java | 11 ++++++----- src/main/resources/application.properties | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/assecutor/votianlt/mqtt/MqttV5ClientManager.java b/src/main/java/de/assecutor/votianlt/mqtt/MqttV5ClientManager.java index e6790c8..f35f1ed 100644 --- a/src/main/java/de/assecutor/votianlt/mqtt/MqttV5ClientManager.java +++ b/src/main/java/de/assecutor/votianlt/mqtt/MqttV5ClientManager.java @@ -48,15 +48,12 @@ public class MqttV5ClientManager implements SmartLifecycle { String clientId = buildClientId(props.getClientId()); URI uri = URI.create(props.getBrokerUri()); String host = uri.getHost(); - int port = uri.getPort() > 0 ? uri.getPort() : ("ssl".equalsIgnoreCase(uri.getScheme()) || "mqtts".equalsIgnoreCase(uri.getScheme()) ? 8883 : 1883); + int port = 42099; var builder = Mqtt5Client.builder() .identifier(clientId) .serverHost(host) .serverPort(port); - if ("ssl".equalsIgnoreCase(uri.getScheme()) || "mqtts".equalsIgnoreCase(uri.getScheme()) || "tls".equalsIgnoreCase(uri.getScheme())) { - builder = builder.sslWithDefaultConfig(); - } if (props.isAutomaticReconnect()) { builder = builder.automaticReconnectWithDefaultConfig(); } @@ -65,7 +62,11 @@ public class MqttV5ClientManager implements SmartLifecycle { var connect = client.connectWith() .cleanStart(props.isCleanStart()) .keepAlive(props.getKeepAlive()) - .sessionExpiryInterval(props.getSessionExpiryInterval()); + .sessionExpiryInterval(props.getSessionExpiryInterval()) + .simpleAuth() + .username("app") + .password("apppwd".getBytes(StandardCharsets.UTF_8)) + .applySimpleAuth(); log.info("[MQTT] Connecting to {} with clientId={} ...", props.getBrokerUri(), clientId); connect.send().join(); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 03e603d..f9858f0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -42,7 +42,8 @@ spring.jackson.default-property-inclusion=non_null # MQTT v5 settings app.mqtt.enabled=true -app.mqtt.broker-uri=tcp://192.168.180.26:1883 +#app.mqtt.broker-uri=mqtt://192.168.180.26:1883 +app.mqtt.broker-uri=mqtt://mqtt-2.assecutor.de # The server MQTT clientId; a random UUID suffix will be inserted where ${random.uuid} appears app.mqtt.client-id=server-${random.uuid} # v5 session and keepalive