refactor: open the gateway and registry port in docker-compose deploy…

…ment (#856)
traas-stack · May 27, 2024 · 4caac05 · 4caac05
1 parent 8d62253
commit 4caac05
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 25 deletions.
diff --git a/.../common-service/src/main/java/io/holoinsight/server/common/ctl/ProductCtlServiceImpl.java b/.../common-service/src/main/java/io/holoinsight/server/common/ctl/ProductCtlServiceImpl.java
@@ -37,7 +37,7 @@ public class ProductCtlServiceImpl implements ProductCtlService {
 
   protected static final String RS_DELIMITER = "_";
 
-  @Scheduled(initialDelay = 10000L, fixedRate = 10000L)
+  @Scheduled(initialDelay = 10000L, fixedDelay = 30000L)
   private void refresh() {
     List<MonitorInstance> monitorInstances = monitorInstanceService.list();
 

diff --git a/...er/home/home-service/src/main/java/io/holoinsight/server/home/biz/common/MetaDictKey.java b/...er/home/home-service/src/main/java/io/holoinsight/server/home/biz/common/MetaDictKey.java
@@ -15,8 +15,6 @@ public class MetaDictKey {
   public static final String TOKEN_URL_WRITE_LIST = "token_url_write_list";
   public static final String TOKEN_URL_WHITE_PREFIX_LIST = "token_url_white_prefix_list";
   public static final String TOKEN_URL_NO_AUTH = "token_url_no_auth";
-  public static final String RESOURCE_KEYS = "resource_keys";
-  public static final String IS_APM_MATERIALIZED = "is_apm_materialized";
   public static final String DISPLAY_MENU_APM = "display_menu_apm";
 
   public static final String AGENT_INSTALL_HOST = "agentInstallHost";
@@ -55,7 +53,6 @@ public class MetaDictKey {
   public static final String MNP_ANTLOG_URL = "mnp_antlog_url";
   public static final String SYSTEM_NOTICE = "system_notice";
 
-  public static final String METERING_LOG_OPEN = "metering_log_open";
   public static final String METERING_HOLOINSIGHT_SUBMIT_OPEN = "metering_holoinsight_submit_open";
   public static final String INTEGRATION_LOCAL_PRODUCT = "integration_local_product";
   public static final String NETWORK_MODE = "networkMode";

diff --git a/...r/home/home-service/src/main/java/io/holoinsight/server/home/biz/common/MetaDictUtil.java b/...r/home/home-service/src/main/java/io/holoinsight/server/home/biz/common/MetaDictUtil.java
@@ -6,14 +6,13 @@
 import com.google.gson.reflect.TypeToken;
 import io.holoinsight.server.common.J;
 import io.holoinsight.server.common.dao.entity.MetaDataDictValue;
+import io.holoinsight.server.common.scope.IdentityType;
 import io.holoinsight.server.common.service.SuperCacheService;
 import io.holoinsight.server.home.common.service.SpringContext;
-import io.holoinsight.server.common.scope.IdentityType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -120,15 +119,6 @@ public static Boolean isDefaultApmDisplayMenu() {
     return value;
   }
 
-  public static Boolean isApmMaterialized() {
-
-    Boolean value = MetaDictUtil.getValue(MetaDictType.GLOBAL_CONFIG,
-        MetaDictKey.IS_APM_MATERIALIZED, new TypeToken<Boolean>() {});
-    if (null == value) {
-      return false;
-    }
-    return value;
-  }
 
   public static List<String /* 任务名 */> getIgnoreTasks() {
     return MetaDictUtil.getValue(MetaDictType.MANAGE_TASK, MetaDictKey.IGNORE_TASK_LIST,
@@ -159,14 +149,6 @@ public static List<String> getTokenUrlNoAuth() {
     return value;
   }
 
-  public static List<String> getResourceKeys() {
-    List<String> value = MetaDictUtil.getValue(MetaDictType.GLOBAL_CONFIG,
-        MetaDictKey.RESOURCE_KEYS, new TypeToken<List<String>>() {});
-    if (CollectionUtils.isEmpty(value))
-      return Collections.singletonList("tenant");
-    return value;
-  }
-
   public static Boolean isMeteringHoloinsightSubmitOpen() {
     Boolean value = MetaDictUtil.getValue(MetaDictType.GLOBAL_CONFIG,
         MetaDictKey.METERING_HOLOINSIGHT_SUBMIT_OPEN, new TypeToken<Boolean>() {});

diff --git a/...ome/home-web/src/main/java/io/holoinsight/server/home/web/controller/QueryFacadeImpl.java b/...ome/home-web/src/main/java/io/holoinsight/server/home/web/controller/QueryFacadeImpl.java
@@ -645,8 +645,7 @@ public QueryProto.QueryRequest convertRequest(DataQueryRequest request, MonitorS
       if (!aBoolean) {
         throw new MonitorException("workspace is illegal");
       }
-      datasourceBuilder
-          .setApmMaterialized(d.isApmMaterialized() || MetaDictUtil.isApmMaterialized());
+      datasourceBuilder.setApmMaterialized(d.isApmMaterialized());
       builder.addDatasources(datasourceBuilder);
     });
 

diff --git a/test/scenes/common/base.yaml b/test/scenes/common/base.yaml
@@ -67,6 +67,8 @@ services:
     - 8080 # tomcat
     - 8000 # java debug
     - 7681 # web terminal
+    - 7202 # registry
+    - 19610 # gateway
     volumes:
     - ./agent_entrypoint.sh:/agent_entrypoint.sh:ro
   collector: