Skip to content

Commit 72af904

Browse files
committed
hotfix: FcmConfig를 test 환경에서 임시 제외 및 ComponentScan 범위 수정
1 parent 00db8c8 commit 72af904

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

apis/src/main/kotlin/org/yapp/apis/ApisApplication.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import org.springframework.boot.runApplication
66
import org.springframework.context.annotation.ComponentScan
77

88
@SpringBootApplication(
9-
exclude = [JpaRepositoriesAutoConfiguration::class] // infra 모듈에서 @EnableJpaRepositories로 명시적으로 설정하여 관리
9+
exclude = [JpaRepositoriesAutoConfiguration::class] // infra 모듈에서 @EnableJpaRepositories로 명시적으로 설정하여 수동 관리
1010
)
1111
@ComponentScan(basePackages = ["org.yapp"])
1212
class ApisApplication

batch/src/main/kotlin/org/yapp/batch/BatchApplication.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@ import org.springframework.boot.runApplication
66
import org.springframework.context.annotation.ComponentScan
77

88
@SpringBootApplication(
9-
scanBasePackages = [
10-
"org.yapp.batch",
11-
"org.yapp.infra",
12-
"org.yapp.domain",
13-
"org.yapp.globalutils"
14-
]
9+
exclude = [JpaRepositoriesAutoConfiguration::class] // infra 모듈에서 @EnableJpaRepositories로 명시적으로 설정하여 수동 관리
1510
)
11+
@ComponentScan(basePackages = ["org.yapp"])
1612
class BatchApplication
1713

1814
fun main(args: Array<String>) {

batch/src/main/kotlin/org/yapp/batch/config/FcmConfig.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import com.google.firebase.FirebaseOptions
66
import org.springframework.beans.factory.annotation.Value
77
import org.springframework.context.annotation.Bean
88
import org.springframework.context.annotation.Configuration
9+
import org.springframework.context.annotation.Profile
910
import java.io.ByteArrayInputStream
1011
import java.io.IOException
11-
import java.util.Base64
1212

1313
@Configuration
14+
@Profile("!test") // 임시 조치
1415
class FcmConfig {
1516

1617
@Value("\${FIREBASE_TYPE:service_account}")

0 commit comments

Comments
 (0)