From b8a615a900e59d5dfd7e431404f91eaf761b525e Mon Sep 17 00:00:00 2001 From: witt Date: Tue, 2 Jan 2024 10:38:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20#I8SSGQ=20=E4=BF=AE=E5=A4=8D=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E9=85=8D=E7=BD=AEspring.profiles.include=E5=92=8Cspri?= =?UTF-8?q?ng.profiles.active=E6=97=B6=EF=BC=8C=E7=8E=AF=E5=A2=83=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dynamictp/common/util/CommonUtil.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/org/dromara/dynamictp/common/util/CommonUtil.java b/common/src/main/java/org/dromara/dynamictp/common/util/CommonUtil.java index 6dd82695..a23cc361 100644 --- a/common/src/main/java/org/dromara/dynamictp/common/util/CommonUtil.java +++ b/common/src/main/java/org/dromara/dynamictp/common/util/CommonUtil.java @@ -57,12 +57,18 @@ public final class CommonUtil { log.error("get localhost address error.", e); } - String[] profiles = environment.getActiveProfiles(); - if (profiles.length < 1) { - profiles = environment.getDefaultProfiles(); + // fix #I8SSGQ + String env = environment.getProperty("spring.profiles.active"); + if (null == env) { + String[] profiles = environment.getActiveProfiles(); + if (profiles.length < 1) { + profiles = environment.getDefaultProfiles(); + } + if (profiles.length > 1) { + env = profiles[0]; + } } - SERVICE_INSTANCE = new ServiceInstance(address, port, appName, profiles[0]); - + SERVICE_INSTANCE = new ServiceInstance(address, port, appName, env); } public static ServiceInstance getInstance() { @@ -89,4 +95,4 @@ public final class CommonUtil { } -} +} \ No newline at end of file -- Gitee