diff --git a/pom.xml b/pom.xml index b3874941746f4ddd5d3223c3c4ab06f6f7577659..09a163906ae03008c7ca4d15ee5321d866c87b2e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 io.github.quickmsg smqtt - 1.1.4 + 1.1.5 smqtt-common smqtt-core diff --git a/smqtt-bootstrap/pom.xml b/smqtt-bootstrap/pom.xml index f0d58b92f97558ac19a9bd372660b69cacc5e595..efd819a6c010eabbbe9c2e00b09892e4dc6d4c96 100644 --- a/smqtt-bootstrap/pom.xml +++ b/smqtt-bootstrap/pom.xml @@ -7,10 +7,10 @@ smqtt io.github.quickmsg - 1.1.4 + 1.1.5 smqtt-bootstrap - 1.1.4 + 1.1.5 smqtt-bootstrap http://www.example.com @@ -45,17 +45,17 @@ io.github.quickmsg smqtt-core - 1.1.4 + 1.1.5 smqtt-registry-scube io.github.quickmsg - 1.1.4 + 1.1.5 smqtt-ui io.github.quickmsg - 1.1.4 + 1.1.5 @@ -120,7 +120,12 @@ latest ${project.version} + + ${REGISTRY_USERNAME} + ${REGISTRY_PASSWORD} + + io.github.quickmsg.docker.DockerStarter diff --git a/smqtt-common/pom.xml b/smqtt-common/pom.xml index 48321198b665d34b32553d36a48949f2030ef26e..9f6b9dc18808564827003ca9453712a78058fdb1 100644 --- a/smqtt-common/pom.xml +++ b/smqtt-common/pom.xml @@ -5,7 +5,7 @@ smqtt io.github.quickmsg - 1.1.4 + 1.1.5 4.0.0 jar diff --git a/smqtt-common/src/main/java/io/github/quickmsg/common/channel/MqttChannel.java b/smqtt-common/src/main/java/io/github/quickmsg/common/channel/MqttChannel.java index 2ee7018baf8d5d27a6a3f038bfc3fb52d1ff7dbc..34fe1e1d5886b62fe7e1efc023507d05a0a87f11 100644 --- a/smqtt-common/src/main/java/io/github/quickmsg/common/channel/MqttChannel.java +++ b/smqtt-common/src/main/java/io/github/quickmsg/common/channel/MqttChannel.java @@ -156,10 +156,10 @@ public class MqttChannel { public int generateMessageId() { int value; while (qos2MsgCache.containsKey(value = atomicInteger.incrementAndGet())) { - if (value >= Integer.MAX_VALUE) { + if (value >= 65535) { synchronized (this) { value = atomicInteger.incrementAndGet(); - if (value >= Integer.MAX_VALUE) { + if (value >= 65535) { atomicInteger.set(0); } else { break; diff --git a/smqtt-core/pom.xml b/smqtt-core/pom.xml index 22f6b5a7cd8409c9140f66d87dd7502aadaaf962..74bb56ed3053a316e418b810f0c2870c6477e16a 100644 --- a/smqtt-core/pom.xml +++ b/smqtt-core/pom.xml @@ -5,7 +5,7 @@ smqtt io.github.quickmsg - 1.1.4 + 1.1.5 4.0.0 smqtt-core @@ -14,22 +14,22 @@ io.github.quickmsg smqtt-common - 1.1.4 + 1.1.5 io.github.quickmsg smqtt-rule-dsl - 1.1.4 + 1.1.5 io.github.quickmsg smqtt-metric-influxdb - 1.1.4 + 1.1.5 io.github.quickmsg smqtt-metric-prometheus - 1.1.4 + 1.1.5 diff --git a/smqtt-core/src/main/java/io/github/quickmsg/core/acl/JCasBinAclManager.java b/smqtt-core/src/main/java/io/github/quickmsg/core/acl/JCasBinAclManager.java index a7992c628062f70eea9c16c771762c1b338e1f99..99f72f3dfac279c5d2eb4bd3a679ca6eae49e6ef 100644 --- a/smqtt-core/src/main/java/io/github/quickmsg/core/acl/JCasBinAclManager.java +++ b/smqtt-core/src/main/java/io/github/quickmsg/core/acl/JCasBinAclManager.java @@ -8,7 +8,6 @@ import io.github.quickmsg.common.acl.filter.AclFunction; import io.github.quickmsg.common.acl.model.PolicyModel; import io.github.quickmsg.common.channel.MqttChannel; import io.github.quickmsg.common.config.AclConfig; -import io.github.quickmsg.common.utils.TopicRegexUtils; import lombok.extern.slf4j.Slf4j; import org.casbin.adapter.JDBCAdapter; import org.casbin.jcasbin.main.Enforcer; @@ -31,7 +30,11 @@ public class JCasBinAclManager implements AclManager { private final String REQUEST_SUBJECT_TEMPLATE = "%s:%s"; + + private boolean isOpen; + public JCasBinAclManager(AclConfig aclConfig) { + if (aclConfig != null) { Model model = new Model(); model.addDef("r", "r", "sub, obj, act"); @@ -60,6 +63,7 @@ public class JCasBinAclManager implements AclManager { Set allObjects = filterAclTopicActions.computeIfAbsent(actions.get(i), a -> new HashSet<>()); allObjects.add(objects.get(i)); } + isOpen = true; } } @@ -67,7 +71,7 @@ public class JCasBinAclManager implements AclManager { public boolean check(MqttChannel mqttChannel, String source, AclAction action) { try { boolean isCheckAcl = Optional.ofNullable(filterAclTopicActions.get(action.name())) - .map(objects -> objects.stream().anyMatch(topic->BuiltInFunctions.keyMatch2(source,topic))) + .map(objects -> objects.stream().anyMatch(topic -> BuiltInFunctions.keyMatch2(source, topic))) .orElse(false); if (isCheckAcl) { String subject = String.format(REQUEST_SUBJECT_TEMPLATE, mqttChannel.getClientIdentifier() @@ -78,35 +82,37 @@ public class JCasBinAclManager implements AclManager { } } catch (Exception e) { - log.error("acl check error",e); + log.error("acl check error", e); } - return true; + return isOpen; } @Override public boolean add(String sub, String source, AclAction action, AclType type) { - return Optional.ofNullable(enforcer) - .map(ef -> enforcer.addNamedPolicy("p", sub, source, action.name(),type.getDesc())) - .orElse(true); - + return isOpen?Optional.ofNullable(enforcer) + .map(ef -> enforcer.addNamedPolicy("p", sub, source, action.name(), type.getDesc())) + .orElse(true):false; } @Override - public boolean delete(String sub, String source, AclAction action,AclType type) { - return Optional.ofNullable(enforcer) - .map(ef -> enforcer.removeNamedPolicy("p", sub, source, action.name(),type.getDesc())) - .orElse(true); + public boolean delete(String sub, String source, AclAction action, AclType type) { + return isOpen ? Optional.ofNullable(enforcer) + .map(ef -> enforcer.removeNamedPolicy("p", sub, source, action.name(), type.getDesc())) + .orElse(true) : false; } @Override public List> get(PolicyModel policyModel) { + if(!isOpen){ + return Collections.emptyList(); + } return Optional.ofNullable(enforcer) .map(ef -> enforcer .getFilteredNamedPolicy("p", 0, policyModel.getSubject(), policyModel.getSource(), policyModel.getAction() == null || AclAction.ALL == policyModel.getAction() ? "" : policyModel.getAction().name(), - policyModel.getAclType()==null || AclType.ALL == policyModel.getAclType() ?"":policyModel.getAclType().getDesc()) - ) + policyModel.getAclType() == null || AclType.ALL == policyModel.getAclType() ? "" : policyModel.getAclType().getDesc()) + ) .orElse(Collections.emptyList()); } diff --git a/smqtt-core/src/main/java/io/github/quickmsg/core/auth/HttpAuthManager.java b/smqtt-core/src/main/java/io/github/quickmsg/core/auth/HttpAuthManager.java index 29676dbe8ca506fd817cdcbb64bf5de1cf4b0e9f..eb403962b037b110b4b38781506ff4231b6f1188 100644 --- a/smqtt-core/src/main/java/io/github/quickmsg/core/auth/HttpAuthManager.java +++ b/smqtt-core/src/main/java/io/github/quickmsg/core/auth/HttpAuthManager.java @@ -45,7 +45,7 @@ public class HttpAuthManager implements AuthManager { return client.post().uri(httpAuthConfig.getPath()) .send(ByteBufFlux.fromString(Mono.just(JacksonUtil.map2Json(params)))) .response() - .map(response -> HttpResponseStatus.OK == response.status()) + .map(response -> HttpResponseStatus.OK.code() == response.status().code()) .block(Duration.ofSeconds(3)); } diff --git a/smqtt-core/src/main/java/io/github/quickmsg/core/cluster/ClusterReceiver.java b/smqtt-core/src/main/java/io/github/quickmsg/core/cluster/ClusterReceiver.java index 28d13dcf26cdbf07034ea4bf2b74c665bd9b1e63..00f248e78208674680f6822cbdf7ea2a263b7d07 100644 --- a/smqtt-core/src/main/java/io/github/quickmsg/core/cluster/ClusterReceiver.java +++ b/smqtt-core/src/main/java/io/github/quickmsg/core/cluster/ClusterReceiver.java @@ -13,6 +13,7 @@ import io.netty.handler.codec.mqtt.MqttMessage; import io.netty.handler.codec.mqtt.MqttQoS; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import java.time.Duration; @@ -42,7 +43,8 @@ public class ClusterReceiver { clusterRegistry.registry(clusterConfig); //begin listen cluster message clusterRegistry.handlerClusterMessage() - .onErrorContinue((E,O)-> log.error(O.toString(),E)) + .doOnError(throwable -> log.error("cluster accept",throwable)) + .onErrorResume(e-> Mono.empty()) .subscribe(clusterMessage -> protocolAdaptor .chooseProtocol(MockMqttChannel.wrapClientIdentifier(clusterMessage.getClientIdentifier()), getMqttMessage(clusterMessage), diff --git a/smqtt-core/src/main/java/io/github/quickmsg/core/spi/DefaultProtocolAdaptor.java b/smqtt-core/src/main/java/io/github/quickmsg/core/spi/DefaultProtocolAdaptor.java index b14fe7aa2c10a8246defff4024c600a6f7ffbb35..8aa07c618d6f5e22633e82dc508b774446c41523 100644 --- a/smqtt-core/src/main/java/io/github/quickmsg/core/spi/DefaultProtocolAdaptor.java +++ b/smqtt-core/src/main/java/io/github/quickmsg/core/spi/DefaultProtocolAdaptor.java @@ -10,6 +10,7 @@ import io.github.quickmsg.common.spi.DynamicLoader; import io.netty.handler.codec.mqtt.MqttMessage; import io.netty.handler.codec.mqtt.MqttMessageType; import lombok.extern.slf4j.Slf4j; +import reactor.core.publisher.Mono; import reactor.core.scheduler.Scheduler; import reactor.core.scheduler.Schedulers; import reactor.netty.ReactorNetty; diff --git a/smqtt-metric/pom.xml b/smqtt-metric/pom.xml index 88db2918e91c670ce078b1c38e783ddc12a447db..777de5485b1adcc10256dbe1ad083e14ac4adb56 100644 --- a/smqtt-metric/pom.xml +++ b/smqtt-metric/pom.xml @@ -8,7 +8,7 @@ smqtt io.github.quickmsg - 1.1.4 + 1.1.5 smqtt-metric diff --git a/smqtt-metric/smqtt-metric-influxdb/pom.xml b/smqtt-metric/smqtt-metric-influxdb/pom.xml index 6fd7cdff473400d6b48cb2f3ae770014b2e6a169..f6cac81c635bce48a50eced0e7bca1d7636ea36c 100644 --- a/smqtt-metric/smqtt-metric-influxdb/pom.xml +++ b/smqtt-metric/smqtt-metric-influxdb/pom.xml @@ -5,7 +5,7 @@ smqtt-metric io.github.quickmsg - 1.1.4 + 1.1.5 4.0.0 @@ -15,7 +15,7 @@ io.github.quickmsg smqtt-common - 1.1.4 + 1.1.5 diff --git a/smqtt-metric/smqtt-metric-prometheus/pom.xml b/smqtt-metric/smqtt-metric-prometheus/pom.xml index 47c91c44fd8f130ee2fe9cc67c669f3211e5abb2..b4aec68d151d0d8067c85be03ce83ef875d492be 100644 --- a/smqtt-metric/smqtt-metric-prometheus/pom.xml +++ b/smqtt-metric/smqtt-metric-prometheus/pom.xml @@ -5,7 +5,7 @@ smqtt-metric io.github.quickmsg - 1.1.4 + 1.1.5 4.0.0 @@ -19,7 +19,7 @@ io.github.quickmsg smqtt-common - 1.1.4 + 1.1.5 diff --git a/smqtt-persistent/pom.xml b/smqtt-persistent/pom.xml index c3a41482b8edab62c1f1f67ff0e187377ba8ae09..08825ea236d991266f671c2008e7d5c7ed1328e4 100644 --- a/smqtt-persistent/pom.xml +++ b/smqtt-persistent/pom.xml @@ -5,7 +5,7 @@ smqtt io.github.quickmsg - 1.1.4 + 1.1.5 4.0.0 pom diff --git a/smqtt-persistent/smqtt-persistent-db/pom.xml b/smqtt-persistent/smqtt-persistent-db/pom.xml index 380551f2634f1d7d1fad0aab480499ee59ac6fcd..99a4d649d69d44e9db3d6304e55d3e07600d8299 100644 --- a/smqtt-persistent/smqtt-persistent-db/pom.xml +++ b/smqtt-persistent/smqtt-persistent-db/pom.xml @@ -5,12 +5,12 @@ smqtt-persistent io.github.quickmsg - 1.1.4 + 1.1.5 4.0.0 smqtt-persistent-db - 1.1.4 + 1.1.5 3.14.11 @@ -20,7 +20,7 @@ io.github.quickmsg smqtt-common - 1.1.4 + 1.1.5 compile diff --git a/smqtt-persistent/smqtt-persistent-redis/pom.xml b/smqtt-persistent/smqtt-persistent-redis/pom.xml index eff5c0c646834e825c3e374c6aea8ec24a8d0ee5..465d5529f7560c39475d594f2fa0d474ef3250a2 100644 --- a/smqtt-persistent/smqtt-persistent-redis/pom.xml +++ b/smqtt-persistent/smqtt-persistent-redis/pom.xml @@ -5,12 +5,12 @@ smqtt-persistent io.github.quickmsg - 1.1.4 + 1.1.5 4.0.0 smqtt-persistent-redis - 1.1.4 + 1.1.5 3.15.6 @@ -20,7 +20,7 @@ io.github.quickmsg smqtt-common - 1.1.4 + 1.1.5 compile diff --git a/smqtt-registry/pom.xml b/smqtt-registry/pom.xml index 1f824b99b9bf8f7cc198fed3f51fa696197dd816..062df8c51f0be2a0779ed0752d98804d62a02806 100644 --- a/smqtt-registry/pom.xml +++ b/smqtt-registry/pom.xml @@ -5,7 +5,7 @@ smqtt io.github.quickmsg - 1.1.4 + 1.1.5 4.0.0 pom diff --git a/smqtt-registry/smqtt-registry-scube/pom.xml b/smqtt-registry/smqtt-registry-scube/pom.xml index 4436c116f5f855ea57b75592918c9ac320ab6434..530a21d9ebd6275023ea04cc74d6aad597c5ede7 100644 --- a/smqtt-registry/smqtt-registry-scube/pom.xml +++ b/smqtt-registry/smqtt-registry-scube/pom.xml @@ -5,7 +5,7 @@ smqtt-registry io.github.quickmsg - 1.1.4 + 1.1.5 4.0.0 smqtt-registry-scube @@ -50,7 +50,7 @@ io.github.quickmsg smqtt-common - 1.1.4 + 1.1.5 provided diff --git a/smqtt-rule/pom.xml b/smqtt-rule/pom.xml index 2a0e4511a4cdc8daa77c65206775a818b540b8c0..bb6827b5dbfeab2d42ba1553e1153126ba209f1a 100644 --- a/smqtt-rule/pom.xml +++ b/smqtt-rule/pom.xml @@ -7,7 +7,7 @@ smqtt io.github.quickmsg - 1.1.4 + 1.1.5 smqtt-rule diff --git a/smqtt-rule/smqtt-rule-dsl/pom.xml b/smqtt-rule/smqtt-rule-dsl/pom.xml index 9f2740ad42aedd8e4458d7027c241f42e4f59d8b..7820f77ab837551a2c974491c7ff361ca791435c 100644 --- a/smqtt-rule/smqtt-rule-dsl/pom.xml +++ b/smqtt-rule/smqtt-rule-dsl/pom.xml @@ -5,7 +5,7 @@ smqtt-rule io.github.quickmsg - 1.1.4 + 1.1.5 4.0.0 @@ -15,13 +15,13 @@ io.github.quickmsg smqtt-common - 1.1.4 + 1.1.5 provided smqtt-rule-engine io.github.quickmsg - 1.1.4 + 1.1.5 diff --git a/smqtt-rule/smqtt-rule-engine/pom.xml b/smqtt-rule/smqtt-rule-engine/pom.xml index 46a18b11a19d601b7007c3f1226ed1bcf3d6aca3..00494d2e7fbeb7cd75beb0de62db1e37739562a4 100644 --- a/smqtt-rule/smqtt-rule-engine/pom.xml +++ b/smqtt-rule/smqtt-rule-engine/pom.xml @@ -7,7 +7,7 @@ smqtt-rule io.github.quickmsg - 1.1.4 + 1.1.5 smqtt-rule-engine @@ -18,44 +18,44 @@ io.github.quickmsg smqtt-common - 1.1.4 + 1.1.5 provided io.github.quickmsg smqtt-rule-source-kafka - 1.1.4 + 1.1.5 io.github.quickmsg smqtt-rule-source-http - 1.1.4 + 1.1.5 io.github.quickmsg smqtt-rule-source-rocketmq - 1.1.4 + 1.1.5 io.github.quickmsg smqtt-rule-source-rabbitmq - 1.1.4 + 1.1.5 io.github.quickmsg smqtt-rule-source-db - 1.1.4 + 1.1.5 io.github.quickmsg smqtt-rule-source-mqtt - 1.1.4 + 1.1.5 diff --git a/smqtt-rule/smqtt-rule-source/pom.xml b/smqtt-rule/smqtt-rule-source/pom.xml index 86501650cd48d5d72ac8779b3d186e8426e7b67e..570281ba555052863cf03ca40edd9281d8021e67 100644 --- a/smqtt-rule/smqtt-rule-source/pom.xml +++ b/smqtt-rule/smqtt-rule-source/pom.xml @@ -8,7 +8,7 @@ smqtt-rule io.github.quickmsg - 1.1.4 + 1.1.5 smqtt-rule-source @@ -33,7 +33,7 @@ io.github.quickmsg smqtt-common - 1.1.4 + 1.1.5 provided diff --git a/smqtt-rule/smqtt-rule-source/smqtt-rule-source-db/pom.xml b/smqtt-rule/smqtt-rule-source/smqtt-rule-source-db/pom.xml index 71d190c878896d57194397c73df13a0432ff9eb9..542f7f3c109024a9b2b81ec6ec5c8ddca299cc5d 100644 --- a/smqtt-rule/smqtt-rule-source/smqtt-rule-source-db/pom.xml +++ b/smqtt-rule/smqtt-rule-source/smqtt-rule-source-db/pom.xml @@ -5,13 +5,13 @@ smqtt-rule-source io.github.quickmsg - 1.1.4 + 1.1.5 4.0.0 io.github.quickmsg smqtt-rule-source-db - 1.1.4 + 1.1.5 3.14.11 diff --git a/smqtt-rule/smqtt-rule-source/smqtt-rule-source-http/pom.xml b/smqtt-rule/smqtt-rule-source/smqtt-rule-source-http/pom.xml index 222de62bebbaf0a0736e95680397336564abb67e..c690a378da4b6c935638258727136fd31b3c0c95 100644 --- a/smqtt-rule/smqtt-rule-source/smqtt-rule-source-http/pom.xml +++ b/smqtt-rule/smqtt-rule-source/smqtt-rule-source-http/pom.xml @@ -6,7 +6,7 @@ io.github.quickmsg smqtt-rule-source-http - 1.1.4 + 1.1.5 smqtt-rule-source-http @@ -15,14 +15,14 @@ smqtt-rule-source io.github.quickmsg - 1.1.4 + 1.1.5 io.github.quickmsg smqtt-common - 1.1.4 + 1.1.5 provided diff --git a/smqtt-rule/smqtt-rule-source/smqtt-rule-source-kafka/pom.xml b/smqtt-rule/smqtt-rule-source/smqtt-rule-source-kafka/pom.xml index 4702acffb721fe870f654029ba116863fed0d3b0..dcb3609723a6ee8211042788d6c4013f526d3d61 100644 --- a/smqtt-rule/smqtt-rule-source/smqtt-rule-source-kafka/pom.xml +++ b/smqtt-rule/smqtt-rule-source/smqtt-rule-source-kafka/pom.xml @@ -5,12 +5,12 @@ smqtt-rule-source io.github.quickmsg - 1.1.4 + 1.1.5 4.0.0 smqtt-rule-source-kafka - 1.1.4 + 1.1.5 https://github.com/quickmsg/smqtt diff --git a/smqtt-rule/smqtt-rule-source/smqtt-rule-source-mqtt/pom.xml b/smqtt-rule/smqtt-rule-source/smqtt-rule-source-mqtt/pom.xml index 515f5fd77667885d88a1c909e57aca3978ca9ab5..068e8d7ff59a5f06f266293a090f1ec0e86565c3 100644 --- a/smqtt-rule/smqtt-rule-source/smqtt-rule-source-mqtt/pom.xml +++ b/smqtt-rule/smqtt-rule-source/smqtt-rule-source-mqtt/pom.xml @@ -5,13 +5,13 @@ smqtt-rule-source io.github.quickmsg - 1.1.4 + 1.1.5 4.0.0 io.github.quickmsg smqtt-rule-source-mqtt - 1.1.4 + 1.1.5 diff --git a/smqtt-rule/smqtt-rule-source/smqtt-rule-source-rabbitmq/pom.xml b/smqtt-rule/smqtt-rule-source/smqtt-rule-source-rabbitmq/pom.xml index 597b631498ad2319b046e5ebd2e3f15776b39226..5eabc0228bde61b90a6e1b2bf2c43b0e1318e938 100644 --- a/smqtt-rule/smqtt-rule-source/smqtt-rule-source-rabbitmq/pom.xml +++ b/smqtt-rule/smqtt-rule-source/smqtt-rule-source-rabbitmq/pom.xml @@ -5,13 +5,13 @@ smqtt-rule-source io.github.quickmsg - 1.1.4 + 1.1.5 4.0.0 io.github.quickmsg smqtt-rule-source-rabbitmq - 1.1.4 + 1.1.5 diff --git a/smqtt-rule/smqtt-rule-source/smqtt-rule-source-rocketmq/pom.xml b/smqtt-rule/smqtt-rule-source/smqtt-rule-source-rocketmq/pom.xml index 4e5418676f96ec314cf0bf5b7756de8456b25514..664241b3adcccaf84b3fcdfcc9fcfec59cc1e14b 100644 --- a/smqtt-rule/smqtt-rule-source/smqtt-rule-source-rocketmq/pom.xml +++ b/smqtt-rule/smqtt-rule-source/smqtt-rule-source-rocketmq/pom.xml @@ -5,13 +5,13 @@ smqtt-rule-source io.github.quickmsg - 1.1.4 + 1.1.5 4.0.0 io.github.quickmsg smqtt-rule-source-rocketmq - 1.1.4 + 1.1.5 diff --git a/smqtt-spring-boot-starter/pom.xml b/smqtt-spring-boot-starter/pom.xml index 6783cfc5c9c5dcc31a654f38af00b5b619703c60..0f772c58eef0863d8d10b9234f7f18501844d506 100644 --- a/smqtt-spring-boot-starter/pom.xml +++ b/smqtt-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ smqtt io.github.quickmsg - 1.1.4 + 1.1.5 smqtt-spring-boot-starter @@ -34,17 +34,17 @@ io.github.quickmsg smqtt-core - 1.1.4 + 1.1.5 smqtt-registry-scube io.github.quickmsg - 1.1.4 + 1.1.5 smqtt-ui io.github.quickmsg - 1.1.4 + 1.1.5 io.projectreactor.netty diff --git a/smqtt-spring-boot-starter/src/main/java/io/github/quickmsg/starter/AutoMqttConfiguration.java b/smqtt-spring-boot-starter/src/main/java/io/github/quickmsg/starter/AutoMqttConfiguration.java index c80dfb169a56b28c4655a165f6589275befb039b..a04bde8900e1aec3453db5fa86e0cff66586935f 100644 --- a/smqtt-spring-boot-starter/src/main/java/io/github/quickmsg/starter/AutoMqttConfiguration.java +++ b/smqtt-spring-boot-starter/src/main/java/io/github/quickmsg/starter/AutoMqttConfiguration.java @@ -40,6 +40,7 @@ public class AutoMqttConfiguration { .sourceDefinitions(springBootstrapConfig.getSources()) .meterConfig(springBootstrapConfig.getMeter()) .aclConfig(springBootstrapConfig.getAcl()) + .authConfig(springBootstrapConfig.getAuth()) .meterConfig(springBootstrapConfig.getMeter()) .build() .start() diff --git a/smqtt-spring-boot-starter/src/main/java/io/github/quickmsg/starter/SpringBootstrapConfig.java b/smqtt-spring-boot-starter/src/main/java/io/github/quickmsg/starter/SpringBootstrapConfig.java index d5921bd2a2e196e0dc4f25421e2c53521d6264c6..623ed9638039027d02d1ae843c2f3bcd9ffbfe62 100644 --- a/smqtt-spring-boot-starter/src/main/java/io/github/quickmsg/starter/SpringBootstrapConfig.java +++ b/smqtt-spring-boot-starter/src/main/java/io/github/quickmsg/starter/SpringBootstrapConfig.java @@ -3,6 +3,7 @@ package io.github.quickmsg.starter; import ch.qos.logback.classic.Level; import com.fasterxml.jackson.annotation.JsonProperty; import io.github.quickmsg.common.config.AclConfig; +import io.github.quickmsg.common.config.AuthConfig; import io.github.quickmsg.common.config.BootstrapConfig; import io.github.quickmsg.common.rule.RuleChainDefinition; import io.github.quickmsg.common.rule.source.SourceDefinition; @@ -87,4 +88,10 @@ public class SpringBootstrapConfig { */ private AclConfig acl; + /** + * auth + */ + private AuthConfig auth; + + } diff --git a/smqtt-ui/pom.xml b/smqtt-ui/pom.xml index 3b67b5e4a3bd34add92d8a71967f8c34b631fd67..d2ebcab99c2cb7af47111f772a9cb7bf362e2fab 100644 --- a/smqtt-ui/pom.xml +++ b/smqtt-ui/pom.xml @@ -5,7 +5,7 @@ smqtt io.github.quickmsg - 1.1.4 + 1.1.5 4.0.0 smqtt-ui