Commit @b822f7b3ca46ab420edabd3e8417ba1522f42b29

장동신 2024-09-19

DB 설정 수정 - 테스트

@b822f7b3ca46ab420edabd3e8417ba1522f42b29

3037dfa

b822f7b

src/main/java/com/munjaon/server/config/DataSourceConfig.java

--- src/main/java/com/munjaon/server/config/DataSourceConfig.java

+++ src/main/java/com/munjaon/server/config/DataSourceConfig.java


 
     @Primary
     @Bean(name = "datasource")
-    @ConfigurationProperties(prefix = "spring.datasource.server")
+    @ConfigurationProperties(prefix = "spring.datasource.hikari")
     public DataSource dataSource() {
         return DataSourceBuilder.create().type(HikariDataSource.class).build();
     }

3037dfa

b822f7b

src/main/resources/dev/application-dev.yml

--- src/main/resources/dev/application-dev.yml

+++ src/main/resources/dev/application-dev.yml


 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

3037dfa

b822f7b

src/main/resources/local/application-local.yml

--- src/main/resources/local/application-local.yml

+++ src/main/resources/local/application-local.yml


 spring:
   datasource:
-    server:
+    hikari:
       driver-class-name: org.mariadb.jdbc.Driver
       url: jdbc:mariadb://localhost:3306/mjon
       jdbc-url: jdbc:mariadb://localhost:3306/mjon

3037dfa

b822f7b

src/main/resources/prod/application-prod.yml

--- src/main/resources/prod/application-prod.yml

+++ src/main/resources/prod/application-prod.yml


 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

Add a comment

Open 0
Closed 0

List

...	...	@@ -27,7 +27,7 @@
27	27
28	28	@Primary
29	29	@Bean(name = "datasource")
30		- @ConfigurationProperties(prefix = "spring.datasource.server")
	30	+ @ConfigurationProperties(prefix = "spring.datasource.hikari")
31	31	public DataSource dataSource() {
32	32	return DataSourceBuilder.create().type(HikariDataSource.class).build();
33	33	}

...	...	@@ -1,10 +1,8 @@
1	1	spring:
2	2	datasource:
3		- server:
	3	+ hikari:
4	4	driver-class-name: org.mariadb.jdbc.Driver
5		- url: jdbc:mariadb://192.168.0.125:3306/mjon_agent_back
6	5	jdbc-url: jdbc:mariadb://192.168.0.125:3306/mjon_agent_back
7		-# jdbc-url: jdbc:mariadb://119.193.215.98:3306/mjon_agent_back
8	6	username: mjonUr_agent
9	7	password: mjagent123$
10	8	connectionTimeout: 30000

...	...	@@ -1,6 +1,6 @@
1	1	spring:
2	2	datasource:
3		- server:
	3	+ hikari:
4	4	driver-class-name: org.mariadb.jdbc.Driver
5	5	url: jdbc:mariadb://localhost:3306/mjon
6	6	jdbc-url: jdbc:mariadb://localhost:3306/mjon

Delete comment