From ee932c2a5cae7aab7dfe7da238cbbba5ff5f796a Mon Sep 17 00:00:00 2001
From: nayonsoso <panda0329@naver.com>
Date: Sun, 8 Dec 2024 04:26:33 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20=EA=B4=80=EC=8B=AC=EC=82=AC=20?=
 =?UTF-8?q?=EB=B3=84=20yml=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-local.yml | 33 -------------------
 src/main/resources/application-test.yml  | 29 -----------------
 src/main/resources/application.yml       | 41 +++---------------------
 3 files changed, 5 insertions(+), 98 deletions(-)
 delete mode 100644 src/main/resources/application-local.yml
 delete mode 100644 src/main/resources/application-test.yml

diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
deleted file mode 100644
index f0baec690..000000000
--- a/src/main/resources/application-local.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-spring:
-  config:
-    activate:
-      on-profile: local
-
-  jpa:
-    hibernate:
-      ddl-auto: create
-    generate-ddl: true
-    show-sql: true
-    database: mysql
-    defer-datasource-initialization: true
-    properties:
-      hibernate:
-        format_sql: true
-
-  sql:
-    init:
-      mode: always
-
-  datasource:
-    driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost/solid_connection?serverTimezone=Asia/Seoul&characterEncoding=UTF-8
-    username: solid_connection_local_username
-    password: solid_connection_local_password
-
-  data:
-    redis:
-      host: localhost
-      port: 6379
-
-kakao:
-  redirect_uri: "http://localhost:8080/auth/kakao"
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
deleted file mode 100644
index bf25bb62f..000000000
--- a/src/main/resources/application-test.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-spring:
-  config:
-    activate:
-      on-profile: test
-
-  jpa:
-    database-platform: org.hibernate.dialect.H2Dialect
-    hibernate:
-      ddl-auto: create
-    generate-ddl: true
-    show-sql: true
-    database: mysql
-    defer-datasource-initialization: true
-    properties:
-      hibernate:
-        format_sql: true
-
-  datasource:
-    url: jdbc:h2:mem:testdb
-    username: sa
-    password:
-
-  data:
-    redis:
-      host: localhost
-      port: 6379
-
-kakao:
-  redirect_uri: "http://localhost:8080/auth/kakao"
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b114af84e..a644c7e9f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,15 +1,9 @@
 spring:
-  profiles:
-    group:
-      prod:
-        - prod
-        - secret
-      local:
-        - local
-        - secret
-      test:
-        - test
-        - secret
+  config:
+    import:
+      - classpath:/secret/application-cloud.yml
+      - classpath:/secret/application-db.yml
+      - classpath:/secret/application-variable.yml
 
   tomcat:
     threads:
@@ -20,35 +14,10 @@ spring:
       max-file-size: 10MB
       max-request-size: 10MB
 
-  jpa:
-    hibernate:
-      ddl-auto: none
-    generate-ddl: false
-    show-sql: false
-    database: mysql
-    defer-datasource-initialization: true
-
   mvc:
     path match:
       matching-strategy: ANT_PATH_MATCHER
 
-  sql:
-    init:
-      mode: never
-
-jwt:
-  secret:
-    aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee
-
-kakao:
-  token_url: "https://kauth.kakao.com/oauth/token"
-  user_info_url: "https://kapi.kakao.com/v2/user/me"
-
-view:
-  count:
-    scheduling:
-      delay: 3000
-
 management:
   endpoints:
     web: