有 bootstrap 依赖时,支持 application.yml 中配置服务名

pull/1664/head
shedfreewu 2 months ago
parent 3295ef612a
commit 07a17ff9d4

@ -65,7 +65,7 @@ public final class ConsulDiscoveryUtil {
if (StringUtils.isNotBlank(appName)) {
return appName;
}
return env.getProperty("spring.application.name", "application");
return env.getProperty("spring.application.name");
}
public static String getInstanceId(ConsulDiscoveryProperties properties, ApplicationContext context) {

@ -25,6 +25,7 @@ import java.util.concurrent.ScheduledExecutorService;
import com.tencent.cloud.common.metadata.MetadataContext;
import com.tencent.cloud.common.metadata.StaticMetadataManager;
import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
import com.tencent.cloud.common.util.OkHttpUtil;
import com.tencent.cloud.common.util.OtUtils;
import com.tencent.cloud.polaris.PolarisDiscoveryProperties;
@ -101,12 +102,16 @@ public class PolarisServiceRegistry implements ServiceRegistry<PolarisRegistrati
@Override
public void register(PolarisRegistration registration) {
if (StringUtils.isBlank(registration.getServiceId())) {
String serviceId = registration.getServiceId();
if (StringUtils.isBlank(serviceId)) {
serviceId = ApplicationContextAwareUtils.getProperties("spring.application.name");
}
if (StringUtils.isBlank(serviceId)) {
LOGGER.warn("No service to register for polaris client...");
return;
}
registration.customize();
String serviceId = registration.getServiceId();
MetadataContext.setLocalService(serviceId);
// Register instance.

Loading…
Cancel
Save