format and optimize code

loongs-zhang · Oct 29, 2024 · 68ee7b6 · 68ee7b6
1 parent 11b709f
commit 68ee7b6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 30 deletions.
diff --git a/common/src/main/java/org/dromara/dynamictp/common/constant/DynamicTpConst.java b/common/src/main/java/org/dromara/dynamictp/common/constant/DynamicTpConst.java
@@ -54,6 +54,10 @@ private DynamicTpConst() { }
 
     public static final String APP_NAME_KEY = "APP.NAME";
 
+    public static final String APP_PORT_KEY = "APP.PORT";
+
+    public static final String APP_ENV_KEY = "APP.ENV";
+
     /**
      * Dtp executor properties const.
      */

diff --git a/common/src/main/java/org/dromara/dynamictp/common/manager/ContextManager.java b/common/src/main/java/org/dromara/dynamictp/common/manager/ContextManager.java
@@ -57,13 +57,6 @@ public interface ContextManager {
      */
     <T> Map<String, T> getBeansOfType(Class<T> clazz);
 
-    /**
-     * Sets the context.
-     *
-     * @param context the context to set
-     */
-    void setContext(Object context);
-
     /**
      * Retrieves the environment.
      *

diff --git a/common/src/main/java/org/dromara/dynamictp/common/manager/ContextManagerHelper.java b/common/src/main/java/org/dromara/dynamictp/common/manager/ContextManagerHelper.java
@@ -50,10 +50,6 @@ public static <T> Map<String, T> getBeansOfType(Class<T> clazz) {
         return CONTEXT_MANAGER.getBeansOfType(clazz);
     }
 
-    public static void setContext(Object context) {
-        CONTEXT_MANAGER.setContext(context);
-    }
-
     public static Object getEnvironment() {
         return CONTEXT_MANAGER.getEnvironment();
     }
@@ -73,9 +69,5 @@ public static String[] getActiveProfiles() {
     public static String[] getDefaultProfiles() {
         return CONTEXT_MANAGER.getDefaultProfiles();
     }
-
-    public static void publishEvent(Object event) {
-        EventBusManager.post(event);
-    }
 }
 
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
@@ -17,17 +17,22 @@
 
 package org.dromara.dynamictp.common.util;
 
-import org.dromara.dynamictp.common.properties.DtpProperties;
-import org.dromara.dynamictp.common.entity.ServiceInstance;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.dromara.dynamictp.common.entity.ServiceInstance;
 import org.dromara.dynamictp.common.manager.ContextManagerHelper;
+import org.dromara.dynamictp.common.properties.DtpProperties;
+
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.util.Enumeration;
 
+import static org.dromara.dynamictp.common.constant.DynamicTpConst.APP_ENV_KEY;
+import static org.dromara.dynamictp.common.constant.DynamicTpConst.APP_NAME_KEY;
+import static org.dromara.dynamictp.common.constant.DynamicTpConst.APP_PORT_KEY;
+
 /**
  * CommonUtil related
  *
@@ -42,11 +47,6 @@ private CommonUtil() {
     private static final ServiceInstance SERVICE_INSTANCE;
 
     static {
-        String appName = ContextManagerHelper.getEnvironmentProperty("spring.application.name", "application");
-
-        String portStr = ContextManagerHelper.getEnvironmentProperty("server.port", "0");
-        int port = StringUtils.isNotBlank(portStr) ? Integer.parseInt(portStr) : 0;
-
         String address = null;
         try {
             address = getLocalHostExactAddress().getHostAddress();
@@ -57,7 +57,7 @@ private CommonUtil() {
         String env = DtpProperties.getInstance().getEnv();
         if (StringUtils.isBlank(env)) {
             // fix #I8SSGQ
-            env = ContextManagerHelper.getEnvironmentProperty("spring.profiles.active");
+            env = ContextManagerHelper.getEnvironmentProperty(APP_ENV_KEY);
         }
         if (StringUtils.isBlank(env)) {
             String[] profiles = ContextManagerHelper.getActiveProfiles();
@@ -69,6 +69,9 @@ private CommonUtil() {
             }
         }
 
+        String appName = ContextManagerHelper.getEnvironmentProperty(APP_NAME_KEY);
+        String portStr = ContextManagerHelper.getEnvironmentProperty(APP_PORT_KEY);
+        int port = StringUtils.isNotBlank(portStr) ? Integer.parseInt(portStr) : 0;
         SERVICE_INSTANCE = new ServiceInstance(address, port, appName, env);
     }
 

diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/holder/SpringContextHolder.java b/spring/src/main/java/org/dromara/dynamictp/spring/holder/SpringContextHolder.java
@@ -87,11 +87,4 @@ public String[] getActiveProfiles() {
     public String[] getDefaultProfiles() {
         return getInstance().getEnvironment().getDefaultProfiles();
     }
-
-    @Override
-    public void setContext(Object context) {
-        if (context instanceof ApplicationContext) {
-            setApplicationContext((ApplicationContext) context);
-        }
-    }
 }
diff --git a/spring/src/main/java/org/dromara/dynamictp/spring/initializer/SpringDtpInitializer.java b/spring/src/main/java/org/dromara/dynamictp/spring/initializer/SpringDtpInitializer.java
@@ -20,7 +20,9 @@
 import org.dromara.dynamictp.core.support.init.DtpInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 
+import static org.dromara.dynamictp.common.constant.DynamicTpConst.APP_ENV_KEY;
 import static org.dromara.dynamictp.common.constant.DynamicTpConst.APP_NAME_KEY;
+import static org.dromara.dynamictp.common.constant.DynamicTpConst.APP_PORT_KEY;
 
 /**
  * SpringDtpInitializer related
@@ -41,6 +43,10 @@ public String getName() {
     public void init(Object... args) {
         ConfigurableApplicationContext c = (ConfigurableApplicationContext) args[0];
         String appName = c.getEnvironment().getProperty(SPRING_APP_NAME_KEY, "application");
+        String appPort = c.getEnvironment().getProperty("server.port", "0");
+        String appEnv = c.getEnvironment().getProperty("spring.profiles.active", "unknown");
         System.setProperty(APP_NAME_KEY, appName);
+        System.setProperty(APP_PORT_KEY, appPort);
+        System.setProperty(APP_ENV_KEY, appEnv);
     }
 }