application.yml update, spring.config.import.prod

conf/evps-comm-server.yml

@@ -1,6 +1,3 @@
-spring:
-  profiles:
-    active: dev
 server:
   port: 9871
 
@@ -13,27 +10,11 @@ application:
 
 logging:
   file:
-    path: ${user.home}/logs/evps-comm-server/
+    path: ${user.dir}/logs/evps-comm-server-prod/
 
----
-spring:
-  config:
-    activate:
-      on-profile: prod
-  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
+#spring:
+#  datasource:
+#    hikari:
+      #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:4006,10.4.4.21:4006/cvim_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&connectTimeout=3000&socketTimeout=6000&failoverEnable=true&failoverReadOnly=false
       #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
-      #jdbc-url: jdbc:mariadb://10.4.4.30:4006/cvim_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&useServerPrepStmts=true
-
-      #jdbc-url: jdbc:mariadb://10.4.4.20:4006,10.4.4.21:4006/cvim_db?useServerPrepStmts=true&characterEncoding=UTF-8&serverTimezone=Asia/Seoul
-      #jdbc-url: jdbc:mariadb://10.4.4.20:4006,10.4.4.21:4006/cvim_db?useServerPrepStmts=true&characterEncoding=UTF-8&serverTimezone=Asia/Seoul
-      #jdbc-url: jdbc:mariadb://10.4.4.20:3306,10.4.4.21:3306/cvim_db?failoverEnable=true
-
-      ### 맥스트케일
-      #jjdbc-url: dbc:mariadb://10.4.4.20:4006,10.4.4.21:4006/cvim_db?useServerPrepStmts=true&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&failoverEnable=true
-      username: cvim
-      password: 44Klctest$$

evps-comm-server/src/main/java/com/evps/comm/server/config/DatabaseConfig.java

@@ -32,12 +32,15 @@ public class DatabaseConfig {
 
     @Value("${spring.datasource.hikari.mapper-locations:classpath:mybatis/mapper/**/*.xml}")
     String mapperLocations;
+    @Value("${spring.datasource.hikari.jdbc-url}")
+    String jdbcUrl;
 
     @PostConstruct
     private void init() {
         if (this.mapperLocations.trim().isEmpty()) {
             this.mapperLocations = "classpath:mybatis/mapper/**/*.xml";
         }
+        log.info("        jdbcUrl: {}", this.jdbcUrl);
         log.info("mapperLocations: {}", this.mapperLocations);
     }
 

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

@@ -3,9 +3,9 @@ spring:
     name: evps-comm-server
   profiles:
     active: prod
-  config:
-    import:
-      - optional:file:${user.dir}/conf/evps-comm-server.yml
+#  config:
+#    import:
+#      - optional:file:${user.dir}/conf/evps-comm-server.yml
   main:
 #    web-application-type: none
     log-startup-info: true
@@ -111,32 +111,11 @@ spring:
     activate:
       on-profile: prod
     import:
-      - optional:file:${user.dir}/conf/evps-comm-server-prod.yml
+      - optional:file:${user.dir}/conf/evps-comm-server.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
-      #jdbc-url: jdbc:mariadb://10.4.4.30:4006/cvim_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&useServerPrepStmts=true
-
-      #jdbc-url: jdbc:mariadb://10.4.4.20:4006,10.4.4.21:4006/cvim_db?useServerPrepStmts=true&characterEncoding=UTF-8&serverTimezone=Asia/Seoul
-      #jdbc-url: jdbc:mariadb://10.4.4.20:4006,10.4.4.21:4006/cvim_db?useServerPrepStmts=true&characterEncoding=UTF-8&serverTimezone=Asia/Seoul
-      #jdbc-url: jdbc:mariadb://10.4.4.20:3306,10.4.4.21:3306/cvim_db?failoverEnable=true
-
-      ### 맥스트케일
-      #jjdbc-url: dbc:mariadb://10.4.4.20:4006,10.4.4.21:4006/cvim_db?useServerPrepStmts=true&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&failoverEnable=true
+      jdbc-url: jdbc:mariadb:failover://10.4.4.20:4006,10.4.4.21:4006/cvim_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&connectTimeout=3000&socketTimeout=6000&failoverEnable=true&failoverReadOnly=false
+      #jdbc-url: jdbc:mariadb://10.4.4.20:3306/cvim_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul
       username: cvim
       password: 44Klctest$$
-
-#spring:
-#  datasource:
-#    hikari:
-#      jdbc-url: jdbc:mariadb://10.4.4.20:4006,10.4.4.21:4006/cvim_db?failoverEnable=true&useServerPrepStmts=true&characterEncoding=UTF-8&serverTimezone=Asia/Seoul
-#      driver-class-name: org.mariadb.jdbc.Driver
-#      connectionTimeout: 3000
-#      validationTimeout: 1000
-#      maximumPoolSize: 10
-#      initializationFailTimeout: 0