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 7c93eab730b7f052ba46f7dc6a354c7e54ad9645..63a3fedfd49084186cadf5852938a42af24a2fab 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,10 @@ public class DtpProperties { * If enabled DynamicTp. */ private boolean enabled = true; + /** + * 用来自定义环境信息。如果没有配置,将使用“spring.profiles.active” + */ + 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 e90e7b9e42e612a476223cd0e6cbeaa79a7d3599..4ca11751fb7c7fbb2343338c812bd10711e0608a 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); }