lyhzzz 1 rok pred
rodič
commit
c9a87bec5f

+ 4 - 11
src/main/java/com/fdkankan/modeling/constants/SysConstants.java

@@ -83,22 +83,15 @@ public class SysConstants implements ApplicationContextAware {
 //    }
     @Autowired
     IMqEcsService mqEcsService;
-    public String queueName = null;
 
     @Value("${queue.modeling.modeling-call}")
-    public void setQueueName(String queueNameDf) {
-        queueName = queueNameDf;
-    }
-
+    private String queueNameDf;
 
-    public String getQueueName() {
-        return queueName;
-    }
 
-    public void initIsResidenceService() {
+    public String initIsResidenceService() {
         if(StringUtils.isEmpty(SysConstants.hostName)){
             SysConstants.isResidenceService = true;
-            return;
+            return queueNameDf;
         }
         MqEcs mqEcs = mqEcsService.getByHostName(SysConstants.hostName);
         if(mqEcs != null && mqEcs.getIsScaling() == 0){ //设置为常驻
@@ -113,7 +106,7 @@ public class SysConstants implements ApplicationContextAware {
             mqEcs.setUpdateTime(null);
             mqEcsService.updateById(mqEcs);
         }
-        queueName = mqEcs.getQueueName();
+        return mqEcs.getQueueName();
     }
 
     @Override

+ 1 - 1
src/main/java/com/fdkankan/modeling/receiver/RabbitMqListener.java

@@ -87,7 +87,7 @@ public class RabbitMqListener {
      */
     @RabbitListener(
             //queuesToDeclare = @Queue("${queue.modeling.modeling-call}"),
-            queuesToDeclare = @Queue("#{SysConstants.getQueueName()}"),
+            queuesToDeclare = @Queue("#{SysConstants.initIsResidenceService()}"),
             concurrency = "${maxThread.modeling.modeling-call}",
             priority = "${mq.consumerPriority}"
     )