java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(deploy): identify development wallet runtime

Browse Source
This commit is contained in:
ouyangxq
2026-09-05 09:01:43 +08:00
parent 3df6fb511f
commit 37183ac2f0
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy/docker-compose.yml
+1
View File
@@ -7,6 +7,7 @@ x-common: &common
extra_hosts: extra_hosts:
- "host.docker.internal:host-gateway" - "host.docker.internal:host-gateway"
environment: &common-environment environment: &common-environment
DEPLOY_ENV: ${DEPLOY_ENV:-test}
SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-cn} SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-cn}
NACOS_SERVER_ADDR: ${NACOS_SERVER_ADDR} NACOS_SERVER_ADDR: ${NACOS_SERVER_ADDR}
NACOS_USERNAME: ${NACOS_USERNAME} NACOS_USERNAME: ${NACOS_USERNAME}
finance/src/main/java/com/baiyue/finance/service/FinanceWalletService.java
+4 -3
View File
@@ -56,14 +56,15 @@ public class FinanceWalletService {
@Value("${baiyue.security.internal-service-token:}") String internalToken, @Value("${baiyue.security.internal-service-token:}") String internalToken,
@Value("${baiyue.finance.recharge.wechat-qr-code-url:}") String wechatQrCodeUrl, @Value("${baiyue.finance.recharge.wechat-qr-code-url:}") String wechatQrCodeUrl,
@Value("${baiyue.finance.recharge.alipay-qr-code-url:}") String alipayQrCodeUrl, @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.jdbc = jdbc;
this.objectMapper = objectMapper; this.objectMapper = objectMapper;
this.fileClient = fileClient; this.fileClient = fileClient;
this.numberGenerator = numberGenerator; this.numberGenerator = numberGenerator;
this.internalToken = internalToken; this.internalToken = internalToken;
boolean development = List.of(activeProfiles.split(",")).stream() boolean development = "development".equalsIgnoreCase(deployEnvironment.trim())
.map(String::trim).anyMatch("dev"::equalsIgnoreCase); || List.of(activeProfiles.split(",")).stream().map(String::trim).anyMatch("dev"::equalsIgnoreCase);
this.wechatQrCodeUrl = rechargeQrCode(wechatQrCodeUrl, development); this.wechatQrCodeUrl = rechargeQrCode(wechatQrCodeUrl, development);
this.alipayQrCodeUrl = rechargeQrCode(alipayQrCodeUrl, development); this.alipayQrCodeUrl = rechargeQrCode(alipayQrCodeUrl, development);
} }
finance/src/test/java/com/baiyue/finance/FinanceWalletBehaviorTest.java
+2 -2
View File
@@ -47,7 +47,7 @@ class FinanceWalletBehaviorTest {
@Test @Test
void developmentProfileUsesTheNonPayableSampleQrCode() { void developmentProfileUsesTheNonPayableSampleQrCode() {
var channels = new FinanceWalletService(mock(JdbcTemplate.class), new ObjectMapper().findAndRegisterModules(), 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(channels).allSatisfy(channel -> {
assertThat(channel.enabled()).isTrue(); assertThat(channel.enabled()).isTrue();
@@ -83,6 +83,6 @@ class FinanceWalletBehaviorTest {
private static FinanceWalletService service(JdbcTemplate jdbc, String wechat, String alipay) { private static FinanceWalletService service(JdbcTemplate jdbc, String wechat, String alipay) {
return new FinanceWalletService(jdbc, new ObjectMapper().findAndRegisterModules(), 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");
} }
} }