Feat/#83 플레이리스트 서버에 음원 서버를 연동합니다.

src/backend/README.md

@@ -32,3 +32,33 @@
 - [음원 업로더 서버](./music-uploader-server/README.md) : [kor-Chipmunk](https://www.github.com/kor-Chipmunk)
 - [알림 서버](./alarm-server/README.md) : [kor-Chipmunk](https://www.github.com/kor-Chipmunk)
 - [파일(스토리지) 서버](./storage-server/README.md) : [kor-Chipmunk](https://www.github.com/kor-Chipmunk)
+
+### 도커 파일 종류
+
+1. `docker-compose.yml`
+    - 로컬 개발용 with IntelliJ
+    - 서버 앱을 제외한 리소스
+    - DNS : 서버 앱에서 Host DNS 으로 따름
+    - 새로 빌드 및 기존 빌드로 실행
+        - `./scripts/start_docker.sh`
+2. `docker-compose-local.yml`
+   - 로컬 도커 테스트용
+   - 서버 앱 포함
+   - 도커 허브 올리기 전 정상 동작 확인용
+   - DNS : Docker ServiceName DNS 에 따름. 관련한 엔드포인트 설정 파일에서 환경변수로 넣어줘야 함.
+   - 새로 빌드 및 기존 빌드로 실행
+       - `./scripts/start_docker_local.sh`
+   - 새로 빌드하여 실행
+       - `./scripts/start_docker_local_build.sh`
+3. `docker-compose-hub.yml`
+   - 도커 허브에 빌드된 앱 포함
+   - DNS : Docker ServiceName DNS 에 따름. 관련한 엔드포인트 설정 파일에서 환경변수로 넣어줘야 함.
+   - 새로 빌드 및 기존 빌드로 실행
+       - `./scripts/start_docker_hub.sh`
+
+* 스크립트 권한 오류 : `chmod +x ./scripts/*`
+
+* Docker ServiceName DNS : localhost:10000) (X) music-app:10000 (O)
+    - 포트는 호스트(개인 컴퓨터)에 매핑된 주소가 아닌, 도커 컨테이너 내부에 생성되는 주소로 설정 (eg. chart-app 이 10000:8080 이면, chart-app:10000 (X), chart-app:8080 (O) )
+    - host.docker.internal 을 사용하는 경우 호스트에 매핑된 포트로 매핑
+* Host DNS : 호스트(개인 컴퓨터)에 매핑된 포트로 연결. chart-app:8080 (X), localhost:10000 (O)

src/backend/alarm-server/alarm-api/src/main/java/com/lalala/alarm/AlarmApplication.java

@@ -1,8 +1,25 @@
 package com.lalala.alarm;
 
+import com.lalala.aop.AuthenticationContext;
+import com.lalala.config.KafkaConsumerConfig;
+import com.lalala.config.KafkaProducerConfig;
+import com.lalala.mvc.aop.PassportAspect;
+import com.lalala.mvc.config.CommonMvcModuleConfig;
+import com.lalala.mvc.exception.GlobalExceptionHandler;
+import com.lalala.mvc.response.BaseResponseBodyAdvice;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Import;
 
+@Import({
+		CommonMvcModuleConfig.class,
+		AuthenticationContext.class,
+		PassportAspect.class,
+		KafkaConsumerConfig.class,
+		KafkaProducerConfig.class,
+		BaseResponseBodyAdvice.class,
+		GlobalExceptionHandler.class,
+})
 @SpringBootApplication
 public class AlarmApplication {
 

src/backend/alarm-server/alarm-api/src/main/resources/application.yaml → src/backend/alarm-server/alarm-api/src/main/resources/application.yml

@@ -9,30 +9,35 @@ rabbitmq:
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: "jdbc:mysql://localhost:29000/alarm"
+    url: jdbc:mysql://localhost:28100/alarm
     username: root
     password: admin
 
   rabbitmq:
     host: localhost
     username: admin
     password: admin
-    port: '28300'
+    port: 28300
     listener:
       simple:
         default-requeue-rejected: 'false'
 
   jpa:
     database-platform: org.hibernate.dialect.MySQLDialect
     hibernate:
-      ddl-auto: validate
+      ddl-auto: create
     properties:
       dialect: org.hibernate.dialect.MySQLDialect
       hibernate:
         format_sql: true
         show_sql: true
         use_sql_comments: true
 
+  kafka:
+    bootstrap-servers: localhost:40000,localhost:40001,localhost:40002
+    consumer:
+      group-id: alarm-group
+
 logging:
   pattern:
     level: "%5p [%X{traceId:-},%X{spanId:-}]"

src/backend/alarm-server/build.gradle

@@ -17,6 +17,10 @@ jar {
 }
 
 subprojects {
+	if (project.name.startsWith("common")) {
+		return
+	}
+
 	apply plugin: 'java'
 	apply plugin: 'org.springframework.boot'
 	apply plugin: 'io.spring.dependency-management'
@@ -39,6 +43,9 @@ subprojects {
 	}
 
 	dependencies {
+		implementation project(":common-module:common")
+		implementation project(":common-module:common-mvc")
+
 		// spring mvc
 		implementation 'org.springframework.boot:spring-boot-starter-web'
 		testImplementation 'org.springframework.boot:spring-boot-starter-test'

src/backend/alarm-server/docker-compose-hub.yml

@@ -6,7 +6,7 @@ services:
     ports:
       - 28000:28000
     environment:
-      SPRING_DATASOURCE_URL: jdbc:mysql://alarm-mysql:3306/user?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&serverTimezone=Asia/Seoul
+      SPRING_DATASOURCE_URL: jdbc:mysql://alarm-mysql:3306/alarm?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&serverTimezone=Asia/Seoul
       SPRING_DATASOURCE_USERNAME: root
       SPRING_DATASOURCE_PASSWORD: admin
       SPRING_DATASOURCE_DRIVER-CLASS-NAME: com.mysql.cj.jdbc.Driver
@@ -46,7 +46,7 @@ services:
       - 28100:3306
     environment:
       MYSQL_ROOT_PASSWORD: admin
-      MYSQL_DATABASE: user
+      MYSQL_DATABASE: alarm
       TZ: Asia/Seoul
     command:
       - --character-set-server=utf8mb4

src/backend/alarm-server/docker-compose-local.yml

@@ -0,0 +1,83 @@
+version: "3.9"
+services:
+  alarm-app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    restart: always
+    ports:
+      - 28000:28000
+    environment:
+      SPRING_DATASOURCE_URL: jdbc:mysql://alarm-mysql:3306/alarm?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&serverTimezone=Asia/Seoul
+      SPRING_DATASOURCE_USERNAME: root
+      SPRING_DATASOURCE_PASSWORD: admin
+      SPRING_DATASOURCE_DRIVER-CLASS-NAME: com.mysql.cj.jdbc.Driver
+
+      SPRING_JPA_PROPERTIES_DIALECT: org.hibernate.dialect.MySQLDialect
+
+      SPRING_MAIL_HOST: smtp.gmail.com
+      SPRING_MAIL_USERNAME: [email protected]
+      SPRING_MAIL_PASSWORD: b3^weK*zh47gZxm5
+
+      SPRING_DATA_REDIS_HOST: alarm-redis
+      SPRING_DATA_REDIS_PORT: 6379
+
+      SPRING_KAFKA_BOOTSTRAP-SERVERS: Kafka00Service:9092,Kafka01Service:9092,Kafka02Service:9092
+
+      EUREKA_INSTANCE_HOSTNAME: localhost
+      EUREKA_CLIENT_SERVICE-URL_DEFAULTZONE: http://discovery-app:34100/eureka
+
+      PASSPORT_ALGORITHM: HmacSHA256
+      PASSPORT_KEY: SECRET_KEY
+
+      MANAGEMENT_ZIPKIN_TRACING_ENDPOINT: http://infra-zipkin:9411/api/v2/spans
+
+      SPRING_RABBITMQ_HOST: alarm-rabbitmq
+      SPRING_RABBITMQ_PORT: 5672
+    depends_on:
+      - alarm-mysql
+      - alarm-redis
+      - alarm-rabbitmq
+    networks:
+      - default
+      - lalala-network
+
+  alarm-mysql:
+    image: mysql:8.2.0
+    restart: always
+    ports:
+      - 28100:3306
+    environment:
+      MYSQL_ROOT_PASSWORD: admin
+      MYSQL_DATABASE: alarm
+      TZ: Asia/Seoul
+    command:
+      - --character-set-server=utf8mb4
+      - --collation-server=utf8mb4_unicode_ci
+    volumes:
+      - ./.docker/mysql/:/var/lib/mysql
+      - ./infra/:/docker-entrypoint-initdb.d
+
+  alarm-redis:
+    image: redis:7.0
+    ports:
+      - 28200:6379
+
+  alarm-adminer:
+    image: adminer
+    restart: always
+    ports:
+      - 29900:8080
+
+  alarm-rabbitmq:
+    image: rabbitmq:3.10-management
+    ports:
+      - "28300:5672"
+    environment:
+      RABBITMQ_DEFAULT_USER: admin
+      RABBITMQ_DEFAULT_PASS: admin
+
+networks:
+  lalala-network:
+    driver: bridge
+    external: true

src/backend/alarm-server/docker-compose.yml

@@ -1,54 +1,13 @@
 version: "3.9"
 services:
-  alarm-app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    restart: always
-    ports:
-      - 28000:28000
-    environment:
-      SPRING_DATASOURCE_URL: jdbc:mysql://alarm-mysql:3306/user?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&serverTimezone=Asia/Seoul
-      SPRING_DATASOURCE_USERNAME: root
-      SPRING_DATASOURCE_PASSWORD: admin
-      SPRING_DATASOURCE_DRIVER-CLASS-NAME: com.mysql.cj.jdbc.Driver
-
-      SPRING_JPA_PROPERTIES_DIALECT: org.hibernate.dialect.MySQLDialect
-
-      SPRING_MAIL_HOST: smtp.gmail.com
-      SPRING_MAIL_USERNAME: [email protected]
-      SPRING_MAIL_PASSWORD: b3^weK*zh47gZxm5
-
-      SPRING_DATA_REDIS_HOST: alarm-redis
-      SPRING_DATA_REDIS_PORT: 6379
-
-      SPRING_KAFKA_BOOTSTRAP-SERVERS: Kafka00Service:9092,Kafka01Service:9092,Kafka02Service:9092
-
-      EUREKA_INSTANCE_HOSTNAME: localhost
-      EUREKA_CLIENT_SERVICE-URL_DEFAULTZONE: http://discovery-app:34100/eureka
-
-      PASSPORT_ALGORITHM: HmacSHA256
-      PASSPORT_KEY: SECRET_KEY
-
-      MANAGEMENT_ZIPKIN_TRACING_ENDPOINT: http://infra-zipkin:9411/api/v2/spans
-
-      SPRING_RABBITMQ_HOST: alarm-rabbitmq
-      SPRING_RABBITMQ_PORT: 5672
-    depends_on:
-      - alarm-mysql
-      - alarm-redis
-      - alarm-rabbitmq
-    networks:
-      - lalala-network
-
   alarm-mysql:
     image: mysql:8.2.0
     restart: always
     ports:
       - 28100:3306
     environment:
       MYSQL_ROOT_PASSWORD: admin
-      MYSQL_DATABASE: user
+      MYSQL_DATABASE: alarm
       TZ: Asia/Seoul
     command:
       - --character-set-server=utf8mb4

src/backend/alarm-server/scripts/start_docker.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+script_dir="$(cd "$(dirname "$0")" && pwd)"
+
+cd "$script_dir"
+
+cd ..
+
+docker-compose down
+docker-compose up -d

src/backend/alarm-server/scripts/start_docker_hub.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+script_dir="$(cd "$(dirname "$0")" && pwd)"
+
+cd "$script_dir"
+
+cd ..
+
+docker-compose -f docker-compose-hub.yml down
+docker-compose -f docker-compose-hub.yml up -d --build

src/backend/alarm-server/scripts/start_docker_local.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+script_dir="$(cd "$(dirname "$0")" && pwd)"
+
+cd "$script_dir"
+
+cd ..
+
+docker-compose -f docker-compose-local.yml down
+docker-compose -f docker-compose-local.yml up -d

src/backend/alarm-server/scripts/start_docker_local_build.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+script_dir="$(cd "$(dirname "$0")" && pwd)"
+
+cd "$script_dir"
+
+cd ..
+
+docker-compose -f docker-compose-local.yml down
+docker-compose -f docker-compose-local.yml up -d --build

src/backend/alarm-server/settings.gradle

@@ -1,3 +1,15 @@
 rootProject.name = 'alarm'
 
 include 'alarm-api'
+
+include ':common-module'
+project(':common-module').projectDir = file('../common-module')
+
+include ':common-module:common'
+project(':common-module:common').projectDir = file('../common-module/common')
+
+include ':common-module:common-mvc'
+project(':common-module:common-mvc').projectDir = file('../common-module/common-mvc')
+
+include ':common-module:common-reactive'
+project(':common-module:common-reactive').projectDir = file('../common-module/common-reactive')

src/backend/auth-server/build.gradle

@@ -16,7 +16,8 @@ repositories {
 }
 
 dependencies {
-	implementation project(":common-module")
+	implementation project(":common-module:common")
+	implementation project(":common-module:common-mvc")
 
 	// Spring MVC
 	implementation "org.springframework.boot:spring-boot-starter-web"

src/backend/auth-server/docker-compose-local.yml

@@ -0,0 +1,44 @@
+version: "3.9"
+services:
+  auth-app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    restart: always
+    ports:
+      - 10000:10000
+    environment:
+      SPRING_DATASOURCE_URL: jdbc:mysql://user-mysql:3306/lalala?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&serverTimezone=Asia/Seoul
+      SPRING_DATASOURCE_USERNAME: root
+      SPRING_DATASOURCE_PASSWORD: admin
+      SPRING_DATASOURCE_DRIVER-CLASS-NAME: com.mysql.cj.jdbc.Driver
+
+      SPRING_JPA_PROPERTIES_DIALECT: org.hibernate.dialect.MySQLDialect
+
+      SPRING_DATA_REDIS_HOST: auth-redis
+      SPRING_DATA_REDIS_PORT: 6379
+
+      SPRING_KAFKA_BOOTSTRAP-SERVERS: Kafka00Service:9092,Kafka01Service:9092,Kafka02Service:9092
+
+      EUREKA_INSTANCE_HOSTNAME: auth-app
+      EUREKA_CLIENT_SERVICE-URL_DEFAULTZONE: http://discovery-app:34100/eureka
+
+      PASSPORT_ALGORITHM: HmacSHA256
+      PASSPORT_KEY: SECRET_KEY
+
+      MANAGEMENT_ZIPKIN_TRACING_ENDPOINT: http://infra-zipkin:9411/api/v2/spans
+    depends_on:
+      - auth-redis
+    networks:
+      - default
+      - lalala-network
+
+  auth-redis:
+    image: redis:7.0
+    ports:
+      - 10100:6379
+
+networks:
+  lalala-network:
+    driver: bridge
+    external: true