From 46b470a7b48e585e66dd20255980c949d37c2d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=91=E9=B9=8F?= Date: Sat, 20 Jan 2024 16:04:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E5=A2=9E=E5=8A=A0env=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dynamictp/common/properties/DtpProperties.java | 1 + .../dromara/dynamictp/common/util/CommonUtil.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/org/dromara/dynamictp/common/properties/DtpProperties.java b/common/src/main/java/org/dromara/dynamictp/common/properties/DtpProperties.java index 7c93eab7..cb07047d 100644 --- a/common/src/main/java/org/dromara/dynamictp/common/properties/DtpProperties.java +++ b/common/src/main/java/org/dromara/dynamictp/common/properties/DtpProperties.java @@ -41,6 +41,7 @@ public class DtpProperties { * If enabled DynamicTp. */ private boolean enabled = true; + private String env=""; /** * If print banner. 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 e90e7b9e..4ca11751 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 @@ -17,6 +17,7 @@ package org.dromara.dynamictp.common.util; +import org.dromara.dynamictp.common.properties.DtpProperties; import org.dromara.dynamictp.common.spring.ApplicationContextHolder; import org.dromara.dynamictp.common.entity.ServiceInstance; import lombok.extern.slf4j.Slf4j; @@ -37,7 +38,8 @@ import java.util.Enumeration; @Slf4j public final class CommonUtil { - private CommonUtil() { } + private CommonUtil() { + } private static final ServiceInstance SERVICE_INSTANCE; @@ -57,8 +59,11 @@ public final class CommonUtil { log.error("get localhost address error.", e); } - // fix #I8SSGQ - String env = environment.getProperty("spring.profiles.active"); + String env = DtpProperties.getInstance().getEnv(); + if (StringUtils.isBlank(env)) { + // fix #I8SSGQ + env = environment.getProperty("spring.profiles.active"); + } if (StringUtils.isBlank(env)) { String[] profiles = environment.getActiveProfiles(); if (profiles.length < 1) { @@ -68,6 +73,7 @@ public final class CommonUtil { env = profiles[0]; } } + SERVICE_INSTANCE = new ServiceInstance(address, port, appName, env); } -- Gitee From c084f9825e71ca07e1bf9860eba5bb753f6467ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=91=E9=B9=8F?= Date: Mon, 22 Jan 2024 16:01:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/dynamictp/common/properties/DtpProperties.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/src/main/java/org/dromara/dynamictp/common/properties/DtpProperties.java b/common/src/main/java/org/dromara/dynamictp/common/properties/DtpProperties.java index cb07047d..63a3fedf 100644 --- a/common/src/main/java/org/dromara/dynamictp/common/properties/DtpProperties.java +++ b/common/src/main/java/org/dromara/dynamictp/common/properties/DtpProperties.java @@ -41,6 +41,9 @@ public class DtpProperties { * If enabled DynamicTp. */ private boolean enabled = true; + /** + * 用来自定义环境信息。如果没有配置，将使用“spring.profiles.active” + */ private String env=""; /** -- Gitee