From b822f7b3ca46ab420edabd3e8417ba1522f42b29 Mon Sep 17 00:00:00 2001 From: jangdongsin Date: Thu, 19 Sep 2024 19:59:20 +0900 Subject: [PATCH] =?UTF-8?q?DB=20=EC=84=A4=EC=A0=95=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?-=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/munjaon/server/config/DataSourceConfig.java | 2 +- src/main/resources/dev/application-dev.yml | 4 +--- src/main/resources/local/application-local.yml | 2 +- src/main/resources/prod/application-prod.yml | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/munjaon/server/config/DataSourceConfig.java b/src/main/java/com/munjaon/server/config/DataSourceConfig.java index c4f3788..8bbaefe 100644 --- a/src/main/java/com/munjaon/server/config/DataSourceConfig.java +++ b/src/main/java/com/munjaon/server/config/DataSourceConfig.java @@ -27,7 +27,7 @@ public class DataSourceConfig { @Primary @Bean(name = "datasource") - @ConfigurationProperties(prefix = "spring.datasource.server") + @ConfigurationProperties(prefix = "spring.datasource.hikari") public DataSource dataSource() { return DataSourceBuilder.create().type(HikariDataSource.class).build(); } diff --git a/src/main/resources/dev/application-dev.yml b/src/main/resources/dev/application-dev.yml index e06b1ce..8927d3c 100644 --- a/src/main/resources/dev/application-dev.yml +++ b/src/main/resources/dev/application-dev.yml @@ -1,10 +1,8 @@ spring: datasource: - server: + hikari: driver-class-name: org.mariadb.jdbc.Driver - url: jdbc:mariadb://192.168.0.125:3306/mjon_agent_back jdbc-url: jdbc:mariadb://192.168.0.125:3306/mjon_agent_back -# jdbc-url: jdbc:mariadb://119.193.215.98:3306/mjon_agent_back username: mjonUr_agent password: mjagent123$ connectionTimeout: 30000 diff --git a/src/main/resources/local/application-local.yml b/src/main/resources/local/application-local.yml index 8f828e2..bb88be2 100644 --- a/src/main/resources/local/application-local.yml +++ b/src/main/resources/local/application-local.yml @@ -1,6 +1,6 @@ spring: datasource: - server: + hikari: driver-class-name: org.mariadb.jdbc.Driver url: jdbc:mariadb://localhost:3306/mjon jdbc-url: jdbc:mariadb://localhost:3306/mjon diff --git a/src/main/resources/prod/application-prod.yml b/src/main/resources/prod/application-prod.yml index 8e67f4b..3c68e1d 100644 --- a/src/main/resources/prod/application-prod.yml +++ b/src/main/resources/prod/application-prod.yml @@ -1,6 +1,6 @@ spring: datasource: - server: + hikari: driver-class-name: org.mariadb.jdbc.Driver url: jdbc:mariadb://119.193.215.98:3306/mjon_agent jdbc-url: jdbc:mariadb://119.193.215.98:3306/mjon_agent