+ * description : Datasource 설정 - spring.datasource.hikari.secondary
+ * - 조건 : spring.datasource.hikari.secondary.username 이 있는 경우
+ * 실제 필요한 경우만 커넥션을 점유하도록
+ * LazyConnectionDataSourceProxy 사용
+ * 일반 Datasource 사용시
+ * - Spring은 트랜잭션에 진입시 데이타 소스의 커넥션을 get
+ * - ehcache, hibernate 영속성 컨택슽트 1차캐시 등에도 커넥션을 get
+ * - multi-datasource 에서 트랜잭션 진입 이후 datasource 분기 불가
+ * packageName : kr.xit.core.spring.config.db
+ * fileName : SecondaryMybatisConfig
+ * author : julim
+ * date : 2023-04-28
+ * ======================================================================
+ * 변경일 변경자 변경 내용
+ * ----------------------------------------------------------------------
+ * 2023-04-28 julim 최초 생성
+ * 2023-10-30 julim dynamic 설정 적용
+ *
+ *
+ * @see SecondaryMybatisConfig
+ */
+@Configuration
+@ConditionalOnProperty(value = "spring.datasource.hikari.secondary.username")
+public class SecondaryDatasourceConfig {
+ @Bean(name = "secondaryHikariConfig")
+ @ConfigurationProperties(prefix = "spring.datasource.hikari.secondary")
+ public HikariConfig secondaryHikariConfig() {
+ // HikariConfig hikariConfig = new HikariConfig("spring.datasource.hikari");
+ // hikariConfig.setAutoCommit(false);
+ // return hikariConfig;
+ return new HikariConfig();
+ }
+
+ @Bean(name = Constants.SECONDARY_DATA_SOURCE)
+ public DataSource secondaryDataSource() {
+ //return new LazyConnectionDataSourceProxy(new HikariDataSource(secondaryHikariConfig()));
+ return new HikariDataSource(secondaryHikariConfig());
+ }
+}
diff --git a/mens-batch/src/main/java/kr/xit/core/spring/config/support/SecondaryMybatisConfig.java b/mens-batch/src/main/java/kr/xit/core/spring/config/db/SecondaryMybatisConfig.java
similarity index 71%
rename from mens-batch/src/main/java/kr/xit/core/spring/config/support/SecondaryMybatisConfig.java
rename to mens-batch/src/main/java/kr/xit/core/spring/config/db/SecondaryMybatisConfig.java
index 808e8f0..db73dc4 100644
--- a/mens-batch/src/main/java/kr/xit/core/spring/config/support/SecondaryMybatisConfig.java
+++ b/mens-batch/src/main/java/kr/xit/core/spring/config/db/SecondaryMybatisConfig.java
@@ -1,54 +1,43 @@
-package kr.xit.core.spring.config.support;
+package kr.xit.core.spring.config.db;
+import javax.sql.DataSource;
import kr.xit.core.consts.Constants;
-import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.context.annotation.Primary;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.jdbc.support.lob.DefaultLobHandler;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import javax.sql.DataSource;
-
-//FIXME :: 재설정이 필요한 경우 해당프로젝트에 동일한 파일로 재정의 하여 사용
/**
*
- * description : Mybatis 설정 - FIXME:: @DependsOn(value = {"dataSource"}) loading
- * - 조건 : @DependsOn(value = {"dataSource"})
- * packageName : kr.xit.core.spring.config.support
- * fileName : MybatisConfig
+ * description : Mybatis 설정 - spring.datasource.hikari.secondary
+ * - 조건 : spring.datasource.hikari.secondary.username이 있는 경우 loading
+ * packageName : kr.xit.core.spring.config.db
+ * fileName : SecondaryMybatisConfig
* author : julim
* date : 2023-04-28
* ======================================================================
* 변경일 변경자 변경 내용
* ----------------------------------------------------------------------
* 2023-04-28 julim 최초 생성
+ * 2023-10-30 julim dynamic 설정 적용
*
*
- * @see DatasourceConfig
+ * @see SecondaryDatasourceConfig
*/
-@Slf4j
@Configuration
+@ConditionalOnProperty(value = "spring.datasource.hikari.secondary.username")
@MapperScan(
basePackages = {"kr.xit.biz.sms.mapper"},
sqlSessionFactoryRef = Constants.SECONDARY_SQL_SESSION
)
public class SecondaryMybatisConfig {
-
static final String MYBATIS_CONFIG_FILE = "classpath:/egovframework/mapper/mapper-config.xml";
-
@Bean(name = Constants.SECONDARY_SQL_SESSION)
public SqlSessionFactory secondarySqlSession(@Qualifier(Constants.SECONDARY_DATA_SOURCE) DataSource dataSource) throws Exception {
PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
@@ -59,6 +48,7 @@ public class SecondaryMybatisConfig {
return sessionFactory.getObject();
}
+ //@ConditionalOnProperty(value = "spring.datasource.hikari.secondary")
@Bean(name = "secondarySqlSessionTemplate")
public SqlSessionTemplate secondarySqlSessionTemplate(@Qualifier(Constants.SECONDARY_SQL_SESSION) SqlSessionFactory sqlSessionFactory) {
return new SqlSessionTemplate(sqlSessionFactory);
diff --git a/mens-batch/src/main/java/kr/xit/core/spring/config/support/TransactionConfig.java b/mens-batch/src/main/java/kr/xit/core/spring/config/db/TransactionConfig.java
similarity index 61%
rename from mens-batch/src/main/java/kr/xit/core/spring/config/support/TransactionConfig.java
rename to mens-batch/src/main/java/kr/xit/core/spring/config/db/TransactionConfig.java
index 9ab3c26..84b83b7 100644
--- a/mens-batch/src/main/java/kr/xit/core/spring/config/support/TransactionConfig.java
+++ b/mens-batch/src/main/java/kr/xit/core/spring/config/db/TransactionConfig.java
@@ -1,8 +1,10 @@
-package kr.xit.core.spring.config.support;
+package kr.xit.core.spring.config.db;
+import javax.sql.DataSource;
import kr.xit.core.consts.Constants;
-import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
@@ -11,15 +13,13 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.annotation.EnableTransactionManagement;
-import javax.sql.DataSource;
-
//FIXME :: 재설정이 필요한 경우 해당프로젝트에 동일한 파일로 재정의 하여 사용
/**
*
- * description : Mybatis 설정 - FIXME:: @DependsOn(value = {"dataSource"}) loading
- * - 조건 : @DependsOn(value = {"dataSource"})
- * packageName : kr.xit.core.spring.config.support
+ * description : Mybatis 설정
+ * - single DB or multi DB 설정에 따라 transaction 설정 적용
+ * packageName : kr.xit.core.spring.config.db
* fileName : MybatisConfig
* author : julim
* date : 2023-04-28
@@ -27,33 +27,49 @@ import javax.sql.DataSource;
* 변경일 변경자 변경 내용
* ----------------------------------------------------------------------
* 2023-04-28 julim 최초 생성
+ * 2023-10-30 julim dynamic 설정 적용
*
*