From 3eb848621d6e0769dc546e7728f59688fcb14ad1 Mon Sep 17 00:00:00 2001
From: hongqiaowei <hongqiaowei@163.com>
Date: Fri, 11 Mar 2022 09:48:51 +0800
Subject: [PATCH] Replace applicationContext.getApplicationName() with
 applicationContext.getEnvironment().getProperty("spring.application.name")

---
 .../java/we/service_registry/RegistryCenterService.java     | 1 +
 .../java/we/service_registry/nacos/FizzNacosHelper.java     | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fizz-core/src/main/java/we/service_registry/RegistryCenterService.java b/fizz-core/src/main/java/we/service_registry/RegistryCenterService.java
index d62c3f7..2d82f22 100644
--- a/fizz-core/src/main/java/we/service_registry/RegistryCenterService.java
+++ b/fizz-core/src/main/java/we/service_registry/RegistryCenterService.java
@@ -143,6 +143,7 @@ public class RegistryCenterService implements ApplicationListener<ContextRefresh
                                   prev.getFizzServiceRegistration().deregister();
                               }
                               rc.initFizzServiceRegistration(applicationContext);
+                              rc.getFizzServiceRegistration().register();
                           }
                       } catch (Throwable t) {
                           log.error("update registry center error, {}", message, t);
diff --git a/fizz-core/src/main/java/we/service_registry/nacos/FizzNacosHelper.java b/fizz-core/src/main/java/we/service_registry/nacos/FizzNacosHelper.java
index 61a72ab..d8269e2 100644
--- a/fizz-core/src/main/java/we/service_registry/nacos/FizzNacosHelper.java
+++ b/fizz-core/src/main/java/we/service_registry/nacos/FizzNacosHelper.java
@@ -22,6 +22,7 @@ import com.alibaba.cloud.nacos.registry.NacosRegistration;
 import com.alibaba.cloud.nacos.registry.NacosServiceRegistry;
 import com.alibaba.nacos.api.naming.NamingService;
 import org.springframework.context.ApplicationContext;
+import org.springframework.core.env.Environment;
 import we.util.Consts;
 import we.util.JacksonUtils;
 import we.util.PropertiesUtils;
@@ -58,11 +59,12 @@ public abstract class FizzNacosHelper {
         if (fizzNacosProperties.getId() == null) {
             fizzNacosProperties.setId(fizzNacosProperties.getServerAddr());
         }
+        Environment env = applicationContext.getEnvironment();
         if (fizzNacosProperties.getService() == null) {
-            fizzNacosProperties.setService(applicationContext.getApplicationName());
+            fizzNacosProperties.setService(env.getProperty("spring.application.name"));
         }
         if (fizzNacosProperties.getPort() == -1) {
-            fizzNacosProperties.setPort(Integer.parseInt(applicationContext.getEnvironment().getProperty("server.port")));
+            fizzNacosProperties.setPort(Integer.parseInt(env.getProperty("server.port")));
         }
         fizzNacosProperties.setNamingLoadCacheAtStart("false");