update application.yml logic

evps-comm-server/src/main/resources/application.yml

@@ -1,11 +1,11 @@
 spring:
+  application:
+    name: evps-comm-server
   profiles:
     active: prod
   config:
-      import:
-        - optional:file:${user.dir}/conf/evps-comm-server.yml
-  application:
-    name: evps-comm-server
+    import:
+      - optional:file:${user.dir}/conf/evps-comm-server.yml
   main:
 #    web-application-type: none
     log-startup-info: true
@@ -93,6 +93,8 @@ spring:
   config:
     activate:
       on-profile: dev
+    import:
+      - optional:file:${user.dir}/conf/evps-comm-server-dev.yml
   datasource:
     hikari:
       driver-class-name: org.mariadb.jdbc.Driver
@@ -108,10 +110,13 @@ spring:
   config:
     activate:
       on-profile: prod
+    import:
+      - optional:file:${user.dir}/conf/evps-comm-server-prod.yml
   datasource:
     hikari:
       driver-class-name: org.mariadb.jdbc.Driver
       jdbc-url: jdbc:mariadb://10.4.4.20:3306/cvim_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul
+      #jdbc-url: jdbc:mariadb:failover://10.4.4.20:3306,10.4.4.21:3306/cvim_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&connectTimeout=3000&socketTimeout=6000&failoverEnable=true
       #jdbc-url: jdbc:mariadb:replication://10.4.4.20:3306,10.4.4.21:3306/cvim_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&useServerPrepStmts=true&failoverEnable=true
       #jdbc-url: jdbc:mariadb://10.4.4.20:3306,10.4.4.21:3306/cvim_db?useServerPrepStmts=true&characterEncoding=UTF-8&serverTimezone=Asia/Seoul
       # FOR MaxScale