diff --git a/src/main/java/com/palnet/process/message/config/MessageConfig.java b/src/main/java/com/palnet/process/message/config/MessageConfig.java index 2c0dd72..60d3d11 100644 --- a/src/main/java/com/palnet/process/message/config/MessageConfig.java +++ b/src/main/java/com/palnet/process/message/config/MessageConfig.java @@ -21,10 +21,10 @@ public class MessageConfig { this.env = env; } -// @Bean -// public CachingConnectionFactory cachingConnectionFactory() { -// return new CachingConnectionFactory(); -// } + @Bean + public CachingConnectionFactory cachingConnectionFactory() { + return new CachingConnectionFactory(); + } @Bean public Jackson2JsonMessageConverter converter() { @@ -66,7 +66,7 @@ public class MessageConfig { } @Bean - public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory, Jackson2JsonMessageConverter converter) { + public RabbitTemplate rabbitTemplate(CachingConnectionFactory connectionFactory, Jackson2JsonMessageConverter converter) { RabbitTemplate rabbitTemplate = new RabbitTemplate(); rabbitTemplate.setConnectionFactory(connectionFactory); diff --git a/src/main/java/com/palnet/process/message/producer/MessageProducer.java b/src/main/java/com/palnet/process/message/producer/MessageProducer.java index de8aec6..26d283b 100644 --- a/src/main/java/com/palnet/process/message/producer/MessageProducer.java +++ b/src/main/java/com/palnet/process/message/producer/MessageProducer.java @@ -27,9 +27,17 @@ public class MessageProducer { } public void sendToAppServerMessage(GPDatabaseModel model){ + String json = ""; + + try { + json = objectMapper.writeValueAsString(model); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + rabbitTemplate.convertAndSend( Objects.requireNonNull(env.getProperty("message.app.queue-name")), - model + json ); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 86dbf4e..9ecaf0a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,7 @@ spring: + config: + activate: + on-profile: local rabbitmq: host: localhost port: 5672 @@ -17,6 +20,74 @@ netty: server: port: 8182 +message: + app: + queue-name: app.drone.queue + exchange-name: app.drone.exchange + routing-key: app.drone.routing.# + websocket: + queue-name: websocket.drone.queue + exchange-name: websocket.drone.exchange + routing-key: websocket.drone.routing.# + +--- + +spring: + config: + activate: + on-profile: dev + rabbitmq: + host: localhost + port: 5672 + username: guest + password: guest + +netty: + task: + controlinfoTime: 2000 + socket: + port: 8082 + thread: + boss: 1 + worker: 1 + +server: + port: 8182 + +message: + app: + queue-name: app.drone.queue + exchange-name: app.drone.exchange + routing-key: app.drone.routing.# + websocket: + queue-name: websocket.drone.queue + exchange-name: websocket.drone.exchange + routing-key: websocket.drone.routing.# + +--- + +spring: + config: + activate: + on-profile: prod + rabbitmq: + host: localhost + port: 5672 + username: guest + password: guest + +netty: + task: + controlinfoTime: 10000 + socket: + port: 8082 + thread: + boss: 1 + worker: 1 + +server: + port: 8182 + message: app: queue-name: app.drone.queue