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

conf/tsi-api-server.yml

@@ -1,7 +1,3 @@
-spring:
-  profiles:
-    active: dev
-
 server:
   port: 8444
 
@@ -11,3 +7,9 @@ application:
 logging:
   file:
     path: ${user.home}/logs/tsi-api-server/
+
+#spring:
+#  datasource:
+#    hikari:
+#      driver-class-name: org.mariadb.jdbc.Driver
+#      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

src/main/java/com/tsi/api/server/mybatis/MybatisConfig.java

@@ -1,5 +1,6 @@
 package com.tsi.api.server.mybatis;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
@@ -18,15 +19,23 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 import javax.annotation.PostConstruct;
 import javax.sql.DataSource;
 
+@Slf4j
 @Configuration
 @EnableTransactionManagement
 public class MybatisConfig {
 
     @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);
     }
 
     @Primary

src/main/resources/application.yml

@@ -3,9 +3,9 @@ spring:
     name: tsi-api-server
   profiles:
     active: prod
-  config:
-    import:
-      - optional:file:${user.dir}/conf/tsi-api-server.yml
+#  config:
+#    import:
+#      - optional:file:${user.dir}/conf/tsi-api-server.yml
   datasource:
     hikari:
       platform: mariadb
@@ -51,10 +51,11 @@ spring:
     activate:
       on-profile: prod
     import:
-      - optional:file:${user.dir}/conf/tsi-api-server-prod.yml
+      - optional:file:${user.dir}/conf/tsi-api-server.yml
   datasource:
     hikari:
-      jdbc-url: jdbc:mariadb://10.4.4.20:3306/cvim_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul
+      #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
 
 ---
 spring: