diff --git a/UPDATE_LOG.md b/UPDATE_LOG.md index 1422989fefeb03f1141fbe1cdb15aa5cc21b0d6d..bdc94ad737b9c7cbf981d673d0d3c4a60e92d62b 100644 --- a/UPDATE_LOG.md +++ b/UPDATE_LOG.md @@ -2,6 +2,9 @@ * solon-cloud-gateway 增加 websocket 的转发支持(协议头:ws) +### 3.6.5 + +* 修复 solon-cloud-gateway Completable:doOnError 会中断传递的问题 ### 3.5.2 diff --git a/__release/solon-cloud-bundle1/pom.xml b/__release/solon-cloud-bundle1/pom.xml index d2f291bb93975088b150b88a0d1cbaf281ec2d66..86fcf78b514fc980f1c9266c53cda0a5915292e2 100644 --- a/__release/solon-cloud-bundle1/pom.xml +++ b/__release/solon-cloud-bundle1/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/__release/solon-cloud-bundle2/pom.xml b/__release/solon-cloud-bundle2/pom.xml index 25912b0b637ebb2c9d8412b2f01f998bfaeac1cc..eb9c1e2289345e41974941f5fbc87bbc38c9292c 100644 --- a/__release/solon-cloud-bundle2/pom.xml +++ b/__release/solon-cloud-bundle2/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/__release/solon-cloud-bundle3/pom.xml b/__release/solon-cloud-bundle3/pom.xml index c2ac74dcf7a7d9d912c41a9b767dc057c6d1caa9..cb032f54ebcb723bdc92589022156f42df292817 100644 --- a/__release/solon-cloud-bundle3/pom.xml +++ b/__release/solon-cloud-bundle3/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/pom.xml b/pom.xml index 08e791467f4d5ac8139d786f30608d2a4d4afe47..d7172918896b93b0cc10c851abf6612a56512d41 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-breaker/guava-solon-cloud-plugin/pom.xml b/solon-cloud-breaker/guava-solon-cloud-plugin/pom.xml index 0bb42c8bc4674af8413f368f19af302712ad59f4..bc76bb99d2c5aacd971d5f54db5731fa85a73712 100644 --- a/solon-cloud-breaker/guava-solon-cloud-plugin/pom.xml +++ b/solon-cloud-breaker/guava-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-breaker/semaphore-solon-cloud-plugin/pom.xml b/solon-cloud-breaker/semaphore-solon-cloud-plugin/pom.xml index 12f86c256a6b08e310d191621444709bd3f9e080..0de3d86d785ff9763a3fec7e93bf4e29901b11ee 100644 --- a/solon-cloud-breaker/semaphore-solon-cloud-plugin/pom.xml +++ b/solon-cloud-breaker/semaphore-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-breaker/sentinel-solon-cloud-plugin/pom.xml b/solon-cloud-breaker/sentinel-solon-cloud-plugin/pom.xml index 91af5fa5e8440c5ec1aa4502f548924f100190e1..352b2012dc788a003bbdb57264c4b9ad9268c975 100644 --- a/solon-cloud-breaker/sentinel-solon-cloud-plugin/pom.xml +++ b/solon-cloud-breaker/sentinel-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-config-and-discovery/consul-solon-cloud-plugin/pom.xml b/solon-cloud-config-and-discovery/consul-solon-cloud-plugin/pom.xml index f1dc2c2fd3ef6447cdfd8725aa0615acd15376b2..5dbaaeab9fa2ce252b24f3e1ffa983fea938d122 100644 --- a/solon-cloud-config-and-discovery/consul-solon-cloud-plugin/pom.xml +++ b/solon-cloud-config-and-discovery/consul-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-config-and-discovery/etcd-solon-cloud-plugin/pom.xml b/solon-cloud-config-and-discovery/etcd-solon-cloud-plugin/pom.xml index 4f0bb1a23c39e4999954ec957c0a0dda3f0e37dc..d9af0922b8d3b7da560c6faba8ca3628bf8bebd9 100644 --- a/solon-cloud-config-and-discovery/etcd-solon-cloud-plugin/pom.xml +++ b/solon-cloud-config-and-discovery/etcd-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-config-and-discovery/local-solon-cloud-plugin/pom.xml b/solon-cloud-config-and-discovery/local-solon-cloud-plugin/pom.xml index b32046eebd7e661cd29b9d4faec54816631dc11a..17b73fd3e688b9f5efc9c1e2e0c46bb5bcf57294 100644 --- a/solon-cloud-config-and-discovery/local-solon-cloud-plugin/pom.xml +++ b/solon-cloud-config-and-discovery/local-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-config-and-discovery/nacos-solon-cloud-plugin/pom.xml b/solon-cloud-config-and-discovery/nacos-solon-cloud-plugin/pom.xml index 52e4ee58dd2792e12f6e0a099862ba5f32ca3d6f..a960f143a55450d7ae315efb0b342649a269577c 100644 --- a/solon-cloud-config-and-discovery/nacos-solon-cloud-plugin/pom.xml +++ b/solon-cloud-config-and-discovery/nacos-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-config-and-discovery/nacos2-solon-cloud-plugin/pom.xml b/solon-cloud-config-and-discovery/nacos2-solon-cloud-plugin/pom.xml index 76dffaea7cecf240413b117878c9e06c4685faca..255d28e82bc25b0324f09c63480e74bb8415318b 100644 --- a/solon-cloud-config-and-discovery/nacos2-solon-cloud-plugin/pom.xml +++ b/solon-cloud-config-and-discovery/nacos2-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-config-and-discovery/nacos3-solon-cloud-plugin/pom.xml b/solon-cloud-config-and-discovery/nacos3-solon-cloud-plugin/pom.xml index 6e456ef2ff68ef9bb06b9153c0925b073157d401..5382bf83c2bb7bd4c6b463281c61692362e208e1 100644 --- a/solon-cloud-config-and-discovery/nacos3-solon-cloud-plugin/pom.xml +++ b/solon-cloud-config-and-discovery/nacos3-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-config-and-discovery/polaris-solon-cloud-plugin/pom.xml b/solon-cloud-config-and-discovery/polaris-solon-cloud-plugin/pom.xml index 2a70fd78ce9c12adaa311d2ff6c4e5512dc87fa6..9c0c2cb5b2311237372af958b4c7ff71f366982e 100644 --- a/solon-cloud-config-and-discovery/polaris-solon-cloud-plugin/pom.xml +++ b/solon-cloud-config-and-discovery/polaris-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-config-and-discovery/water-solon-cloud-plugin/pom.xml b/solon-cloud-config-and-discovery/water-solon-cloud-plugin/pom.xml index 1a1a208ad4bbad92d7f1f0cc91aa3050cd5856ee..dde5878a0021f7f7576ab5286b20ae0840657bbb 100644 --- a/solon-cloud-config-and-discovery/water-solon-cloud-plugin/pom.xml +++ b/solon-cloud-config-and-discovery/water-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-config-and-discovery/zookeeper-solon-cloud-plugin/pom.xml b/solon-cloud-config-and-discovery/zookeeper-solon-cloud-plugin/pom.xml index 9ffc70c6163018e3b6f184e3af78d8743b8c416c..cc3f87bf40a3637ecf1ceb90942bb3ec45a3073f 100644 --- a/solon-cloud-config-and-discovery/zookeeper-solon-cloud-plugin/pom.xml +++ b/solon-cloud-config-and-discovery/zookeeper-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-config-and-discovery/zuul-solon-cloud-plugin/pom.xml b/solon-cloud-config-and-discovery/zuul-solon-cloud-plugin/pom.xml index 275388b0559b800c046d864c66215fed7b89e247..438902395411181622a7c000fb9f557afaccdc3a 100644 --- a/solon-cloud-config-and-discovery/zuul-solon-cloud-plugin/pom.xml +++ b/solon-cloud-config-and-discovery/zuul-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-config-only/kubernetes-solon-cloud-plugin/pom.xml b/solon-cloud-config-only/kubernetes-solon-cloud-plugin/pom.xml index 8ea2a5b9b4a738ef8a5263e045b24bc1c2cbd74f..6e021ec7f8e3d4309850d6d53395739c037ffe99 100644 --- a/solon-cloud-config-only/kubernetes-solon-cloud-plugin/pom.xml +++ b/solon-cloud-config-only/kubernetes-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-discovery-only/jmdns-solon-cloud-plugin/pom.xml b/solon-cloud-discovery-only/jmdns-solon-cloud-plugin/pom.xml index 7ae6046635358bd3bf93bf1f69e1bb1202cd1373..2f24fed15e8d2c5254990d54129f5b2227ea44f8 100644 --- a/solon-cloud-discovery-only/jmdns-solon-cloud-plugin/pom.xml +++ b/solon-cloud-discovery-only/jmdns-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-event/activemq-solon-cloud-plugin/pom.xml b/solon-cloud-event/activemq-solon-cloud-plugin/pom.xml index 20ae373d9401500246d748f5f58c3fbc4dc37333..1e0ca1b6c98a8a2be052ff8abdd68cc2cf2c4541 100644 --- a/solon-cloud-event/activemq-solon-cloud-plugin/pom.xml +++ b/solon-cloud-event/activemq-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-event/aliyun-ons-solon-cloud-plugin/pom.xml b/solon-cloud-event/aliyun-ons-solon-cloud-plugin/pom.xml index 6c9744cb4c5f4d47a859c42529b993d0bcd3f2e6..3fc46e95b076421ab7be08a3ddfb1162e0bf7127 100644 --- a/solon-cloud-event/aliyun-ons-solon-cloud-plugin/pom.xml +++ b/solon-cloud-event/aliyun-ons-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-event/folkmq-solon-cloud-plugin/pom.xml b/solon-cloud-event/folkmq-solon-cloud-plugin/pom.xml index 171c3e0a5b333d176dc69808ecb67e5f5f066960..f5cbf41dc49bdc75753eb404256f05b7fdb3d502 100644 --- a/solon-cloud-event/folkmq-solon-cloud-plugin/pom.xml +++ b/solon-cloud-event/folkmq-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-event/jedis-solon-cloud-plugin/pom.xml b/solon-cloud-event/jedis-solon-cloud-plugin/pom.xml index 0b9b6225f881e2ea9a347f4d7b5d4b61683ef5de..94065d64e8432438f97ee4fe009312a919af76fe 100644 --- a/solon-cloud-event/jedis-solon-cloud-plugin/pom.xml +++ b/solon-cloud-event/jedis-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-event/kafka-solon-cloud-plugin/pom.xml b/solon-cloud-event/kafka-solon-cloud-plugin/pom.xml index ab90575d8d8edb41d4293765263891a14853e3ef..7c467932b85b4b1df80c2590146c7e83d063da69 100644 --- a/solon-cloud-event/kafka-solon-cloud-plugin/pom.xml +++ b/solon-cloud-event/kafka-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-event/mqtt-solon-cloud-plugin/pom.xml b/solon-cloud-event/mqtt-solon-cloud-plugin/pom.xml index 2055f29c52082d1c202c0968dc720894bf66b554..8f371b28d5305bcfd32a7087da6d48ceeb6a5fd4 100644 --- a/solon-cloud-event/mqtt-solon-cloud-plugin/pom.xml +++ b/solon-cloud-event/mqtt-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-event/mqtt5-solon-cloud-plugin/pom.xml b/solon-cloud-event/mqtt5-solon-cloud-plugin/pom.xml index 79f844fc0866b064be815db2409b000d324e906b..a1ae672bcc1766f8c0acf8f3ea9a36849f67354d 100644 --- a/solon-cloud-event/mqtt5-solon-cloud-plugin/pom.xml +++ b/solon-cloud-event/mqtt5-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-event/pulsar-solon-cloud-plugin/pom.xml b/solon-cloud-event/pulsar-solon-cloud-plugin/pom.xml index 22a456f143ff2a8348fb5752f842dfe6edd4f315..88fb2f7ab2e9278193e166ff6eb52dc865eed37f 100644 --- a/solon-cloud-event/pulsar-solon-cloud-plugin/pom.xml +++ b/solon-cloud-event/pulsar-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-event/rabbitmq-solon-cloud-plugin/pom.xml b/solon-cloud-event/rabbitmq-solon-cloud-plugin/pom.xml index 4a4e805e7bf0a840d453659aaabe8be3502b5877..54c70cf8dbd10ab234fd6e63ec4c71fafcfeb68a 100644 --- a/solon-cloud-event/rabbitmq-solon-cloud-plugin/pom.xml +++ b/solon-cloud-event/rabbitmq-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-event/rocketmq-solon-cloud-plugin/pom.xml b/solon-cloud-event/rocketmq-solon-cloud-plugin/pom.xml index 2adaa602c65bb98b14be3dd4136926d55ea76c1d..d53639088c6969c0ac055a4c87c1dbb09c900546 100644 --- a/solon-cloud-event/rocketmq-solon-cloud-plugin/pom.xml +++ b/solon-cloud-event/rocketmq-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-event/rocketmq5-solon-cloud-plugin/README.md b/solon-cloud-event/rocketmq5-solon-cloud-plugin/README.md index 929be5157f9619a8a3b47e982803f6b21c0bca7a..e1e88a608c9b75e25aa262bbd5267e29148c59b6 100644 --- a/solon-cloud-event/rocketmq5-solon-cloud-plugin/README.md +++ b/solon-cloud-event/rocketmq5-solon-cloud-plugin/README.md @@ -30,5 +30,7 @@ solon.cloud.rocketmq.event: consumeThreadNums: 0 #消费线程数,0表示默认 maxReconsumeTimes: 0 #消费消息失败的最大重试次数,0表示默认 producerGroup: "DEFAULT" #生产组 + consumerFilterType: SQL92 # 可以配置 TAG 不配置默认 TAG ,配置了SQL92, 注解中不生效 + consumerFilterExpression: "abc ='123'" # 具体参考文档 https://rocketmq.apache.org/zh/docs/featureBehavior/07messagefilter/ ``` \ No newline at end of file diff --git a/solon-cloud-event/rocketmq5-solon-cloud-plugin/pom.xml b/solon-cloud-event/rocketmq5-solon-cloud-plugin/pom.xml index 8d7cd94271c5d0efae5901f4edc3b26b71261d4b..6bd2c721b33b3249aacc1d09ae2e29c83ce9fd18 100644 --- a/solon-cloud-event/rocketmq5-solon-cloud-plugin/pom.xml +++ b/solon-cloud-event/rocketmq5-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-event/rocketmq5-solon-cloud-plugin/src/main/java/org/noear/solon/cloud/extend/rocketmq/impl/MessageUtil.java b/solon-cloud-event/rocketmq5-solon-cloud-plugin/src/main/java/org/noear/solon/cloud/extend/rocketmq/impl/MessageUtil.java index 34cd507021cb3d5dd6841583b977975193315b61..bfe14be21e9f699ceb4d7fce93dac5f3ba8d9ab2 100644 --- a/solon-cloud-event/rocketmq5-solon-cloud-plugin/src/main/java/org/noear/solon/cloud/extend/rocketmq/impl/MessageUtil.java +++ b/solon-cloud-event/rocketmq5-solon-cloud-plugin/src/main/java/org/noear/solon/cloud/extend/rocketmq/impl/MessageUtil.java @@ -47,8 +47,9 @@ class MessageUtil { //@since 3.0 + //去除给用户加的感叹号 for (Map.Entry kv : event.meta().entrySet()) { - messageBuilder.addProperty("!" + kv.getKey(), kv.getValue()); + messageBuilder.addProperty(kv.getKey(), kv.getValue()); } //设置消息Tag,用于消费端根据指定Tag过滤消息。 diff --git a/solon-cloud-event/rocketmq5-solon-cloud-plugin/src/main/java/org/noear/solon/cloud/extend/rocketmq/impl/RocketmqConfig.java b/solon-cloud-event/rocketmq5-solon-cloud-plugin/src/main/java/org/noear/solon/cloud/extend/rocketmq/impl/RocketmqConfig.java index 519672bdc7bf61d883675826460c0e33913805e6..9a287ff1244045d87a6a648fe4d5a07ee1fa6cc1 100644 --- a/solon-cloud-event/rocketmq5-solon-cloud-plugin/src/main/java/org/noear/solon/cloud/extend/rocketmq/impl/RocketmqConfig.java +++ b/solon-cloud-event/rocketmq5-solon-cloud-plugin/src/main/java/org/noear/solon/cloud/extend/rocketmq/impl/RocketmqConfig.java @@ -34,7 +34,10 @@ public class RocketmqConfig { private static final String PROP_EVENT_consumeThreadNums = "event.consumeThreadNums"; private static final String PROP_EVENT_maxReconsumeTimes = "event.maxReconsumeTimes"; - + // 消费者的消息过滤类型, TAG / SQL92 + private static final String PROP_EVENT_consumerFilterType = "event.consumerFilterType"; + // 消费者的消息过滤表达式 SQL92 + private static final String PROP_EVENT_consumerFilterExpression = "event.consumerFilterExpression"; private String producerGroup; private String consumerGroup; @@ -53,7 +56,10 @@ public class RocketmqConfig { private final int maxReconsumeTimes; private final CloudProps cloudProps; - + // 消费者的消息过滤类型, TAG / SQL92 + private final String consumeFilterType; + // 消费者的消息过滤表达式 SQL92 + private final String consumeFilterExpression; public RocketmqConfig(CloudProps cloudProps) { this.cloudProps = cloudProps; @@ -72,7 +78,8 @@ public class RocketmqConfig { producerGroup = cloudProps.getValue(PROP_EVENT_producerGroup); consumerGroup = cloudProps.getValue(PROP_EVENT_consumerGroup); - + consumeFilterType = cloudProps.getValue(PROP_EVENT_consumerFilterType); + consumeFilterExpression = cloudProps.getValue(PROP_EVENT_consumerFilterExpression); if (Utils.isEmpty(producerGroup)) { producerGroup = "DEFAULT"; } @@ -80,6 +87,13 @@ public class RocketmqConfig { if (Utils.isEmpty(consumerGroup)) { consumerGroup = Solon.cfg().appGroup() + "_" + Solon.cfg().appName(); } + if (Utils.isEmpty(consumeFilterType)) { + consumerGroup = "TAG"; + } + + if (Utils.isEmpty(consumeFilterExpression) && "SQL92".equals(consumeFilterType)) { + throw new IllegalArgumentException("SQL92 filter expression is empty(event.consumerFilterExpression)"); + } log.trace("producerGroup=" + producerGroup); @@ -97,6 +111,14 @@ public class RocketmqConfig { return consumerGroup; } + public String getConsumeFilterType() { + return consumeFilterType; + } + + public String getConsumeFilterExpression() { + return consumeFilterExpression; + } + /** * 产品组 */ diff --git a/solon-cloud-event/rocketmq5-solon-cloud-plugin/src/main/java/org/noear/solon/cloud/extend/rocketmq/impl/RocketmqConsumer.java b/solon-cloud-event/rocketmq5-solon-cloud-plugin/src/main/java/org/noear/solon/cloud/extend/rocketmq/impl/RocketmqConsumer.java index 651f554af055468263cbf67901fab94dbf80b350..e06f2cd0b9801b53eb926c7ddb376b77e17b2deb 100644 --- a/solon-cloud-event/rocketmq5-solon-cloud-plugin/src/main/java/org/noear/solon/cloud/extend/rocketmq/impl/RocketmqConsumer.java +++ b/solon-cloud-event/rocketmq5-solon-cloud-plugin/src/main/java/org/noear/solon/cloud/extend/rocketmq/impl/RocketmqConsumer.java @@ -17,6 +17,7 @@ package org.noear.solon.cloud.extend.rocketmq.impl; import org.apache.rocketmq.client.apis.*; import org.apache.rocketmq.client.apis.consumer.FilterExpression; +import org.apache.rocketmq.client.apis.consumer.FilterExpressionType; import org.apache.rocketmq.client.apis.consumer.PushConsumer; import org.apache.rocketmq.client.apis.consumer.PushConsumerBuilder; import org.noear.solon.Utils; @@ -90,6 +91,8 @@ public class RocketmqConsumer implements Closeable { //账号密码 if (Utils.isNotEmpty(config.getAccessKey())) { builder.setCredentialProvider(new StaticSessionCredentialsProvider(config.getAccessKey(), config.getSecretKey())); + }else { + builder.enableSsl(false); } //发送超时时间,默认3000 单位ms if (config.getTimeout() > 0) { @@ -106,16 +109,23 @@ public class RocketmqConsumer implements Closeable { Collection tags = tagsObserverMap.getTagsByLevel(eventLevel); if (tags.size() > 0) { - String tagsExpr = String.join("||", tags); - //支持 tag 过滤 - if (tags.contains("*")) { - subscriptionExpressions.put(topic, FilterExpression.SUB_ALL); + //SQL92匹配 + if ("SQL92".equals(config.getConsumeFilterType())) { + subscriptionExpressions.put(topic, new FilterExpression(config.getConsumeFilterExpression(), FilterExpressionType.SQL92)); + log.trace("Rocketmq consumer subscribe [" + topic + "(" + config.getConsumeFilterExpression() + ")] ok!"); } else { - subscriptionExpressions.put(topic, new FilterExpression(tagsExpr)); + String tagsExpr = String.join("||", tags); + + //支持 tag 过滤 + if (tags.contains("*")) { + subscriptionExpressions.put(topic, FilterExpression.SUB_ALL); + } else { + subscriptionExpressions.put(topic, new FilterExpression(tagsExpr)); + } + log.trace("Rocketmq5 consumer will subscribe [" + topic + "(" + tagsExpr + ")] ok!"); } - log.trace("Rocketmq5 consumer will subscribe [" + topic + "(" + tagsExpr + ")] ok!"); } } diff --git a/solon-cloud-event/rocketmq5-solon-cloud-plugin/src/main/java/org/noear/solon/cloud/extend/rocketmq/impl/RocketmqConsumerHandler.java b/solon-cloud-event/rocketmq5-solon-cloud-plugin/src/main/java/org/noear/solon/cloud/extend/rocketmq/impl/RocketmqConsumerHandler.java index 3316a76e65e218e9e0b234306f18ff1425d3b704..05f888ec76e47a539432d3500711b2898cfec5a5 100644 --- a/solon-cloud-event/rocketmq5-solon-cloud-plugin/src/main/java/org/noear/solon/cloud/extend/rocketmq/impl/RocketmqConsumerHandler.java +++ b/solon-cloud-event/rocketmq5-solon-cloud-plugin/src/main/java/org/noear/solon/cloud/extend/rocketmq/impl/RocketmqConsumerHandler.java @@ -75,11 +75,10 @@ public class RocketmqConsumerHandler implements MessageListener { } //@since 3.0 + //去除给用户加的感叹号 if (Utils.isNotEmpty(message.getProperties())) { for (Map.Entry kv : message.getProperties().entrySet()) { - if (kv.getKey().startsWith("!")) { - event.meta().put(kv.getKey().substring(1), kv.getValue()); - } + event.meta().put(kv.getKey(), kv.getValue()); } //@since 3.1 diff --git a/solon-cloud-file/aliyun-oss-solon-cloud-plugin/pom.xml b/solon-cloud-file/aliyun-oss-solon-cloud-plugin/pom.xml index 1ddeb7f8b6df677419aaa01bf0866225e667cae2..3e2849550f276f728d95d04adcac11e85036f1de 100644 --- a/solon-cloud-file/aliyun-oss-solon-cloud-plugin/pom.xml +++ b/solon-cloud-file/aliyun-oss-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-file/aws-s3-solon-cloud-plugin/pom.xml b/solon-cloud-file/aws-s3-solon-cloud-plugin/pom.xml index f429a9aeb234fecae9df6ea18434f03b144a5a74..3bd98cb665dde095cdf758ffb434285231091b86 100644 --- a/solon-cloud-file/aws-s3-solon-cloud-plugin/pom.xml +++ b/solon-cloud-file/aws-s3-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-file/fastdfs-solon-cloud-plugin/pom.xml b/solon-cloud-file/fastdfs-solon-cloud-plugin/pom.xml index 6207c2db36148e992f9cb6e06608c99b0567e73a..6c4d74af160dc669e7790e30e6f7689c41bc5184 100644 --- a/solon-cloud-file/fastdfs-solon-cloud-plugin/pom.xml +++ b/solon-cloud-file/fastdfs-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-file/file-s3-solon-cloud-plugin/pom.xml b/solon-cloud-file/file-s3-solon-cloud-plugin/pom.xml index 48afe11ca4c9abb8d2db07d61160087854c1c1b0..3cbdc7ea348b75950f3a0192022e0eb45b199992 100644 --- a/solon-cloud-file/file-s3-solon-cloud-plugin/pom.xml +++ b/solon-cloud-file/file-s3-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-file/minio-solon-cloud-plugin/pom.xml b/solon-cloud-file/minio-solon-cloud-plugin/pom.xml index 45e6693fc947192f292aab58de26c2a4e815326c..89f5101f513bcf86d817893e3c6842b7c6651ce1 100644 --- a/solon-cloud-file/minio-solon-cloud-plugin/pom.xml +++ b/solon-cloud-file/minio-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-file/minio7-solon-cloud-plugin/pom.xml b/solon-cloud-file/minio7-solon-cloud-plugin/pom.xml index 276810c52c093172b4d7a3174fa7c9388dbf0b1a..ed127df1c877f147ad2b230e9e8c0d0c61aa9652 100644 --- a/solon-cloud-file/minio7-solon-cloud-plugin/pom.xml +++ b/solon-cloud-file/minio7-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-file/qcloud-cos-solon-cloud-plugin/pom.xml b/solon-cloud-file/qcloud-cos-solon-cloud-plugin/pom.xml index b5534fea4ccf569b9f54d8f689c698b3582b50e6..2686a8d8056e3bfa9d5337b02b0bff33197209b2 100644 --- a/solon-cloud-file/qcloud-cos-solon-cloud-plugin/pom.xml +++ b/solon-cloud-file/qcloud-cos-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-file/qiniu-kodo-solon-cloud-plugin/pom.xml b/solon-cloud-file/qiniu-kodo-solon-cloud-plugin/pom.xml index e1e429ac3fdddfe63c53e85f9fa4e944959967bf..1eb6b787013af945b4991729a8b22763f4287e7e 100644 --- a/solon-cloud-file/qiniu-kodo-solon-cloud-plugin/pom.xml +++ b/solon-cloud-file/qiniu-kodo-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-id/snowflake-id-solon-cloud-plugin/pom.xml b/solon-cloud-id/snowflake-id-solon-cloud-plugin/pom.xml index 03074ce6131247177be41af533642fdaeaf9b27e..7df4b5d367f70d0698251e4cdf3dd4a251311d7e 100644 --- a/solon-cloud-id/snowflake-id-solon-cloud-plugin/pom.xml +++ b/solon-cloud-id/snowflake-id-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-job/powerjob-solon-cloud-plugin/pom.xml b/solon-cloud-job/powerjob-solon-cloud-plugin/pom.xml index 1fc707b3b19c540e53cb0f1104a5e3d3031cc714..3ecd77747c8f21403c8f9abddfffb5c0c766995a 100644 --- a/solon-cloud-job/powerjob-solon-cloud-plugin/pom.xml +++ b/solon-cloud-job/powerjob-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-job/quartz-solon-cloud-plugin/pom.xml b/solon-cloud-job/quartz-solon-cloud-plugin/pom.xml index cdaa4301f4582be9a922fc43878582f7db9ca282..423cc1e5fd53e201caf227fe6eac755864a70bdd 100644 --- a/solon-cloud-job/quartz-solon-cloud-plugin/pom.xml +++ b/solon-cloud-job/quartz-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-job/xxl-job-solon-cloud-plugin/pom.xml b/solon-cloud-job/xxl-job-solon-cloud-plugin/pom.xml index e9a49de3d208901f4a797cd1de6b945663c597a2..9d695a6e4e974bdc81dc444d0ca16d1003de1b9e 100644 --- a/solon-cloud-job/xxl-job-solon-cloud-plugin/pom.xml +++ b/solon-cloud-job/xxl-job-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-rpc/grpc-solon-cloud-plugin/pom.xml b/solon-cloud-rpc/grpc-solon-cloud-plugin/pom.xml index 16f9be20abc83daed1bf55e14f5e2c66b9584b48..5828369034caa3d6e4ee3a7f596f71fe45875406 100644 --- a/solon-cloud-rpc/grpc-solon-cloud-plugin/pom.xml +++ b/solon-cloud-rpc/grpc-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-rpc/thrift-solon-cloud-plugin/pom.xml b/solon-cloud-rpc/thrift-solon-cloud-plugin/pom.xml index c02cd5aee88eaf09752cb20462e2d924d1b767dc..af330dca88eb4fb2c30867be7c3e1fbae9a67d95 100644 --- a/solon-cloud-rpc/thrift-solon-cloud-plugin/pom.xml +++ b/solon-cloud-rpc/thrift-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-trace/jaeger-solon-cloud-plugin/pom.xml b/solon-cloud-trace/jaeger-solon-cloud-plugin/pom.xml index e71d2a0be33f6b55886b7a78b872fa7a2bc25561..a42702806e43da6f3be5b4e6df14772a7b0988a6 100644 --- a/solon-cloud-trace/jaeger-solon-cloud-plugin/pom.xml +++ b/solon-cloud-trace/jaeger-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-trace/opentracing-solon-cloud-plugin/pom.xml b/solon-cloud-trace/opentracing-solon-cloud-plugin/pom.xml index 6d4e799ce2edc04950a9a6d93914761008ad5ffb..4783d7e49dcffe7181f5c939cd938151b9440164 100644 --- a/solon-cloud-trace/opentracing-solon-cloud-plugin/pom.xml +++ b/solon-cloud-trace/opentracing-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud-trace/zipkin-solon-cloud-plugin/pom.xml b/solon-cloud-trace/zipkin-solon-cloud-plugin/pom.xml index 556f349b8df747f7191cb2e0095fa5d71f107aac..c64117416acbc731add164e6d98da0b2f9b99169 100644 --- a/solon-cloud-trace/zipkin-solon-cloud-plugin/pom.xml +++ b/solon-cloud-trace/zipkin-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud/solon-cloud-eventplus/pom.xml b/solon-cloud/solon-cloud-eventplus/pom.xml index f53d5566fafe41c0fd4fe7f1d1526fe8c01517a3..15317048a571ed8571407e9e100df1e7920fff64 100644 --- a/solon-cloud/solon-cloud-eventplus/pom.xml +++ b/solon-cloud/solon-cloud-eventplus/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud/solon-cloud-gateway/pom.xml b/solon-cloud/solon-cloud-gateway/pom.xml index c239d38c1cb8404a35e4530b1b81eecbaf40e4dc..db5fba61a66175c929ca6d6390ae25b2f24c2444 100644 --- a/solon-cloud/solon-cloud-gateway/pom.xml +++ b/solon-cloud/solon-cloud-gateway/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud/solon-cloud-metrics/pom.xml b/solon-cloud/solon-cloud-metrics/pom.xml index ff6116296bdf37e4aef803ef4245ed78768ee293..2f5ac19c4d5a11e6aa80d50a766c0a2614abd778 100644 --- a/solon-cloud/solon-cloud-metrics/pom.xml +++ b/solon-cloud/solon-cloud-metrics/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud/solon-cloud-telemetry/pom.xml b/solon-cloud/solon-cloud-telemetry/pom.xml index b7eca0162d2662e7e8f9f5e4759fa1c1a783541b..ee800d2a62b6dce7b3f24873aab38184c48bef39 100644 --- a/solon-cloud/solon-cloud-telemetry/pom.xml +++ b/solon-cloud/solon-cloud-telemetry/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud/solon-cloud-tracing/pom.xml b/solon-cloud/solon-cloud-tracing/pom.xml index 1c02a7350ace5ec9455907b0d89addbe463f318e..ac7e31356a8c067c8b5d282078a0f6c3bc6a9f8b 100644 --- a/solon-cloud/solon-cloud-tracing/pom.xml +++ b/solon-cloud/solon-cloud-tracing/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud/solon-cloud/pom.xml b/solon-cloud/solon-cloud/pom.xml index c402784f390e52f39da98a92fc0721c66300cb8b..c257e4ee886d76428bb30af36bb28c936189d14b 100644 --- a/solon-cloud/solon-cloud/pom.xml +++ b/solon-cloud/solon-cloud/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud_old/solon.cloud.eventplus/pom.xml b/solon-cloud_old/solon.cloud.eventplus/pom.xml index 7cd6d8d12175a323a35220652ad8525752a27502..d9045256d811b53840fa990c2a3d6efddb0f374d 100644 --- a/solon-cloud_old/solon.cloud.eventplus/pom.xml +++ b/solon-cloud_old/solon.cloud.eventplus/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud_old/solon.cloud.gateway/pom.xml b/solon-cloud_old/solon.cloud.gateway/pom.xml index 69c6151ec6d323d026a31604c5608cfe1b9ed242..4772febeca8ab4ac84537a9c1dd996baf084fb5c 100644 --- a/solon-cloud_old/solon.cloud.gateway/pom.xml +++ b/solon-cloud_old/solon.cloud.gateway/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud_old/solon.cloud.metrics/pom.xml b/solon-cloud_old/solon.cloud.metrics/pom.xml index 5dd20a695d2b0e50797837dad2ff1fe990b9e9b9..a69ff281e305ab01da3d9f99f41b60f0545f1552 100644 --- a/solon-cloud_old/solon.cloud.metrics/pom.xml +++ b/solon-cloud_old/solon.cloud.metrics/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud_old/solon.cloud.tracing/pom.xml b/solon-cloud_old/solon.cloud.tracing/pom.xml index a42cbd075124fdd4587ad7fc0a9d941ccbcda2e2..7ee1977d296bbaf7ef2dc5bb7ce63185ae81f283 100644 --- a/solon-cloud_old/solon.cloud.tracing/pom.xml +++ b/solon-cloud_old/solon.cloud.tracing/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6 diff --git a/solon-cloud_old/solon.cloud/pom.xml b/solon-cloud_old/solon.cloud/pom.xml index edf1a223a05c553afec3ae2ebccce016e8678d52..6834155c5ac48d0e42d0bd6bbf8569bd9118e6b2 100644 --- a/solon-cloud_old/solon.cloud/pom.xml +++ b/solon-cloud_old/solon.cloud/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.6.0 + 3.6.6