diff --git a/.DS_Store b/.DS_Store index 0537f281..9822ee34 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/docker-compose-v1.yml b/docker-compose-v1.yml deleted file mode 100644 index acdc3ee5..00000000 --- a/docker-compose-v1.yml +++ /dev/null @@ -1,105 +0,0 @@ -version: '3.8' -services: - myapp: - build: - context: . - dockerfile: Dockerfile - environment: - SPRING_DATASOURCE_URL: ${DB_URL} - SPRING_DATASOURCE_USERNAME: ${DB_USER} - SPRING_DATASOURCE_PASSWORD: ${DB_PASSWORD} - JWT_SECRET_KEY: ${JWT_SECRET_KEY} - KAKAO_CLIENT_ID: ${KAKAO_CLIENT_ID} - KAKAO_CLIENT_SECRET: ${KAKAO_CLIENT_SECRET} - NAVER_CLIENT_ID: ${NAVER_CLIENT_ID} - NAVER_CLIENT_SECRET: ${NAVER_CLIENT_SECRET} - depends_on: - db: - condition: service_healthy - redis: - condition: service_healthy - ports: - - "8080:8080" - - db: - image: mysql:8.0 - container_name: mysql - environment: - MYSQL_ROOT_PASSWORD: ${DB_PASSWORD} - MYSQL_DATABASE: ${DB_DATABASE} - ports: - - "3306:3306" - healthcheck: - test: [ "CMD-SHELL", "mysqladmin ping -h localhost -u root -p1234 && sleep 5" ] - interval: 5s - retries: 10 - volumes: - - mysql-data:/var/lib/mysql - - redis: - image: redis:latest - container_name: redis - ports: - - "6379:6379" - healthcheck: - test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ] - interval: 5s - retries: 10 - - rabbitmq: - image: rabbitmq:3-management - container_name: rabbitmq - ports: - - "5672:5672" - - "15672:15672" - environment: - RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER} - RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD} - - es: - build: - context: ./ - dockerfile: Dockerfile.elasticsearch - container_name: es - environment: - - discovery.type=single-node - healthcheck: - test: [ "CMD", "curl", "-f", "http://localhost:9200/_cluster/health" ] - interval: 10s - retries: 5 - start_period: 30s - timeout: 10s - volumes: - - es-data:/usr/share/elasticsearch/data - ports: - - "9200:9200" - - "9300:9300" - - kibana: - build: - context: ./ - dockerfile: Dockerfile.kibana - container_name: kibana - ports: - - "5601:5601" - depends_on: - - es - - logstash: - build: - context: ./ - dockerfile: Dockerfile.logstash - container_name: logstash - volumes: - - ./logstash/pipeline:/usr/share/logstash/pipeline - ports: - - "9600:9600" - - "5044:5044" - depends_on: - - es - -volumes: - mysql-data: - driver: local - es-data: - driver: local \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 86f893dd..7c38753a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,29 +1,5 @@ version: '3.8' services: - redis: - image: redis:latest - container_name: redis - ports: - - "6379:6379" - healthcheck: - test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ] - interval: 5s - retries: 10 - - rabbitmq: - build: - context: ./ - dockerfile: Dockerfile.rabbitmq - image: rabbitmq:3-management - container_name: rabbitmq - ports: - - "5672:5672" - - "15672:15672" - - "61613:61613" - environment: - RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER} - RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD} - es: build: context: ./ @@ -76,7 +52,5 @@ services: - es volumes: - mysql-data: - driver: local es-data: driver: local \ No newline at end of file diff --git a/src/main/java/org/example/tablenow/global/config/RedissonConfig.java b/src/main/java/org/example/tablenow/global/config/RedissonConfig.java index 9c9eeb03..998b2c79 100644 --- a/src/main/java/org/example/tablenow/global/config/RedissonConfig.java +++ b/src/main/java/org/example/tablenow/global/config/RedissonConfig.java @@ -3,18 +3,25 @@ import org.redisson.Redisson; import org.redisson.api.RedissonClient; import org.redisson.config.Config; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration public class RedissonConfig { + @Value("${spring.data.redis.host}") + private String redisHost; + + @Value("${spring.data.redis.port}") + private String redisPort; + private static final String REDISSON_HOST_PREFIX = "redis://"; @Bean public RedissonClient redissonClient() { Config config = new Config(); - config.useSingleServer().setAddress(REDISSON_HOST_PREFIX + "localhost:6379"); + config.useSingleServer().setAddress(REDISSON_HOST_PREFIX + redisHost + ":" + redisPort); return Redisson.create(config); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c3f50e0f..3b8319bd 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,14 +1,19 @@ spring: application: name: table-now - profiles: - active: local thymeleaf: cache: false config: import: optional:file:.env[.properties] + batch: + job: + enabled: false + jdbc: + initialize-schema: always #배포 후에는 never로 수정 권장 + schema: classpath:org/springframework/batch/core/schema-mysql.sql + security: oauth2: client: @@ -54,6 +59,54 @@ spring: - profile_image - mobile + datasource-meta: + driver-class-name: com.mysql.cj.jdbc.Driver + jdbc-url: jdbc:mysql://${AWS_RDS_HOST}:${AWS_RDS_PORT}/${AWS_RDS_META_DB_NAME} + username: ${AWS_RDS_USERNAME} + password: ${AWS_RDS_PASSWORD} + + datasource-data: + driver-class-name: com.mysql.cj.jdbc.Driver + jdbc-url: jdbc:mysql://${AWS_RDS_HOST}:${AWS_RDS_PORT}/${AWS_RDS_DB_NAME} + username: ${AWS_RDS_USERNAME} + password: ${AWS_RDS_PASSWORD} + + jpa: + hibernate: + ddl-auto: none + properties: + hibernate: + show_sql: true + format_sql: true + use_sql_comments: true + dialect: org.hibernate.dialect.MySQLDialect + + jpa-data: + hibernate: + ddl-auto: none + show-sql: true + + data: + redis: + host: ${REDIS_HOST} + port: ${REDIS_PORT} + ssl: + enabled: true + + elasticsearch: + uris: ${ELASTICSEARCH_URIS} + + cache: + type: redis + + rabbitmq: + host: ${RABBITMQ_HOST} + port: ${RABBITMQ_PORT} + username: ${RABBITMQ_USER} + password: ${RABBITMQ_PASSWORD} + ssl: + enabled: true + jwt: secret: key: ${JWT_SECRET_KEY} @@ -76,4 +129,7 @@ cloud: oauth: kakao: admin-key: ${KAKAO_ADMIN_KEY} - unlink-uri: https://kapi.kakao.com/v1/user/unlink \ No newline at end of file + unlink-uri: https://kapi.kakao.com/v1/user/unlink + +chat: + broker: rabbit # or simple \ No newline at end of file