diff --git a/pom.xml b/pom.xml
index 0792ff1..c781544 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
org.apache.rocketmq
spring-boot-starter-rocketmq
- 1.0.2-SNAPSHOT
+ 1.0.4-SNAPSHOT
Spring Boot Rocket Starter
Starter for messaging using Apache RocketMQ
@@ -60,10 +60,10 @@
spring-boot-starter
- com.aliyun.openservices
- ons-client
- 1.7.2.Final
-
+ com.aliyun.openservices
+ ons-client
+ 1.7.1.Final
+
org.springframework
spring-messaging
diff --git a/src/main/java/org/apache/rocketmq/spring/starter/annotation/RocketMQMessageListener.java b/src/main/java/org/apache/rocketmq/spring/starter/annotation/RocketMQMessageListener.java
index c864dfa..9e768a8 100644
--- a/src/main/java/org/apache/rocketmq/spring/starter/annotation/RocketMQMessageListener.java
+++ b/src/main/java/org/apache/rocketmq/spring/starter/annotation/RocketMQMessageListener.java
@@ -26,7 +26,6 @@ import java.lang.annotation.Target;
import org.apache.rocketmq.spring.starter.enums.ConsumeMode;
import org.apache.rocketmq.spring.starter.enums.SelectorType;
-import com.aliyun.openservices.ons.api.ExpressionType;
import com.aliyun.openservices.shade.com.alibaba.rocketmq.common.protocol.heartbeat.MessageModel;
@Target(ElementType.TYPE)
diff --git a/src/main/java/org/apache/rocketmq/spring/starter/core/AliyunRocketMQListenerContainer.java b/src/main/java/org/apache/rocketmq/spring/starter/core/AliyunRocketMQListenerContainer.java
index 52d3c72..4ab3881 100644
--- a/src/main/java/org/apache/rocketmq/spring/starter/core/AliyunRocketMQListenerContainer.java
+++ b/src/main/java/org/apache/rocketmq/spring/starter/core/AliyunRocketMQListenerContainer.java
@@ -17,6 +17,9 @@
package org.apache.rocketmq.spring.starter.core;
+import static org.apache.rocketmq.spring.starter.core.DefaultRocketMQListenerContainerConstants.CONSUMEFAILED_TAG;
+import static org.apache.rocketmq.spring.starter.core.DefaultRocketMQListenerContainerConstants.CONSUMEFAILED_TOPIC;
+
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.nio.charset.Charset;
@@ -40,7 +43,6 @@ import com.aliyun.openservices.ons.api.ConsumeContext;
import com.aliyun.openservices.ons.api.Consumer;
import com.aliyun.openservices.ons.api.Message;
import com.aliyun.openservices.ons.api.MessageListener;
-import com.aliyun.openservices.ons.api.MessageSelector;
import com.aliyun.openservices.ons.api.ONSFactory;
import com.aliyun.openservices.ons.api.PropertyKeyConst;
import com.aliyun.openservices.ons.api.batch.BatchConsumer;
@@ -49,15 +51,11 @@ import com.aliyun.openservices.ons.api.order.ConsumeOrderContext;
import com.aliyun.openservices.ons.api.order.MessageOrderListener;
import com.aliyun.openservices.ons.api.order.OrderAction;
import com.aliyun.openservices.ons.api.order.OrderConsumer;
-import com.aliyun.openservices.shade.com.alibaba.rocketmq.client.consumer.DefaultMQPushConsumer;
-import com.aliyun.openservices.shade.com.alibaba.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
-import com.aliyun.openservices.shade.com.alibaba.rocketmq.client.consumer.listener.ConsumeOrderlyContext;
-import com.aliyun.openservices.shade.com.alibaba.rocketmq.client.consumer.listener.ConsumeOrderlyStatus;
+import com.aliyun.openservices.shade.com.alibaba.rocketmq.client.consumer.MessageSelector;
import com.aliyun.openservices.shade.com.alibaba.rocketmq.client.exception.MQClientException;
-import com.aliyun.openservices.shade.com.alibaba.rocketmq.common.message.MessageExt;
import com.aliyun.openservices.shade.com.alibaba.rocketmq.common.protocol.heartbeat.MessageModel;
import com.fasterxml.jackson.databind.ObjectMapper;
-import static org.apache.rocketmq.spring.starter.core.DefaultRocketMQListenerContainerConstants.*;
+
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
@@ -399,16 +397,16 @@ public class AliyunRocketMQListenerContainer implements InitializingBean, Rocket
orderConsumer = ONSFactory.createOrderedConsumer(consumerProperties);
if(selectorType == SelectorType.TAG){
orderConsumer.subscribe(topic, selectorExpress, new DefaultMessageListenerOrderly());
- }else if(selectorType == SelectorType.SQL92){
- orderConsumer.subscribe(topic, MessageSelector.bySql(selectorExpress), new DefaultMessageListenerOrderly());
+// }else if(selectorType == SelectorType.SQL92){
+// orderConsumer.subscribe(topic, MessageSelector.bySql(selectorExpress), new DefaultMessageListenerOrderly());
}
break;
case CONCURRENTLY://普通消息
consumer = ONSFactory.createConsumer(consumerProperties);
if(selectorType == SelectorType.TAG){
consumer.subscribe(topic, selectorExpress, new DefaultMessageListenerConcurrently());
- }else if(selectorType == SelectorType.SQL92){
- consumer.subscribe(topic, MessageSelector.bySql(selectorExpress), new DefaultMessageListenerConcurrently());
+// }else if(selectorType == SelectorType.SQL92){
+// consumer.subscribe(topic, MessageSelector.bySql(selectorExpress), new DefaultMessageListenerConcurrently());
}
break;
case BATCH://批量消息
diff --git a/src/main/java/org/apache/rocketmq/spring/starter/enums/SelectorType.java b/src/main/java/org/apache/rocketmq/spring/starter/enums/SelectorType.java
index 27604fe..1923713 100644
--- a/src/main/java/org/apache/rocketmq/spring/starter/enums/SelectorType.java
+++ b/src/main/java/org/apache/rocketmq/spring/starter/enums/SelectorType.java
@@ -17,7 +17,7 @@
package org.apache.rocketmq.spring.starter.enums;
-import com.aliyun.openservices.ons.api.ExpressionType;
+import com.aliyun.openservices.shade.com.alibaba.rocketmq.common.filter.ExpressionType;
public enum SelectorType {
@@ -28,6 +28,7 @@ public enum SelectorType {
/**
* @see ExpressionType#SQL92
+ * 注释by zwg 暂时不支持,原因:阿里云提供的ons-client最新版本1.7.4支持,但是该包有问题,引入后工程无法打包,目前使用的1.7.1,该版本不支持SQL92过滤
*/
- SQL92
+ //SQL92
}