Merge pull request #19 from fan9704/feat_network_service

🐛 fix(amqp) Fix Enable Error fetching ENV
fan9704 · Jun 20, 2024 · 00d5a7f · 00d5a7f
2 parents bd265da + a172c40
commit 00d5a7f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/main/java/com/fkt/network/services/NetworkRecordService.java b/src/main/java/com/fkt/network/services/NetworkRecordService.java
@@ -26,7 +26,7 @@ public class NetworkRecordService {
     private NetworkRecordRepository repository;
     private NATService natService;
     private final RabbitTemplate rabbitTemplate;
-    @Value("{spring.rabbitmq.enable}")
+    @Value("${spring.rabbitmq.enable}")
     private Boolean amqpIsEnable = false;
     @Autowired
     public NetworkRecordService(NetworkRecordRepository repository, NATService natService, RabbitTemplate rabbitTemplate){
@@ -256,10 +256,6 @@ public void ampqSendJSON(NetworkRecord networkRecord,String operation){
     }
 
     public Boolean amqpIsEnabled(){
-        if(this.amqpIsEnable == null){
-            return false;
-        }else{
-            return this.amqpIsEnable;
-        }
+        return this.amqpIsEnable == true;
     }
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -17,7 +17,7 @@ spring.rabbitmq.host=${RABBIT_MQ_HOST:127.0.0.1}
 spring.rabbitmq.port=${RABBIT_MQ_PORT:5672}
 spring.rabbitmq.username=${RABBIT_MQ_USERNAME:guest}
 spring.rabbitmq.password=${RABBIT_MQ_PASSWORD:guest}
-spring.rabbitmq.enable=${RABBIT_MQ_ENABLE:false}
+spring.rabbitmq.enable=${RABBIT_MQ_ENABLED:false}
 fkt.rabbitmq.receive.queue=nat.master
 fkt.rabbitmq.send.queue=nat.client
 rabbitmq.exchange.name=client