[rocketmq-spring] branch master updated: [ISSUE #376]Fix the selectorExpression not resolve placeholders. (#383)

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jinrongtong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-spring.git


The following commit(s) were added to refs/heads/master by this push:
     new b35e3c5  [ISSUE #376]Fix the selectorExpression not resolve placeholders. (#383)
b35e3c5 is described below

commit b35e3c52308d60186a7b53bedf957d7329e00da6
Author: zhangjidi2016 <zh...@cmss.chinamobile.com>
AuthorDate: Tue Aug 24 17:54:55 2021 +0800

    [ISSUE #376]Fix the selectorExpression not resolve placeholders. (#383)
    
    Co-authored-by: zhangjidi2016 <zh...@cmss.chinamobile.com>
---
 .../rocketmq/spring/autoconfigure/ExtConsumerResetConfiguration.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtConsumerResetConfiguration.java b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtConsumerResetConfiguration.java
index 7e81b5b..1726392 100644
--- a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtConsumerResetConfiguration.java
+++ b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtConsumerResetConfiguration.java
@@ -122,7 +122,7 @@ public class ExtConsumerResetConfiguration implements ApplicationContextAware, S
         String accessChannel = resolvePlaceholders(annotation.accessChannel(), rocketMQProperties.getAccessChannel());
         MessageModel messageModel = annotation.messageModel();
         SelectorType selectorType = annotation.selectorType();
-        String selectorExpression = annotation.selectorExpression();
+        String selectorExpression = resolvePlaceholders(annotation.selectorExpression(), consumerConfig.getSelectorExpression());
         String ak = resolvePlaceholders(annotation.accessKey(), consumerConfig.getAccessKey());
         String sk = resolvePlaceholders(annotation.secretKey(), consumerConfig.getSecretKey());
         int pullBatchSize = annotation.pullBatchSize();