From 0cd0b096e5782b223d9792be4a59267cdb22f4c9 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 14 Apr 2023 09:41:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=9E=E6=80=A7utils=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=A4=9A=E4=B8=AAprofiles=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeesite/common/io/PropertiesUtils.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 52dc85d3..652c95cf 100644 --- a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java +++ b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java @@ -89,12 +89,14 @@ public class PropertiesUtils { for (String location : configFiles){ configSet.add(location); if (StringUtils.isNotBlank(profiles)){ - if (location.endsWith(".properties")){ - configSet.add(StringUtils.substringBeforeLast(location, ".properties") - + "-" + profiles + ".properties"); - }else if (location.endsWith(".yml")){ - configSet.add(StringUtils.substringBeforeLast(location, ".yml") - + "-" + profiles + ".yml"); + for (String pf : StringUtils.split(profiles, ",")) { + if (location.endsWith(".properties")){ + configSet.add(StringUtils.substringBeforeLast(location, ".properties") + + "-" + pf + ".properties"); + }else if (location.endsWith(".yml")){ + configSet.add(StringUtils.substringBeforeLast(location, ".yml") + + "-" + pf + ".yml"); + } } } }