From 82707062552fbd81461350b186d4fed8167b6cc4 Mon Sep 17 00:00:00 2001 From: luxurong <1074455781@qq.com> Date: Sun, 26 Jun 2022 16:34:57 +0800 Subject: [PATCH 1/7] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/github/quickmsg/core/auth/HttpAuthManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 29676dbe..eb403962 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)); } -- Gitee From dcdf474ccee57886efb79395f6b381252023f771 Mon Sep 17 00:00:00 2001 From: luxurong <1074455781@qq.com> Date: Sun, 26 Jun 2022 16:43:47 +0800 Subject: [PATCH 2/7] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quickmsg/core/acl/JCasBinAclManager.java | 33 +++++++++++-------- .../starter/AutoMqttConfiguration.java | 1 + .../starter/SpringBootstrapConfig.java | 7 ++++ 3 files changed, 27 insertions(+), 14 deletions(-) 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 a7992c62..152e7b88 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,6 +30,9 @@ 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(); @@ -60,6 +62,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 +70,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 +81,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-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 c80dfb16..a04bde89 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 d5921bd2..623ed963 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; + + } -- Gitee From 4964eb29f3b8d21d07932579cfaa881c566e8eb5 Mon Sep 17 00:00:00 2001 From: luxurong <1074455781@qq.com> Date: Tue, 12 Jul 2022 22:09:38 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/github/quickmsg/core/cluster/ClusterReceiver.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 28d13dcf..00f248e7 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), -- Gitee From 721fc3adde8b5dd5ded3952ccd93be9e1a48c9e8 Mon Sep 17 00:00:00 2001 From: luxurong <1074455781@qq.com> Date: Tue, 12 Jul 2022 22:21:01 +0800 Subject: [PATCH 4/7] messageId --- .../java/io/github/quickmsg/common/channel/MqttChannel.java | 4 ++-- .../io/github/quickmsg/core/spi/DefaultProtocolAdaptor.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) 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 2ee7018b..34fe1e1d 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/src/main/java/io/github/quickmsg/core/spi/DefaultProtocolAdaptor.java b/smqtt-core/src/main/java/io/github/quickmsg/core/spi/DefaultProtocolAdaptor.java index b14fe7aa..8aa07c61 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; -- Gitee From 058f0a61d92e6e900b715ec9ed57d1aee08efc2d Mon Sep 17 00:00:00 2001 From: luxurong <1074455781@qq.com> Date: Tue, 12 Jul 2022 22:32:28 +0800 Subject: [PATCH 5/7] 1.1.5 --- pom.xml | 2 +- smqtt-bootstrap/pom.xml | 10 +++++----- smqtt-common/pom.xml | 2 +- smqtt-core/pom.xml | 10 +++++----- smqtt-metric/pom.xml | 2 +- smqtt-metric/smqtt-metric-influxdb/pom.xml | 4 ++-- smqtt-metric/smqtt-metric-prometheus/pom.xml | 4 ++-- smqtt-persistent/pom.xml | 2 +- smqtt-persistent/smqtt-persistent-db/pom.xml | 6 +++--- smqtt-persistent/smqtt-persistent-redis/pom.xml | 6 +++--- smqtt-registry/pom.xml | 2 +- smqtt-registry/smqtt-registry-scube/pom.xml | 4 ++-- smqtt-rule/pom.xml | 2 +- smqtt-rule/smqtt-rule-dsl/pom.xml | 6 +++--- smqtt-rule/smqtt-rule-engine/pom.xml | 16 ++++++++-------- smqtt-rule/smqtt-rule-source/pom.xml | 4 ++-- .../smqtt-rule-source-db/pom.xml | 4 ++-- .../smqtt-rule-source-http/pom.xml | 6 +++--- .../smqtt-rule-source-kafka/pom.xml | 4 ++-- .../smqtt-rule-source-mqtt/pom.xml | 4 ++-- .../smqtt-rule-source-rabbitmq/pom.xml | 4 ++-- .../smqtt-rule-source-rocketmq/pom.xml | 4 ++-- smqtt-spring-boot-starter/pom.xml | 8 ++++---- smqtt-ui/pom.xml | 2 +- 24 files changed, 59 insertions(+), 59 deletions(-) diff --git a/pom.xml b/pom.xml index b3874941..09a16390 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 f0d58b92..faca811a 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 diff --git a/smqtt-common/pom.xml b/smqtt-common/pom.xml index 48321198..9f6b9dc1 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-core/pom.xml b/smqtt-core/pom.xml index 22f6b5a7..74bb56ed 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-metric/pom.xml b/smqtt-metric/pom.xml index 88db2918..777de548 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 6fd7cdff..f6cac81c 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 47c91c44..b4aec68d 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 c3a41482..08825ea2 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 380551f2..99a4d649 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 eff5c0c6..465d5529 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 1f824b99..062df8c5 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 4436c116..530a21d9 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 2a0e4511..bb6827b5 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 9f2740ad..7820f77a 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 46a18b11..00494d2e 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 86501650..570281ba 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 71d190c8..542f7f3c 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 222de62b..c690a378 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 4702acff..dcb36097 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 515f5fd7..068e8d7f 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 597b6314..5eabc022 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 4e541867..664241b3 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 6783cfc5..0f772c58 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-ui/pom.xml b/smqtt-ui/pom.xml index 3b67b5e4..d2ebcab9 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 -- Gitee From c373956f7aa5c04f47828ec40c2db785fd64e07c Mon Sep 17 00:00:00 2001 From: luxurong <1074455781@qq.com> Date: Tue, 12 Jul 2022 22:41:19 +0800 Subject: [PATCH 6/7] 1.1.5 --- smqtt-bootstrap/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/smqtt-bootstrap/pom.xml b/smqtt-bootstrap/pom.xml index faca811a..efd819a6 100644 --- a/smqtt-bootstrap/pom.xml +++ b/smqtt-bootstrap/pom.xml @@ -120,7 +120,12 @@ latest ${project.version} + + ${REGISTRY_USERNAME} + ${REGISTRY_PASSWORD} + + io.github.quickmsg.docker.DockerStarter -- Gitee From 40f88d7f6f1f729b421feef76afe6145c37a08c0 Mon Sep 17 00:00:00 2001 From: luxurong Date: Tue, 30 Aug 2022 11:29:35 +0800 Subject: [PATCH 7/7] 1 --- .../main/java/io/github/quickmsg/core/acl/JCasBinAclManager.java | 1 + 1 file changed, 1 insertion(+) 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 152e7b88..99f72f3d 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 @@ -34,6 +34,7 @@ public class JCasBinAclManager implements AclManager { private boolean isOpen; public JCasBinAclManager(AclConfig aclConfig) { + if (aclConfig != null) { Model model = new Model(); model.addDef("r", "r", "sub, obj, act"); -- Gitee