Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
105 changes: 0 additions & 105 deletions docker-compose-v1.yml

This file was deleted.

26 changes: 0 additions & 26 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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: ./
Expand Down Expand Up @@ -76,7 +52,5 @@ services:
- es

volumes:
mysql-data:
driver: local
es-data:
driver: local
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
62 changes: 59 additions & 3 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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}
Expand All @@ -76,4 +129,7 @@ cloud:
oauth:
kakao:
admin-key: ${KAKAO_ADMIN_KEY}
unlink-uri: https://kapi.kakao.com/v1/user/unlink
unlink-uri: https://kapi.kakao.com/v1/user/unlink

chat:
broker: rabbit # or simple