Merge branch 'develop' into feature/#8-redis-with-chat-service

k-twitter · Dec 31, 2023 · 3b68697 · 3b68697
2 parents 1a13745 + 4fc48a8
commit 3b68697
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -4,12 +4,17 @@ K twitter, K Instagram 목표
 경제적 자유  
 기술 향상
 
-# 사용 (예정) 기술
-k8s, docker, argoCD, Github Actions, terraform, spring, kotlin, kafka, redis, mysql, mongo, nginx, ElasticSearch, Kibana, Logstash, Grafana, Prometheus, Istio, React, HTML, CSS, JavaScript, TypeScript, Storybook ...
+# 사용 기술
+docker, Github Actions, spring, kotlin, kafka, redis, mysql, ElasticSearch, Kibana, Logstash, Grafana, Prometheus
+
+# 사용 예정 기술
+k8s, argoCD, terraform, mongo, nginx, Istio, React, HTML, CSS, JavaScript, TypeScript, Storybook ...
 
 # 멤버
 코더들의 반란 (프론트 급구..)
-| <img src="https://avatars.githubusercontent.com/u/68914294?v=4" width="130" height="130"> | <img src ="https://avatars.githubusercontent.com/u/76645095?v=4" width="130" height="130"> | <img src ="https://avatars.githubusercontent.com/u/26597702?v=4" width="130" height="130"> | <img src ="https://media.istockphoto.com/id/1269998782/ko/%EC%82%AC%EC%A7%84/%ED%9D%B0%EC%83%89-%EB%B0%B0%EA%B2%BD%EC%97%90-%EC%86%8C%EB%85%80%EC%9D%98-%EC%96%B4%EB%91%90%EC%9A%B4-%EC%8B%A4%EB%A3%A8%EC%97%A3-%EC%9D%B5%EB%AA%85%EC%9D%98-%EA%B0%9C%EB%85%90.jpg?b=1&s=612x612&w=0&k=20&c=gd2exr17dRKVPpRaps-r3z05dUnNiLK6CjkpMzOnd-Y=" width="130" height="130"> |
-|:-----------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|   :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|   
-|                             [조현우](https://github.com/hyun98)                              |                             [조정현](https://github.com/jojaeng2)                             |                                                                                                                                                                               [정현모](https://github.com/gusah009)                                                                                                                                                                                |                                                                                                                                                                               같이 하실분                                                                                                                                                                                |
-|                           [NCSOFT](https://kr.ncsoft.com/kr/index.do)                            |                            [NAVER](https://www.naver.com/)                            |                                                                                                                                                                                [KAKAO](https://www.kakaocorp.com/page/)                                                                                                                                                                                 |                                                                                                                                                                                구합니다                                                                                                                                                                                 | 
+
+| <img src="https://avatars.githubusercontent.com/u/68914294?v=4" width="130" height="130"> | <img src ="https://avatars.githubusercontent.com/u/76645095?v=4" width="130" height="130"> | <img src ="https://avatars.githubusercontent.com/u/26597702?v=4" width="130" height="130"> | <img src ="https://avatars.githubusercontent.com/u/78212016?v=4" width="130" height="130"> | <img src ="https://media.istockphoto.com/id/1269998782/ko/%EC%82%AC%EC%A7%84/%ED%9D%B0%EC%83%89-%EB%B0%B0%EA%B2%BD%EC%97%90-%EC%86%8C%EB%85%80%EC%9D%98-%EC%96%B4%EB%91%90%EC%9A%B4-%EC%8B%A4%EB%A3%A8%EC%97%A3-%EC%9D%B5%EB%AA%85%EC%9D%98-%EA%B0%9C%EB%85%90.jpg?b=1&s=612x612&w=0&k=20&c=gd2exr17dRKVPpRaps-r3z05dUnNiLK6CjkpMzOnd-Y=" width="130" height="130"> |
+|:-----------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------:|   :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|   
+|                             [조현우](https://github.com/hyun98)                              |                             [조정현](https://github.com/jojaeng2)                             |                             [정현모](https://github.com/gusah009)                             |                            [최우창](https://github.com/woo-chang)                             | 같이 하실분                                                                                                                                                                                |
+|                        [NCSOFT](https://kr.ncsoft.com/kr/index.do)                        |                              [NAVER](https://www.naver.com/)                               |                          [KAKAO](https://www.kakaocorp.com/page/)                          |                          [WOOWABROS](https://www.woowahan.com/en)                          |  구합니다                                                                                                                                                                                 | 
+|                                             BE                                             |                                           BE,FE                                            |                                             BE                                             |                                         BE,MARKUP                                          |  구합니다                                                                                                                                                                                 | 
diff --git a/sns_service/build.gradle.kts b/sns_service/build.gradle.kts
@@ -36,6 +36,9 @@ dependencies {
     implementation ("net.logstash.logback:logstash-logback-encoder:7.3")
     implementation ("io.github.microutils:kotlin-logging:3.0.5")
     implementation("it.ozimov:embedded-redis:0.7.2")
+    implementation("org.springframework.kafka:spring-kafka")
+
+
     compileOnly("org.projectlombok:lombok")
     annotationProcessor("org.projectlombok:lombok")
     testImplementation("org.springframework.boot:spring-boot-starter-test")

diff --git a/sns_service/docker-compose.yaml b/sns_service/docker-compose.yaml
@@ -48,7 +48,7 @@ services:
       - kibana-volume:/usr/share/kibana/data
       - ./infra/kibana/config/kibana.yaml:/usr/share/kibana/config/kibana.yml
 
-  
+
   prometheus:
     image: "prom/prometheus:v2.47.0"
     container_name: prometheus
@@ -73,6 +73,92 @@ services:
       - ./grafana/volume:/var/lib/grafana
     restart: always
 
+  zookeeper-1:
+    image: confluentinc/cp-zookeeper:latest
+    ports:
+      - "2181:2181"
+    environment:
+      ZOOKEEPER_CLIENT_PORT: 2181
+      ZOOKEEPER_SERVER_ID: 1
+      ZOOKEEPER_SERVERS: zookeeper-1:2888:3888;zookeeper-2:2888:3888;zookeeper-3:2888:3888
+
+  zookeeper-2:
+    image: confluentinc/cp-zookeeper:latest
+    ports:
+      - "2182:2182"
+    environment:
+      ZOOKEEPER_CLIENT_PORT: 2182
+      ZOOKEEPER_SERVER_ID: 2
+      ZOOKEEPER_SERVERS: zookeeper-1:2888:3888;zookeeper-2:2888:3888;zookeeper-3:2888:3888
+
+  zookeeper-3:
+    image: confluentinc/cp-zookeeper:latest
+    ports:
+      - "2183:2183"
+    environment:
+      ZOOKEEPER_CLIENT_PORT: 2183
+      ZOOKEEPER_SERVER_ID: 3
+      ZOOKEEPER_SERVERS: zookeeper-1:2888:3888;zookeeper-2:2888:3888;zookeeper-3:2888:3888
+
+  kafka-1:
+    image: confluentinc/cp-kafka:latest
+    ports:
+      - "9092:9092"
+      - "29092:29092"
+    environment:
+      KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka-1:19092,EXTERNAL://${DOCKER_HOST_IP:-127.0.0.1}:9092,DOCKER://host.docker.internal:29092
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT,DOCKER:PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
+      KAFKA_ZOOKEEPER_CONNECT: "zookeeper-1:2181,zookeeper-2:2182,zookeeper-3:2183"
+      KAFKA_BROKER_ID: 1
+    depends_on:
+      - zookeeper-1
+      - zookeeper-2
+      - zookeeper-3
+
+  kafka-2:
+    image: confluentinc/cp-kafka:latest
+    ports:
+      - "9093:9093"
+      - "29093:29093"
+    environment:
+      KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka-2:19093,EXTERNAL://${DOCKER_HOST_IP:-127.0.0.1}:9093,DOCKER://host.docker.internal:29093
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT,DOCKER:PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
+      KAFKA_ZOOKEEPER_CONNECT: "zookeeper-1:2181,zookeeper-2:2182,zookeeper-3:2183"
+      KAFKA_BROKER_ID: 2
+    depends_on:
+      - zookeeper-1
+      - zookeeper-2
+      - zookeeper-3
+
+  kafka-3:
+    image: confluentinc/cp-kafka:latest
+    ports:
+      - "9094:9094"
+      - "29094:29094"
+    environment:
+      KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka-3:19094,EXTERNAL://${DOCKER_HOST_IP:-127.0.0.1}:9094,DOCKER://host.docker.internal:29094
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT,DOCKER:PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
+      KAFKA_ZOOKEEPER_CONNECT: "zookeeper-1:2181,zookeeper-2:2182,zookeeper-3:2183"
+      KAFKA_BROKER_ID: 3
+    depends_on:
+        - zookeeper-1
+        - zookeeper-2
+        - zookeeper-3
+
+  kafka-ui:
+    image: provectuslabs/kafka-ui
+    container_name: kafka-ui
+    ports:
+      - "8989:8080"
+    restart: always
+    environment:
+      - KAFKA_CLUSTERS_0_NAME=local
+      - KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS=kafka-1:29092,kafka-2:29093,kafka-3:29094
+      - KAFKA_CLUSTERS_0_ZOOKEEPER=zookeeper-1:2181,zookeeper-2:2182,zookeeper-3:2183
+
 volumes:
   elasticsearch-volume:
     external: false