diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index aad13a528..53a182db0 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -7,6 +7,7 @@ x-common: &common extra_hosts: - "host.docker.internal:host-gateway" environment: &common-environment + DEPLOY_ENV: ${DEPLOY_ENV:-test} SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-cn} NACOS_SERVER_ADDR: ${NACOS_SERVER_ADDR} NACOS_USERNAME: ${NACOS_USERNAME} diff --git a/finance/src/main/java/com/baiyue/finance/service/FinanceWalletService.java b/finance/src/main/java/com/baiyue/finance/service/FinanceWalletService.java index 9ef0074b0..bcde3a51c 100644 --- a/finance/src/main/java/com/baiyue/finance/service/FinanceWalletService.java +++ b/finance/src/main/java/com/baiyue/finance/service/FinanceWalletService.java @@ -56,14 +56,15 @@ public class FinanceWalletService { @Value("${baiyue.security.internal-service-token:}") String internalToken, @Value("${baiyue.finance.recharge.wechat-qr-code-url:}") String wechatQrCodeUrl, @Value("${baiyue.finance.recharge.alipay-qr-code-url:}") String alipayQrCodeUrl, - @Value("${spring.profiles.active:}") String activeProfiles) { + @Value("${spring.profiles.active:}") String activeProfiles, + @Value("${DEPLOY_ENV:}") String deployEnvironment) { this.jdbc = jdbc; this.objectMapper = objectMapper; this.fileClient = fileClient; this.numberGenerator = numberGenerator; this.internalToken = internalToken; - boolean development = List.of(activeProfiles.split(",")).stream() - .map(String::trim).anyMatch("dev"::equalsIgnoreCase); + boolean development = "development".equalsIgnoreCase(deployEnvironment.trim()) + || List.of(activeProfiles.split(",")).stream().map(String::trim).anyMatch("dev"::equalsIgnoreCase); this.wechatQrCodeUrl = rechargeQrCode(wechatQrCodeUrl, development); this.alipayQrCodeUrl = rechargeQrCode(alipayQrCodeUrl, development); } diff --git a/finance/src/test/java/com/baiyue/finance/FinanceWalletBehaviorTest.java b/finance/src/test/java/com/baiyue/finance/FinanceWalletBehaviorTest.java index 71cd71d7e..0302b60b8 100644 --- a/finance/src/test/java/com/baiyue/finance/FinanceWalletBehaviorTest.java +++ b/finance/src/test/java/com/baiyue/finance/FinanceWalletBehaviorTest.java @@ -47,7 +47,7 @@ class FinanceWalletBehaviorTest { @Test void developmentProfileUsesTheNonPayableSampleQrCode() { var channels = new FinanceWalletService(mock(JdbcTemplate.class), new ObjectMapper().findAndRegisterModules(), - mock(FinanceFileClient.class), mock(FinanceDocumentNumberGenerator.class), "token", "", "", "dev").channels(); + mock(FinanceFileClient.class), mock(FinanceDocumentNumberGenerator.class), "token", "", "", "cn", "development").channels(); assertThat(channels).allSatisfy(channel -> { assertThat(channel.enabled()).isTrue(); @@ -83,6 +83,6 @@ class FinanceWalletBehaviorTest { private static FinanceWalletService service(JdbcTemplate jdbc, String wechat, String alipay) { return new FinanceWalletService(jdbc, new ObjectMapper().findAndRegisterModules(), - mock(FinanceFileClient.class), mock(FinanceDocumentNumberGenerator.class), "token", wechat, alipay, "test"); + mock(FinanceFileClient.class), mock(FinanceDocumentNumberGenerator.class), "token", wechat, alipay, "test", "test"); } }