rocketmq区分生产者与消费者配置

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/util/config/RocketMQConsumer.java.ftl

@@ -18,8 +18,8 @@ TARGET=PSSYSTEM
     <#if sys.getAllPSDevSlnMSDepAPIs()??>
         <#list sys.getAllPSDevSlnMSDepAPIs() as depSysApi>
             <#if depSysApi.getPSDCMSPlatform()?? >
-                <#if depSysApi.getUserParam("rocketmq.producer.namesrvAddr","")??>
-                    <#assign mqServerAddress = depSysApi.getUserParam("rocketmq.producer.namesrvAddr","")>
+                <#if depSysApi.getUserParam("rocketmq.consumer.namesrvAddr","")??>
+                    <#assign mqServerAddress = depSysApi.getUserParam("rocketmq.consumer.namesrvAddr","")>
                 </#if>
             </#if>
         </#list>
@@ -45,16 +45,18 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 
 @Slf4j
 @Configuration
-@ConditionalOnExpression("${r'${rocketmq.isOnOff:'+"'"+mqServer+"'"+"}.equals('on')"}")
+@ConditionalOnExpression("${r'${rocketmq.consumer.isOnOff:'+"'"+mqServer+"'"+"}.equals('on')"}")
 public class RocketMQConsumer {
 
     @Value("${r'${rocketmq.producer.groupName:default}'}")
     private String groupName;
 
+    @Value("${r'${rocketmq.topic:default}'}")
+    private String topic;
+
     @Value("${r'${rocketmq.producer.namesrvAddr:127.0.0.1:9876}'}")
     private String namesrvAddr;
 
-    // 消费者线程数据量
     @Value("${r'${rocketmq.consumer.consumeThreadMin:1}'}")
     private Integer consumeThreadMin;
 
@@ -64,9 +66,6 @@ public class RocketMQConsumer {
     @Value("${r'${rocketmq.consumer.consumeMessageBatchMaxSize:1}'}")
     private Integer consumeMessageBatchMaxSize;
 
-    @Value("${r'${rocketmq.topic:default}'}")
-    private String topic;
-
     @Autowired
     @Lazy
     private RocketMQListenerProcessor listenerProcessor;

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/util/config/RocketMQListenerProcessor.java.ftl

@@ -8,6 +8,7 @@ TARGET=PSSYSTEM
         <#list dataEntity.getAllPSDEDataSyncs() as dataSync>
             <#if dataSync.getInPSSysDataSyncAgent?? && dataSync.getInPSSysDataSyncAgent()??>
                 <#assign hasMQConsumer=true>
+                <#break >
             </#if>
         </#list>
     </#if>
@@ -18,8 +19,8 @@ TARGET=PSSYSTEM
     <#if sys.getAllPSDevSlnMSDepAPIs()??>
         <#list sys.getAllPSDevSlnMSDepAPIs() as depSysApi>
             <#if depSysApi.getPSDCMSPlatform()?? >
-                <#if depSysApi.getUserParam("ibiz.rocketmq.producer.namesrvAddr","")??>
-                    <#assign mqServerAddress = depSysApi.getUserParam("ibiz.rocketmq.producer.namesrvAddr","")>
+                <#if depSysApi.getUserParam("ibiz.rocketmq.consumer.namesrvAddr","")??>
+                    <#assign mqServerAddress = depSysApi.getUserParam("ibiz.rocketmq.consumer.namesrvAddr","")>
                 </#if>
             </#if>
         </#list>
@@ -49,7 +50,7 @@ import java.util.List;
  */
 @Slf4j
 @Component
-@ConditionalOnExpression("${r'${rocketmq.producer.isOnOff:'+"'"+mqServer+"'"+"}.equals('on')"}")
+@ConditionalOnExpression("${r'${rocketmq.consumer.isOnOff:'+"'"+mqServer+"'"+"}.equals('on')"}")
 public class RocketMQListenerProcessor implements MessageListenerOrderly {
 
     <#list sys.getAllPSDataEntities() as dataEntity>

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/util/config/RocketMQProducer.java.ftl

@@ -45,7 +45,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 
 @Slf4j
 @Configuration
-@ConditionalOnExpression("${r'${rocketmq.isOnOff:'+"'"+mqServer+"'"+"}.equals('on')"}")
+@ConditionalOnExpression("${r'${rocketmq.producer.isOnOff:'+"'"+mqServer+"'"+"}.equals('on')"}")
 public class RocketMQProducer {
 
     @Value("${r'${rocketmq.producer.groupName:default}'}")
@@ -85,8 +85,6 @@ public class RocketMQProducer {
         log.info("rocketmq producer server 开启成功----------------------------------");
         return producer;
     }
-
-
 }
 </#if>