Skip to content

Commit 6df4aab

Browse files
committed
[refactor/#83] 모든 환경에 datasource 설정 적용
1 parent 0d7480b commit 6df4aab

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

src/main/resources/application-datasource.yml

+1-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@ spring:
22
config:
33
activate:
44
on-profile: "datasource"
5-
datasource:
6-
url: jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
7-
driver-class-name: com.mysql.cj.jdbc.Driver
8-
password: ${MYSQL_PASSWORD}
9-
username: ${MYSQL_USERNAME}
10-
hikari:
11-
maximum-pool-size: 10 # default
12-
connection-timeout: 3000 # 30 seconds in milliseconds
13-
keepalive-time: 600000 # 5 minutes in milliseconds
5+
146
jpa:
157
properties:
168
hibernate:

src/main/resources/application-local.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,15 @@ spring:
1111
highlight_sql: true
1212
hibernate:
1313
ddl-auto: update
14-
14+
datasource:
15+
url: jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
16+
driver-class-name: com.mysql.cj.jdbc.Driver
17+
password: ${MYSQL_PASSWORD}
18+
username: ${MYSQL_USERNAME}
19+
hikari:
20+
maximum-pool-size: 10 # default
21+
connection-timeout: 3000 # 30 seconds in milliseconds
22+
keepalive-time: 600000 # 5 minutes in milliseconds
1523
swagger:
1624
servers:
1725
- url: http://localhost:8080

src/main/resources/application.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ spring:
33
active: ${profile}
44
group:
55
local: "local, datasource"
6-
dev: "dev"
7-
prod: "prod"
6+
dev: "dev, datasource"
7+
prod: "prod, datasource"
88
include:
99
- aws
1010
- security

0 commit comments

Comments
 (0)