From 4e6e499ba780280d0c9175aa90ce6efa83e3d9c0 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 22 Sep 2025 09:54:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20-Dspring.config.additional?= =?UTF-8?q?-location=20=E6=96=B9=E5=BC=8F=E8=AF=BB=E5=8F=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jeesite/common/io/PropertiesUtils.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java index c241a6de..0cbe0761 100644 --- a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java +++ b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java @@ -64,8 +64,11 @@ public class PropertiesUtils { // 获取全局设置默认的配置文件（以下是支持环境配置的属性文件） Set set = SetUtils.newLinkedHashSet(); set.addAll(Arrays.asList(DEFAULT_CONFIG_FILE)); - // 获取 spring.config.location 外部自定义的配置文件 + // 获取 spring.config.location、spring.config.additional-location 外部自定义的配置文件 String customConfigs = System.getProperty("spring.config.location"); + if (StringUtils.isBlank(customConfigs)){ + customConfigs = System.getProperty("spring.config.additional-location"); + } if (StringUtils.isNotBlank(customConfigs)){ for (String customConfig : StringUtils.splitComma(customConfigs)){ if (!customConfig.contains("$")){