Browse Source

update application.yml logic

shjung 3 weeks ago
parent
commit
5e59ef60e0
2 changed files with 6 additions and 2 deletions
  1. BIN
      .DS_Store
  2. 6 2
      src/main/resources/application.yml

BIN
.DS_Store


+ 6 - 2
src/main/resources/application.yml

@@ -1,11 +1,11 @@
 spring:
+  application:
+    name: tsi-app-server
   profiles:
     active: prod
   config:
     import:
       - optional:file:${user.dir}/conf/tsi-app-server.yml
-  application:
-    name: tsi-app-server
   datasource:
     hikari:
       platform: mariadb
@@ -49,6 +49,8 @@ spring:
   config:
     activate:
       on-profile: prod
+    import:
+      - optional:file:${user.dir}/conf/tsi-app-server-prod.yml
   datasource:
     hikari:
       jdbc-url: jdbc:mariadb://10.4.4.20:3306/cvim_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul
@@ -63,6 +65,8 @@ spring:
   config:
     activate:
       on-profile: dev
+    import:
+      - optional:file:${user.dir}/conf/tsi-app-server-dev.yml
   datasource:
     hikari:
       jdbc-url: jdbc:mariadb://115.91.94.42:13306/cvim_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul