diff --git a/.gitattributes b/.gitattributes index c95b27d..cfa3643 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ # Auto detect text files and perform LF normalization * text=auto +src/main/java/com/eum/auth/config/RedisRepositoryConfig.java merge=servers src/main/java/com/eum/auth/client/HaetsalClient.java merge=servers -src/main/java/com/eum/auth/config/RedisRepositoryConfig.java merge=servers \ No newline at end of file diff --git a/src/main/java/com/eum/auth/messageq/KafkaProducerConfig.java b/src/main/java/com/eum/auth/messageq/KafkaProducerConfig.java index 36509a1..edeee82 100644 --- a/src/main/java/com/eum/auth/messageq/KafkaProducerConfig.java +++ b/src/main/java/com/eum/auth/messageq/KafkaProducerConfig.java @@ -21,7 +21,7 @@ public class KafkaProducerConfig { @Bean public ProducerFactory producerFactory() { Map properties = new HashMap<>(); - properties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "223.130.133.30:29092"); + properties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "kafka:29092"); properties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class); properties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 54d6ef9..3a41628 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -39,3 +39,4 @@ kakao : +