diff --git a/CHANGES.md b/CHANGES.md index 8dc0dea8d05..c584794bdc7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,6 +16,12 @@ Apollo 2.4.0 * [Feature: Add ConfigService cache record stats function](https://github.com/apolloconfig/apollo/pull/5247) * [RefreshAdminServerAddressTask supports dynamic configuration of time interval](https://github.com/apolloconfig/apollo/pull/5248) * [Refactor: Configuration files uniformly use Kebab style](https://github.com/apolloconfig/apollo/pull/5262) +* [Feature: openapi query namespace support not fill item](https://github.com/apolloconfig/apollo/pull/5249) +* [Refactor: align database ClusterName and NamespaceName fields lengths](https://github.com/apolloconfig/apollo/pull/5263) +* [Feature: Added the value length limit function for AppId-level configuration items](https://github.com/apolloconfig/apollo/pull/5264) +* [Fix: ensure clusters order in envClusters open api](https://github.com/apolloconfig/apollo/pull/5277) +* [Fix: bump xstream from 1.4.20 to 1.4.21 to fix CVE-2024-47072](https://github.com/apolloconfig/apollo/pull/5280) +* [Feature: highlight diffs for properties](https://github.com/apolloconfig/apollo/pull/5282) ------------------ All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/15?closed=1) diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/config/BizConfig.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/config/BizConfig.java index f2b6dc9fc98..0746a7be45b 100644 --- a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/config/BizConfig.java +++ b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/config/BizConfig.java @@ -30,12 +30,16 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; +import java.util.function.Predicate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @Component public class BizConfig extends RefreshableConfig { + private final static Logger logger = LoggerFactory.getLogger(BizConfig.class); + private static final int DEFAULT_ITEM_KEY_LENGTH = 128; private static final int DEFAULT_ITEM_VALUE_LENGTH = 20000; @@ -58,6 +62,9 @@ public class BizConfig extends RefreshableConfig { private static final Gson GSON = new Gson(); + private static final Type appIdValueLengthOverrideTypeReference = + new TypeToken>() { + }.getType(); private static final Type namespaceValueLengthOverrideTypeReference = new TypeToken>() { }.getType(); @@ -106,6 +113,16 @@ public int itemValueLengthLimit() { return checkInt(limit, 5, Integer.MAX_VALUE, DEFAULT_ITEM_VALUE_LENGTH); } + public Map appIdValueLengthLimitOverride() { + String appIdValueLengthOverrideString = getValue("appid.value.length.limit.override"); + return parseOverrideConfig(appIdValueLengthOverrideString, appIdValueLengthOverrideTypeReference, value -> value > 0); + } + + public Map namespaceValueLengthLimitOverride() { + String namespaceValueLengthOverrideString = getValue("namespace.value.length.limit.override"); + return parseOverrideConfig(namespaceValueLengthOverrideString, namespaceValueLengthOverrideTypeReference, value -> value > 0); + } + public boolean isNamespaceNumLimitEnabled() { return getBooleanProperty("namespace.num.limit.enabled", false); } @@ -128,17 +145,6 @@ public int itemNumLimit() { return checkInt(limit, 5, Integer.MAX_VALUE, DEFAULT_MAX_ITEM_NUM); } - public Map namespaceValueLengthLimitOverride() { - String namespaceValueLengthOverrideString = getValue("namespace.value.length.limit.override"); - Map namespaceValueLengthOverride = Maps.newHashMap(); - if (!Strings.isNullOrEmpty(namespaceValueLengthOverrideString)) { - namespaceValueLengthOverride = - GSON.fromJson(namespaceValueLengthOverrideString, namespaceValueLengthOverrideTypeReference); - } - - return namespaceValueLengthOverride; - } - public boolean isNamespaceLockSwitchOff() { return !getBooleanProperty("namespace.lock.switch", false); } @@ -195,15 +201,7 @@ public int releaseHistoryRetentionSize() { public Map releaseHistoryRetentionSizeOverride() { String overrideString = getValue("apollo.release-history.retention.size.override"); - Map releaseHistoryRetentionSizeOverride = Maps.newHashMap(); - if (!Strings.isNullOrEmpty(overrideString)) { - releaseHistoryRetentionSizeOverride = - GSON.fromJson(overrideString, releaseHistoryRetentionSizeOverrideTypeReference); - } - return releaseHistoryRetentionSizeOverride.entrySet() - .stream() - .filter(entry -> entry.getValue() >= 1) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + return parseOverrideConfig(overrideString, releaseHistoryRetentionSizeOverrideTypeReference, value -> value > 0); } public int releaseMessageCacheScanInterval() { @@ -261,4 +259,22 @@ public boolean isAdminServiceAccessControlEnabled() { public String getAdminServiceAccessTokens() { return getValue("admin-service.access.tokens"); } + + private Map parseOverrideConfig(String configValue, Type typeReference, Predicate valueFilter) { + Map result = Maps.newHashMap(); + if (!Strings.isNullOrEmpty(configValue)) { + try { + Map parsed = GSON.fromJson(configValue, typeReference); + for (Map.Entry entry : parsed.entrySet()) { + if (entry.getValue() != null && valueFilter.test(entry.getValue())) { + result.put(entry.getKey(), entry.getValue()); + } + } + } catch (Exception e) { + logger.error("Invalid override config value: {}", configValue, e); + } + } + return Collections.unmodifiableMap(result); + } + } diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ItemService.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ItemService.java index 0fd9199ab65..975b9814fbe 100644 --- a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ItemService.java +++ b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ItemService.java @@ -217,8 +217,8 @@ public Item update(Item item) { } private boolean checkItemValueLength(long namespaceId, String value) { - int limit = getItemValueLengthLimit(namespaceId); Namespace currentNamespace = namespaceService.findOne(namespaceId); + int limit = getItemValueLengthLimit(currentNamespace); if(currentNamespace != null) { Matcher m = clusterPattern.matcher(currentNamespace.getClusterName()); boolean isGray = m.matches(); @@ -235,7 +235,7 @@ private boolean checkItemValueLength(long namespaceId, String value) { private int getGrayNamespaceItemValueLengthLimit(Namespace grayNamespace, int grayNamespaceLimit) { Namespace parentNamespace = namespaceService.findParentNamespace(grayNamespace); if (parentNamespace != null) { - int parentLimit = getItemValueLengthLimit(parentNamespace.getId()); + int parentLimit = getItemValueLengthLimit(grayNamespace); if (parentLimit > grayNamespaceLimit) { return parentLimit; } @@ -257,11 +257,17 @@ private boolean checkItemType(int type) { return true; } - private int getItemValueLengthLimit(long namespaceId) { + private int getItemValueLengthLimit(Namespace namespace) { Map namespaceValueLengthOverride = bizConfig.namespaceValueLengthLimitOverride(); - if (namespaceValueLengthOverride != null && namespaceValueLengthOverride.containsKey(namespaceId)) { - return namespaceValueLengthOverride.get(namespaceId); + if (namespaceValueLengthOverride != null && namespaceValueLengthOverride.containsKey(namespace.getId())) { + return namespaceValueLengthOverride.get(namespace.getId()); } + + Map appIdValueLengthOverride = bizConfig.appIdValueLengthLimitOverride(); + if (appIdValueLengthOverride != null && appIdValueLengthOverride.containsKey(namespace.getAppId())) { + return appIdValueLengthOverride.get(namespace.getAppId()); + } + return bizConfig.itemValueLengthLimit(); } diff --git a/apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/config/BizConfigTest.java b/apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/config/BizConfigTest.java index 7c7b1ea484a..c6420f187f5 100644 --- a/apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/config/BizConfigTest.java +++ b/apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/config/BizConfigTest.java @@ -18,13 +18,13 @@ import com.ctrip.framework.apollo.biz.repository.ServerConfigRepository; import com.ctrip.framework.apollo.biz.service.BizDBPropertySource; +import java.util.Map; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.core.env.ConfigurableEnvironment; -import org.springframework.core.env.Environment; import org.springframework.test.util.ReflectionTestUtils; import javax.sql.DataSource; @@ -93,7 +93,7 @@ public void testReleaseHistoryRetentionSizeOverride() { int someOverrideLimit = 10; String overrideValueString = "{'a+b+c+b':10}"; when(environment.getProperty("apollo.release-history.retention.size.override")).thenReturn(overrideValueString); - int overrideValue = bizConfig.releaseHistoryRetentionSizeOverride().get("a+b+c+b"); + int overrideValue = bizConfig.releaseHistoryRetentionSizeOverride().get("a+b+c+b"); assertEquals(someOverrideLimit, overrideValue); overrideValueString = "{'a+b+c+b':0,'a+b+d+b':2}"; @@ -107,6 +107,48 @@ public void testReleaseHistoryRetentionSizeOverride() { assertEquals(0, bizConfig.releaseHistoryRetentionSizeOverride().size()); } + @Test + public void testAppIdValueLengthLimitOverride() { + when(environment.getProperty("appid.value.length.limit.override")).thenReturn(null); + Map result = bizConfig.appIdValueLengthLimitOverride(); + assertTrue(result.isEmpty()); + + String input = "{}"; + when(environment.getProperty("appid.value.length.limit.override")).thenReturn(input); + result = bizConfig.appIdValueLengthLimitOverride(); + assertTrue(result.isEmpty()); + + input = "invalid json"; + when(environment.getProperty("appid.value.length.limit.override")).thenReturn(input); + result = bizConfig.appIdValueLengthLimitOverride(); + assertTrue(result.isEmpty()); + + input = "{'appid1':555}"; + when(environment.getProperty("appid.value.length.limit.override")).thenReturn(input); + int overrideValue = bizConfig.appIdValueLengthLimitOverride().get("appid1"); + assertEquals(1, bizConfig.appIdValueLengthLimitOverride().size()); + assertEquals(555, overrideValue); + + input = "{'appid1':555,'appid2':666}"; + when(environment.getProperty("appid.value.length.limit.override")).thenReturn(input); + overrideValue = bizConfig.appIdValueLengthLimitOverride().get("appid2"); + assertEquals(2, bizConfig.appIdValueLengthLimitOverride().size()); + assertEquals(666, overrideValue); + + input = "{'appid1':555,'appid2':666,'appid3':0,'appid4':-1}"; + when(environment.getProperty("appid.value.length.limit.override")).thenReturn(input); + result = bizConfig.appIdValueLengthLimitOverride(); + + assertTrue(result.containsKey("appid1")); + assertTrue(result.containsKey("appid2")); + assertFalse(result.containsKey("appid3")); + assertFalse(result.containsKey("appid4")); + assertEquals(2, result.size()); + + overrideValue = result.get("appid2"); + assertEquals(666, overrideValue); + } + @Test public void testReleaseMessageNotificationBatchWithNAN() throws Exception { String someNAN = "someNAN"; diff --git a/apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/ItemServiceTest.java b/apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/ItemServiceTest.java index 6d8003f1d58..efc4f477bdd 100644 --- a/apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/ItemServiceTest.java +++ b/apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/ItemServiceTest.java @@ -16,12 +16,20 @@ */ package com.ctrip.framework.apollo.biz.service; +import static org.mockito.Mockito.when; + import com.ctrip.framework.apollo.biz.AbstractIntegrationTest; +import com.ctrip.framework.apollo.biz.config.BizConfig; import com.ctrip.framework.apollo.biz.entity.Item; +import com.ctrip.framework.apollo.biz.repository.ItemRepository; import com.ctrip.framework.apollo.common.dto.ItemInfoDTO; import com.ctrip.framework.apollo.common.exception.BadRequestException; +import java.util.HashMap; +import java.util.Map; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -32,18 +40,28 @@ public class ItemServiceTest extends AbstractIntegrationTest { @Autowired private ItemService itemService; + @Autowired + private ItemRepository itemRepository; + @Autowired + private NamespaceService namespaceService; + @Autowired + private AuditService auditService; + + @Mock + private BizConfig bizConfig; + + private ItemService itemService2; + + @Before + public void setUp() throws Exception { + itemService2 = new ItemService(itemRepository, namespaceService, auditService, bizConfig); + } + @Test - @Sql(scripts = "/sql/item-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) + @Sql(scripts = {"/sql/namespace-test.sql","/sql/item-test.sql"}, executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testSaveItem() { - Item item = new Item(); - item.setNamespaceId(3); - item.setKey("k3"); - item.setType(-1); - item.setValue("v3"); - item.setComment(""); - item.setLineNum(3); - + Item item = createItem(1L, "k3", "v3", -1); try { itemService.save(item); Assert.fail(); @@ -57,16 +75,56 @@ public void testSaveItem() { } @Test - @Sql(scripts = "/sql/item-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) + @Sql(scripts = {"/sql/namespace-test.sql", "/sql/item-test.sql"}, executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) + @Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) + public void testSaveItemWithNamespaceValueLengthLimitOverride() { + + long namespaceId = 1L; + String itemValue = "test-demo"; + + Map namespaceValueLengthOverride = new HashMap<>(); + namespaceValueLengthOverride.put(namespaceId, itemValue.length() - 1); + when(bizConfig.namespaceValueLengthLimitOverride()).thenReturn(namespaceValueLengthOverride); + when(bizConfig.itemKeyLengthLimit()).thenReturn(100); + + Item item = createItem(namespaceId, "k3", itemValue, 2); + try { + itemService2.save(item); + Assert.fail(); + } catch (Exception e) { + Assert.assertTrue(e instanceof BadRequestException && e.getMessage().contains("value too long")); + } + } + + @Test + @Sql(scripts = {"/sql/namespace-test.sql", "/sql/item-test.sql"}, executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) + @Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) + public void testSaveItemWithAppIdValueLengthLimitOverride() { + + String appId = "testApp"; + long namespaceId = 1L; + String itemValue = "test-demo"; + + Map appIdValueLengthOverride = new HashMap<>(); + appIdValueLengthOverride.put(appId, itemValue.length() - 1); + when(bizConfig.appIdValueLengthLimitOverride()).thenReturn(appIdValueLengthOverride); + when(bizConfig.itemKeyLengthLimit()).thenReturn(100); + + Item item = createItem(namespaceId, "k3", itemValue, 2); + try { + itemService2.save(item); + Assert.fail(); + } catch (Exception e) { + Assert.assertTrue(e instanceof BadRequestException && e.getMessage().contains("value too long")); + } + } + + @Test + @Sql(scripts = {"/sql/namespace-test.sql","/sql/item-test.sql"}, executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) public void testUpdateItem() { - Item item = new Item(); + Item item = createItem(1, "k1", "v1-new", 2); item.setId(9901); - item.setNamespaceId(1); - item.setKey("k1"); - item.setType(2); - item.setValue("v1-new"); - item.setComment(""); item.setLineNum(1); Item dbItem = itemService.update(item); @@ -96,4 +154,15 @@ public void testSearchItem() { } + private Item createItem(long namespaceId, String key, String value, int type) { + Item item = new Item(); + item.setNamespaceId(namespaceId); + item.setKey(key); + item.setValue(value); + item.setType(type); + item.setComment(""); + item.setLineNum(3); + return item; + } + } diff --git a/apollo-common/pom.xml b/apollo-common/pom.xml index 6fed9bf01ca..b061f7e002d 100644 --- a/apollo-common/pom.xml +++ b/apollo-common/pom.xml @@ -94,7 +94,7 @@ commons-lang3 - + io.micrometer micrometer-core diff --git a/apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/BeanUtils.java b/apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/BeanUtils.java index ef636615b6b..160066b41aa 100644 --- a/apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/BeanUtils.java +++ b/apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/BeanUtils.java @@ -28,6 +28,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -164,7 +165,7 @@ public static Map> aggByKeyToList(String key, List list) { */ @SuppressWarnings("unchecked") public static Set toPropertySet(String key, List list) { - Set set = new HashSet<>(); + Set set = new LinkedHashSet<>(); if (CollectionUtils.isEmpty(list)) {// 防止外面传入空list return set; } diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/PortalOpenApiConfig.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/PortalOpenApiConfig.java index ece1147e44f..f39893c23ea 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/PortalOpenApiConfig.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/PortalOpenApiConfig.java @@ -34,11 +34,11 @@ static class PortalWebMvcConfig extends WebMvcConfig { @Override public void customize(TomcatServletWebServerFactory factory) { final String relaxedChars = "<>[\\]^`{|}"; - final String tomcatRelaxedpathcharsProperty = "relaxedPathChars"; - final String tomcatRelaxedquerycharsProperty = "relaxedQueryChars"; + final String tomcatRelaxedPathCharsProperty = "relaxedPathChars"; + final String tomcatRelaxedQueryCharsProperty = "relaxedQueryChars"; factory.addConnectorCustomizers(connector -> { - connector.setProperty(tomcatRelaxedpathcharsProperty, relaxedChars); - connector.setProperty(tomcatRelaxedquerycharsProperty, relaxedChars); + connector.setProperty(tomcatRelaxedPathCharsProperty, relaxedChars); + connector.setProperty(tomcatRelaxedQueryCharsProperty, relaxedChars); }); } } diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/server/service/ServerNamespaceOpenApiService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/server/service/ServerNamespaceOpenApiService.java index cc2cf13f829..5ae1ebbdf6f 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/server/service/ServerNamespaceOpenApiService.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/server/service/ServerNamespaceOpenApiService.java @@ -58,9 +58,9 @@ public ServerNamespaceOpenApiService( @Override public OpenNamespaceDTO getNamespace(String appId, String env, String clusterName, - String namespaceName) { + String namespaceName, boolean fillItemDetail) { NamespaceBO namespaceBO = namespaceService.loadNamespaceBO(appId, Env.valueOf - (env), clusterName, namespaceName, false); + (env), clusterName, namespaceName, fillItemDetail, false); if (namespaceBO == null) { return null; } @@ -68,10 +68,10 @@ public OpenNamespaceDTO getNamespace(String appId, String env, String clusterNam } @Override - public List getNamespaces(String appId, String env, String clusterName) { + public List getNamespaces(String appId, String env, String clusterName, boolean fillItemDetail) { return OpenApiBeanUtils .batchTransformFromNamespaceBOs(namespaceService.findNamespaceBOs(appId, Env - .valueOf(env), clusterName, false)); + .valueOf(env), clusterName, fillItemDetail, false)); } @Override diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/v1/controller/NamespaceController.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/v1/controller/NamespaceController.java index bbe3ba8e422..a3cf2ce5054 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/v1/controller/NamespaceController.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/v1/controller/NamespaceController.java @@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; @@ -81,21 +82,22 @@ public OpenAppNamespaceDTO createNamespace(@PathVariable String appId, @GetMapping(value = "/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces") public List findNamespaces(@PathVariable String appId, @PathVariable String env, - @PathVariable String clusterName) { - return this.namespaceOpenApiService.getNamespaces(appId, env, clusterName); + @PathVariable String clusterName, + @RequestParam(defaultValue = "true") boolean fillItemDetail) { + return this.namespaceOpenApiService.getNamespaces(appId, env, clusterName, fillItemDetail); } @GetMapping(value = "/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName:.+}") public OpenNamespaceDTO loadNamespace(@PathVariable String appId, @PathVariable String env, - @PathVariable String clusterName, @PathVariable String - namespaceName) { - return this.namespaceOpenApiService.getNamespace(appId, env, clusterName, namespaceName); + @PathVariable String clusterName, @PathVariable String namespaceName, + @RequestParam(defaultValue = "true") boolean fillItemDetail) { + return this.namespaceOpenApiService.getNamespace(appId, env, clusterName, namespaceName, fillItemDetail); } @GetMapping(value = "/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/lock") public OpenNamespaceLockDTO getNamespaceLock(@PathVariable String appId, @PathVariable String env, @PathVariable String clusterName, @PathVariable - String namespaceName) { + String namespaceName) { return this.namespaceOpenApiService.getNamespaceLock(appId, env, clusterName, namespaceName); } diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ConfigsExportController.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ConfigsExportController.java index 1d3c7d79c2d..fc6ae086f4d 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ConfigsExportController.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ConfigsExportController.java @@ -93,7 +93,7 @@ public void exportItems(@PathVariable String appId, @PathVariable String env, } NamespaceBO namespaceBO = namespaceService.loadNamespaceBO(appId, Env.valueOf - (env), clusterName, namespaceName, false); + (env), clusterName, namespaceName, true, false); //generate a file. res.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + fileName); diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ConfigsExportService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ConfigsExportService.java index aa524105169..1dc32fd4586 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ConfigsExportService.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ConfigsExportService.java @@ -235,7 +235,7 @@ private void exportNamespaces(final Env env, final App exportApp, final ClusterD ZipOutputStream zipOutputStream) { String clusterName = exportCluster.getName(); - List namespaceBOS = namespaceService.findNamespaceBOs(exportApp.getAppId(), env, clusterName, false); + List namespaceBOS = namespaceService.findNamespaceBOs(exportApp.getAppId(), env, clusterName, true, false); if (CollectionUtils.isEmpty(namespaceBOS)) { return; diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/NamespaceService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/NamespaceService.java index 183a58b891e..3d3e56c0a3a 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/NamespaceService.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/NamespaceService.java @@ -186,7 +186,7 @@ public NamespaceDTO loadNamespaceBaseInfo(String appId, Env env, String clusterN /** * load cluster all namespace info with items */ - public List findNamespaceBOs(String appId, Env env, String clusterName, boolean includeDeletedItems) { + public List findNamespaceBOs(String appId, Env env, String clusterName, boolean fillItemDetail, boolean includeDeletedItems) { List namespaces = namespaceAPI.findNamespaceByCluster(appId, env, clusterName); if (namespaces == null || namespaces.size() == 0) { @@ -200,7 +200,7 @@ public List findNamespaceBOs(String appId, Env env, String clusterN executorService.submit(() -> { NamespaceBO namespaceBO; try { - namespaceBO = transformNamespace2BO(env, namespace, includeDeletedItems); + namespaceBO = transformNamespace2BO(env, namespace, fillItemDetail, includeDeletedItems); namespaceBOs.add(namespaceBO); } catch (Exception e) { LOGGER.error("parse namespace error. app id:{}, env:{}, clusterName:{}, namespace:{}", @@ -229,7 +229,7 @@ public List findNamespaceBOs(String appId, Env env, String clusterN } public List findNamespaceBOs(String appId, Env env, String clusterName) { - return findNamespaceBOs(appId, env, clusterName, true); + return findNamespaceBOs(appId, env, clusterName, true, true); } public List findNamespaces(String appId, Env env, String clusterName) { @@ -250,17 +250,17 @@ public List getPublicAppNamespaceAllNamespaces(Env env, String pub } public NamespaceBO loadNamespaceBO(String appId, Env env, String clusterName, - String namespaceName, boolean includeDeletedItems) { + String namespaceName, boolean fillItemDetail, boolean includeDeletedItems) { NamespaceDTO namespace = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName); if (namespace == null) { throw BadRequestException.namespaceNotExists(appId, clusterName, namespaceName); } - return transformNamespace2BO(env, namespace, includeDeletedItems); + return transformNamespace2BO(env, namespace, fillItemDetail, includeDeletedItems); } public NamespaceBO loadNamespaceBO(String appId, Env env, String clusterName, String namespaceName) { - return loadNamespaceBO(appId, env, clusterName, namespaceName, true); + return loadNamespaceBO(appId, env, clusterName, namespaceName, true, true); } public boolean publicAppNamespaceHasAssociatedNamespace(String publicNamespaceName, Env env) { @@ -293,7 +293,7 @@ public Map> getNamespacesPublishInfo(String appId) return result; } - private NamespaceBO transformNamespace2BO(Env env, NamespaceDTO namespace, boolean includeDeletedItems) { + private NamespaceBO transformNamespace2BO(Env env, NamespaceDTO namespace, boolean fillItemDetail, boolean includeDeletedItems) { NamespaceBO namespaceBO = new NamespaceBO(); namespaceBO.setBaseInfo(namespace); @@ -306,6 +306,10 @@ private NamespaceBO transformNamespace2BO(Env env, NamespaceDTO namespace, boole List itemBOs = new LinkedList<>(); namespaceBO.setItems(itemBOs); + if (!fillItemDetail) { + return namespaceBO; + } + //latest Release ReleaseDTO latestRelease; Map releaseItems = new HashMap<>(); @@ -347,7 +351,7 @@ private NamespaceBO transformNamespace2BO(Env env, NamespaceDTO namespace, boole } private NamespaceBO transformNamespace2BO(Env env, NamespaceDTO namespace) { - return transformNamespace2BO(env, namespace, true); + return transformNamespace2BO(env, namespace, true, true); } private void fillAppNamespaceProperties(NamespaceBO namespace) { diff --git a/apollo-portal/src/main/resources/static/config/diff.html b/apollo-portal/src/main/resources/static/config/diff.html index bbfc3098ee5..08ecbacea9d 100644 --- a/apollo-portal/src/main/resources/static/config/diff.html +++ b/apollo-portal/src/main/resources/static/config/diff.html @@ -127,31 +127,38 @@

{{'Config.Diff.Title' | translate }}
+ - + - - + - +
Key + Key Value ( {{'Common.Environment' | translate }} : , {{'Common.Cluster' | translate }} : ) - - + + Comment ( {{'Common.Environment' | translate }} : , {{'Common.Cluster' | translate }} : ) - +
+ + + + ng-bind="(itemsKeyedByCluster[cluster.compositedKey] || {}).comment">
+ + @@ -162,7 +169,7 @@

{{'Config.Diff.Title' | translate }}

- + diff --git a/apollo-portal/src/main/resources/static/config/history.html b/apollo-portal/src/main/resources/static/config/history.html index 9c7d46e7727..fb81125339d 100644 --- a/apollo-portal/src/main/resources/static/config/history.html +++ b/apollo-portal/src/main/resources/static/config/history.html @@ -157,11 +157,11 @@

{{'Config.History.ChangedItem' | translate }}

- +
- - + + @@ -189,10 +189,9 @@

{{'Config.History.ChangedItem' | translate }}

ng-bind="change.entity.firstEntity.value.length > 250 ? '...' :''"> @@ -310,7 +309,7 @@

- + diff --git a/apollo-portal/src/main/resources/static/i18n/en.json b/apollo-portal/src/main/resources/static/i18n/en.json index 69ae8e5e4cf..7cab764e0c6 100644 --- a/apollo-portal/src/main/resources/static/i18n/en.json +++ b/apollo-portal/src/main/resources/static/i18n/en.json @@ -297,6 +297,7 @@ "Component.Publish.NoPublishedValue": "Unreleased values", "Component.Publish.ModifyUser": "Modifier", "Component.Publish.ModifyTime": "Modified Time", + "Component.Publish.ModifyRecord": "Record", "Component.Publish.NewAdded": "New", "Component.Publish.NewAddedTips": "New Configuration", "Component.Publish.Modified": "Modified", diff --git a/apollo-portal/src/main/resources/static/i18n/zh-CN.json b/apollo-portal/src/main/resources/static/i18n/zh-CN.json index 8ae676eda59..8c00fee807f 100644 --- a/apollo-portal/src/main/resources/static/i18n/zh-CN.json +++ b/apollo-portal/src/main/resources/static/i18n/zh-CN.json @@ -291,12 +291,13 @@ "Component.Publish.ToSeeChange": "查看变更", "Component.Publish.CompareWithMasterValue": "与主版本对比", "Component.Publish.CompareWithPublishedValue": "与已发布对比", - "Component.Publish.PublishedValue": "待发布的值", - "Component.Publish.Changes": "Changes", + "Component.Publish.PublishedValue": "已发布的值", + "Component.Publish.Changes": "改动", "Component.Publish.Key": "Key", - "Component.Publish.NoPublishedValue": "未发布的值", + "Component.Publish.NoPublishedValue": "待发布的值", "Component.Publish.ModifyUser": "修改人", "Component.Publish.ModifyTime": "修改时间", + "Component.Publish.ModifyRecord": "修改记录", "Component.Publish.NewAdded": "新", "Component.Publish.NewAddedTips": "新增的配置", "Component.Publish.Modified": "改", @@ -310,8 +311,8 @@ "Component.Publish.ItemNoChange": "配置没有变化", "Component.Publish.GrayItemNoChange": "灰度配置没有变化", "Component.Publish.NoGrayItems": "没有灰度的配置项", - "Component.Publish.Release": "Release Name", - "Component.Publish.ReleaseComment": "Comment", + "Component.Publish.Release": "版本名称", + "Component.Publish.ReleaseComment": "说明", "Component.Publish.OpPublish": "发布", "Component.Rollback.To": "回滚到", "Component.Rollback.Tips": "此操作将会回滚到上一个发布版本，且当前版本作废，但不影响正在修改的配置。可在发布历史页面查看当前生效的版本", @@ -731,11 +732,11 @@ "Config.History.ChangedItemTips": "查看此次发布与上次版本的变更", "Config.History.AllItem": "全部配置", "Config.History.AllItemTips": "查看此次发布的所有配置信息", - "Config.History.ChangeType": "Type", + "Config.History.ChangeType": "类型", "Config.History.ChangeKey": "Key", - "Config.History.ChangeValue": "Value", - "Config.History.ChangeOldValue": "Old Value", - "Config.History.ChangeNewValue": "New Value", + "Config.History.ChangeValue": "值", + "Config.History.ChangeOldValue": "旧值", + "Config.History.ChangeNewValue": "新值", "Config.History.ChangeTypeNew": "新增", "Config.History.ChangeTypeModify": "修改", "Config.History.ChangeTypeDelete": "删除", diff --git a/apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js b/apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js index 488169ac3c0..8272ba7d28d 100644 --- a/apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js +++ b/apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js @@ -38,7 +38,7 @@ diff_item_module.controller("DiffItemController", $scope.backToAppHomePage = backToAppHomePage; $scope.switchSelect = switchSelect; - $scope.showText = showText; + $scope.showTextDiff = showTextDiff; $scope.itemsKeyedByKey = {}; $scope.allNamespaceValueEqualed = {}; @@ -164,17 +164,19 @@ diff_item_module.controller("DiffItemController", function parseSyncSourceData() { var syncData = { syncToNamespaces: [], - syncItems: [] + syncItems: [], + firstClusterKey: "", }; var namespaceName = $scope.pageContext.namespaceName; selectedClusters.forEach(function (cluster) { if (cluster.checked) { cluster.clusterName = cluster.name; cluster.namespaceName = namespaceName; + cluster.compositedKey = cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName; syncData.syncToNamespaces.push(cluster); } }); - + syncData.firstClusterKey = selectedClusters[0].compositedKey; return syncData; } @@ -193,8 +195,9 @@ diff_item_module.controller("DiffItemController", o.checked = !o.checked; } - function showText(text) { - $scope.text = text; + function showTextDiff(oldStr, newStr) { + $scope.oldStr = oldStr; + $scope.newStr = newStr; AppUtil.showModal('#showTextModal'); } }]); diff --git a/apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js b/apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js index 028cb554b04..45302596938 100644 --- a/apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js +++ b/apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js @@ -53,6 +53,7 @@ function releaseHistoryController($scope, $location, $translate, AppUtil, EventM $scope.switchConfigViewType = switchConfigViewType; $scope.findReleaseHistory = findReleaseHistory; $scope.showText = showText; + $scope.showTextDiff = showTextDiff; EventManager.subscribe(EventManager.EventType.REFRESH_RELEASE_HISTORY, function () { location.reload(true); @@ -207,8 +208,16 @@ function releaseHistoryController($scope, $location, $translate, AppUtil, EventM } function showText(text) { + $scope.enableTextDiff = false; $scope.text = text; AppUtil.showModal("#showTextModal"); } + + function showTextDiff(oldStr, newStr) { + $scope.enableTextDiff = true; + $scope.oldStr = oldStr; + $scope.newStr = newStr; + AppUtil.showModal('#showTextModal'); + } } diff --git a/apollo-portal/src/main/resources/static/scripts/directive/diff-directive.js b/apollo-portal/src/main/resources/static/scripts/directive/diff-directive.js index b78525faf81..b9cdc7aaa2b 100644 --- a/apollo-portal/src/main/resources/static/scripts/directive/diff-directive.js +++ b/apollo-portal/src/main/resources/static/scripts/directive/diff-directive.js @@ -60,6 +60,7 @@ directive_module.directive('apollodiff', part.removed ? 'red' : 'grey'; span = document.createElement('span'); span.style.color = color; + span.style.display = 'block'; pre = part.added ? '+' : part.removed ? '-' : ''; span.appendChild(document.createTextNode(pre + part.value)); diff --git a/apollo-portal/src/main/resources/static/scripts/directive/release-modal-directive.js b/apollo-portal/src/main/resources/static/scripts/directive/release-modal-directive.js index 89d82a4e97b..9b285c9a8a2 100644 --- a/apollo-portal/src/main/resources/static/scripts/directive/release-modal-directive.js +++ b/apollo-portal/src/main/resources/static/scripts/directive/release-modal-directive.js @@ -34,6 +34,7 @@ function releaseModalDirective($translate, toastr, AppUtil, EventManager, Releas scope.releaseBtnDisabled = false; scope.releaseChangeViewType = 'compareWithPublishedValue'; + scope.isComparePublished = true; scope.releaseComment = ''; scope.isEmergencyPublish = false; @@ -170,6 +171,9 @@ function releaseModalDirective($translate, toastr, AppUtil, EventManager, Releas function switchReleaseChangeViewType(type) { scope.releaseChangeViewType = type; + scope.isCompareMaster = type === 'compareWithMasterValue'; + scope.isComparePublished = type === 'compareWithPublishedValue'; + scope.isNoCompare = type === 'release'; } } } diff --git a/apollo-portal/src/main/resources/static/scripts/directive/show-text-modal-directive.js b/apollo-portal/src/main/resources/static/scripts/directive/show-text-modal-directive.js index ff55de3dc1c..f023a03ef07 100644 --- a/apollo-portal/src/main/resources/static/scripts/directive/show-text-modal-directive.js +++ b/apollo-portal/src/main/resources/static/scripts/directive/show-text-modal-directive.js @@ -74,7 +74,10 @@ function showTextModalDirective(AppUtil) { transclude: true, replace: true, scope: { - text: '=' + text: '=', + oldStr: '=', + newStr: '=', + enableTextDiff: '=' }, link: function (scope) { scope.$watch('text', init); diff --git a/apollo-portal/src/main/resources/static/styles/common-style.css b/apollo-portal/src/main/resources/static/styles/common-style.css index fe92365f48c..350026705d0 100644 --- a/apollo-portal/src/main/resources/static/styles/common-style.css +++ b/apollo-portal/src/main/resources/static/styles/common-style.css @@ -95,7 +95,7 @@ p, td, span { color: #797979; } -pre, .pre { +pre { white-space: pre-wrap; /* Since CSS 2.1 */ white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ white-space: -pre-wrap; /* Opera 4-6 */ @@ -103,6 +103,10 @@ pre, .pre { word-wrap: break-word; /* Internet Explorer 5.5+ */ } +.pre { + white-space: pre; +} + .hover:hover { background: #f5f5f5; cursor: pointer @@ -1172,4 +1176,17 @@ table th { #consumer-list .create-btn img { width: 16px; height: 16px; +} + +.left-overflow { + overflow-x: auto; + text-align: left; +} + +.table-fixed{ + table-layout: fixed; +} + +.block { + display: block; } \ No newline at end of file diff --git a/apollo-portal/src/main/resources/static/views/component/diff.html b/apollo-portal/src/main/resources/static/views/component/diff.html index 3e36e174add..82cf76643a7 100644 --- a/apollo-portal/src/main/resources/static/views/component/diff.html +++ b/apollo-portal/src/main/resources/static/views/component/diff.html @@ -1,4 +1,4 @@ -
+
 
                         
-

{{'Config.History.ChangeType' | translate }}{{'Config.History.ChangeKey' | translate }}{{'Config.History.ChangeType' | translate }}{{'Config.History.ChangeKey' | translate }} {{'Config.History.ChangeOldValue' | translate }} {{'Config.History.ChangeNewValue' | translate }}
+ ng-click="showTextDiff(change.entity.firstEntity.value, change.entity.secondEntity.value)"> - +
+
- - - - @@ -108,40 +105,37 @@

-

- -
+ {{'Component.Publish.Key' | translate }} {{'Component.Publish.PublishedValue' | translate }} + {{'Component.Publish.NoPublishedValue' | translate }} - {{'Component.Publish.ModifyUser' | translate }} - - {{'Component.Publish.ModifyTime' | translate }} + + {{'Component.Publish.ModifyRecord' | translate }}
- - + + + + + +
- - - - - - - + + @@ -153,49 +147,47 @@

{{'Component.Publish.Deleted' | translate }} -

- - - -
+ {{'Component.Publish.Key' | translate }} + {{'Component.Publish.MasterValue' | translate }} + {{'Component.Publish.GrayPublishedValue' | translate }} - {{'Component.Publish.GrayNoPublishedValue' | translate }} - - {{'Component.Publish.ModifyUser' | translate }} - - {{'Component.Publish.ModifyTime' | translate }} + {{'Component.Publish.GrayNoPublishedValue' | translate }}{{'Component.Publish.GrayNoPublishedValue' | translate }} + {{'Component.Publish.ModifyRecord' | translate }}
+ + - - + + + + + + + + + + + +
- - - - - - - - @@ -207,13 +199,13 @@

-

- - @@ -274,7 +266,7 @@

-
diff --git a/apollo-portal/src/main/resources/static/views/component/show-text-modal.html b/apollo-portal/src/main/resources/static/views/component/show-text-modal.html index 9a740dc1324..90c54df36fe 100644 --- a/apollo-portal/src/main/resources/static/views/component/show-text-modal.html +++ b/apollo-portal/src/main/resources/static/views/component/show-text-modal.html @@ -23,11 +23,13 @@

{{'Component.ShowText.Title' | translate }}

- 
-
- 
-
+
+ 

+                

+            

+            
+                 
+            
diff --git a/apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/service/ConfigsExportServiceTest.java b/apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/service/ConfigsExportServiceTest.java
index 05391706e3f..0dd544d6736 100644
--- a/apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/service/ConfigsExportServiceTest.java
+++ b/apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/service/ConfigsExportServiceTest.java
@@ -83,6 +83,18 @@ public class ConfigsExportServiceTest extends AbstractUnitTest {
 
   @Test
   public void testNamespaceExportImport() throws FileNotFoundException {
+    // Test with fillItemDetail = true
+    testExportImportScenario(true);
+  }
+
+  @Test
+  public void testNamespaceExportImportWithFillItemDetail() throws FileNotFoundException {
+    // Test with fillItemDetail = false
+    testExportImportScenario(false);
+  }
+
+  private void testExportImportScenario(boolean fillItemDetail) throws FileNotFoundException {
+
     File temporaryFolder = Files.newTemporaryFolder();
     temporaryFolder.deleteOnExit();
     String filePath = temporaryFolder + File.separator + "export.zip";
@@ -146,10 +158,10 @@ public void testNamespaceExportImport() throws FileNotFoundException {
     when(permissionValidator.isAppAdmin(any())).thenReturn(true);
     when(clusterService.findClusters(env, appId1)).thenReturn(app1Clusters);
     when(clusterService.findClusters(env, appId2)).thenReturn(app2Clusters);
-    when(namespaceService.findNamespaceBOs(appId1, Env.DEV, clusterName1, false)).thenReturn(app1Cluster1Namespace);
-    when(namespaceService.findNamespaceBOs(appId1, Env.DEV, clusterName2, false)).thenReturn(app1Cluster2Namespace);
-    when(namespaceService.findNamespaceBOs(appId2, Env.DEV, clusterName1, false)).thenReturn(app2Cluster1Namespace);
-    when(namespaceService.findNamespaceBOs(appId2, Env.DEV, clusterName2, false)).thenReturn(app2Cluster2Namespace);
+    when(namespaceService.findNamespaceBOs(appId1, Env.DEV, clusterName1, fillItemDetail, false)).thenReturn(app1Cluster1Namespace);
+    when(namespaceService.findNamespaceBOs(appId1, Env.DEV, clusterName2, fillItemDetail, false)).thenReturn(app1Cluster2Namespace);
+    when(namespaceService.findNamespaceBOs(appId2, Env.DEV, clusterName1, fillItemDetail, false)).thenReturn(app2Cluster1Namespace);
+    when(namespaceService.findNamespaceBOs(appId2, Env.DEV, clusterName2, fillItemDetail, false)).thenReturn(app2Cluster2Namespace);
 
     FileOutputStream fileOutputStream = new FileOutputStream(filePath);
 
@@ -186,10 +198,12 @@ public void testNamespaceExportImport() throws FileNotFoundException {
 
     verify(clusterService, times(4)).createCluster(any(), any());
 
-    verify(namespaceService, times(6)).createNamespace(any(), any());
-    verify(roleInitializationService,times(6)).initNamespaceRoles(any(), any(), anyString());
-    verify(roleInitializationService,times(6)).initNamespaceEnvRoles(any(), any(), anyString());
-    verify(itemService, times(12)).createItem(any(), any(), any(), any(), any());
+    if(fillItemDetail){
+      verify(namespaceService, times(6)).createNamespace(any(), any());
+      verify(roleInitializationService,times(6)).initNamespaceRoles(any(), any(), anyString());
+      verify(roleInitializationService,times(6)).initNamespaceEnvRoles(any(), any(), anyString());
+      verify(itemService, times(12)).createItem(any(), any(), any(), any(), any());
+    }
   }
 
   private App genApp(String name, String appId, String orgId, String orgName) {
diff --git a/apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/service/NamespaceServiceTest.java b/apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/service/NamespaceServiceTest.java
index 8efecccb82e..458d3ced59f 100644
--- a/apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/service/NamespaceServiceTest.java
+++ b/apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/service/NamespaceServiceTest.java
@@ -227,14 +227,60 @@ public void testDeleteEmptyNamespace() {
 
   @Test
   public void testLoadNamespaceBO() {
-    String branchName = "branch";
-    NamespaceDTO namespaceDTO = createNamespace(testAppId, branchName, testNamespaceName);
-    when(namespaceAPI.loadNamespace(any(), any(), any(), any())).thenReturn(namespaceDTO);
+    boolean fillItemDetail = true;
+    NamespaceBO namespaceBO = loadNamespaceBO(fillItemDetail);
+
+    List namespaceKey2 = namespaceBO.getItems().stream().map(s -> s.getItem().getKey()).collect(Collectors.toList());
+    assertThat(namespaceBO.getItemModifiedCnt()).isEqualTo(2);
+    assertThat(namespaceBO.getItems().size()).isEqualTo(2);
+    assertThat(namespaceKey2).isEqualTo(Arrays.asList("k1", "k2"));
+  }
+
+  @Test
+  public void testLoadNamespaceBOWithoutItemDetail() {
+    boolean fillItemDetail = false;
+    NamespaceBO namespaceBO = loadNamespaceBO(fillItemDetail);
+
+    assertThat(namespaceBO.getItems().size()).isEqualTo(0);
+  }
 
+  private NamespaceBO loadNamespaceBO(boolean fillItemDetail) {
+    when(namespaceAPI.loadNamespace(any(), any(), any(), any())).thenReturn(createNamespace(testAppId, "branch", testNamespaceName));
+    when(releaseService.loadLatestRelease(any(), any(), any(), any())).thenReturn(createReleaseDTO());
+    when(itemService.findItems(any(), any(), any(), any())).thenReturn(createItems());
+    when(itemService.findDeletedItems(any(), any(), any(), any())).thenReturn(createDeletedItems());
+
+    NamespaceBO namespaceBO1 = namespaceService.loadNamespaceBO(testAppId, testEnv, testClusterName, testNamespaceName);
+    List namespaceKey1 = namespaceBO1.getItems().stream().map(s -> s.getItem().getKey()).collect(Collectors.toList());
+    assertThat(namespaceBO1.getItemModifiedCnt()).isEqualTo(3);
+    assertThat(namespaceBO1.getItems().size()).isEqualTo(3);
+    assertThat(namespaceKey1).isEqualTo(Arrays.asList("k1", "k2", "k3"));
+
+    return namespaceService.loadNamespaceBO(testAppId, testEnv, testClusterName, testNamespaceName, fillItemDetail, false);
+  }
+
+  @Test
+  public void testFindPublicNamespaceForAssociatedNamespace() {
+    when(namespaceAPI.findPublicNamespaceForAssociatedNamespace(any(), any(), any(), any())).thenReturn(createNamespace(testAppId, "branch", testNamespaceName));
+    when(releaseService.loadLatestRelease(any(), any(), any(), any())).thenReturn(createReleaseDTO());
+    when(itemService.findItems(any(), any(), any(), any())).thenReturn(createItems());
+    when(itemService.findDeletedItems(any(), any(), any(), any())).thenReturn(createDeletedItems());
+
+    NamespaceBO namespaceBO = namespaceService.findPublicNamespaceForAssociatedNamespace(testEnv, testAppId, testClusterName, testNamespaceName);
+
+    List namespaceKey2 = namespaceBO.getItems().stream().map(s -> s.getItem().getKey()).collect(Collectors.toList());
+    assertThat(namespaceBO.getItemModifiedCnt()).isEqualTo(3);
+    assertThat(namespaceBO.getItems().size()).isEqualTo(3);
+    assertThat(namespaceKey2).isEqualTo(Arrays.asList("k1", "k2", "k3"));
+  }
+
+  private ReleaseDTO createReleaseDTO() {
     ReleaseDTO releaseDTO = new ReleaseDTO();
     releaseDTO.setConfigurations("{\"k1\":\"k1\",\"k2\":\"k2\", \"k3\":\"\"}");
-    when(releaseService.loadLatestRelease(any(), any(), any(), any())).thenReturn(releaseDTO);
+    return releaseDTO;
+  }
 
+  private List createItems() {
     List itemDTOList = Lists.newArrayList();
     ItemDTO itemDTO1 = new ItemDTO();
     itemDTO1.setId(1);
@@ -249,27 +295,18 @@ public void testLoadNamespaceBO() {
     itemDTO2.setKey("k2");
     itemDTO2.setValue(String.valueOf(2));
     itemDTOList.add(itemDTO2);
-    when(itemService.findItems(any(), any(), any(), any())).thenReturn(itemDTOList);
 
+    return itemDTOList;
+  }
+
+  private List createDeletedItems() {
     List deletedItemDTOList = Lists.newArrayList();
     ItemDTO deletedItemDTO = new ItemDTO();
     deletedItemDTO.setId(3);
     deletedItemDTO.setNamespaceId(3);
     deletedItemDTO.setKey("k3");
     deletedItemDTOList.add(deletedItemDTO);
-    when(itemService.findDeletedItems(any(), any(), any(), any())).thenReturn(deletedItemDTOList);
-
-    NamespaceBO namespaceBO1 = namespaceService.loadNamespaceBO(testAppId, testEnv, testClusterName, testNamespaceName);
-    List namespaceKey1 = namespaceBO1.getItems().stream().map(s -> s.getItem().getKey()).collect(Collectors.toList());
-    assertThat(namespaceBO1.getItemModifiedCnt()).isEqualTo(3);
-    assertThat(namespaceBO1.getItems().size()).isEqualTo(3);
-    assertThat(namespaceKey1).isEqualTo(Arrays.asList("k1", "k2", "k3"));
-
-    NamespaceBO namespaceBO2 = namespaceService.loadNamespaceBO(testAppId, testEnv, testClusterName, testNamespaceName, false);
-    List namespaceKey2 = namespaceBO2.getItems().stream().map(s -> s.getItem().getKey()).collect(Collectors.toList());
-    assertThat(namespaceBO2.getItemModifiedCnt()).isEqualTo(2);
-    assertThat(namespaceBO2.getItems().size()).isEqualTo(2);
-    assertThat(namespaceKey2).isEqualTo(Arrays.asList("k1", "k2"));
+    return deletedItemDTOList;
   }
 
   private AppNamespace createAppNamespace(String appId, String name, boolean isPublic) {
diff --git a/docs/en/_sidebar.md b/docs/en/_sidebar.md
index 66c9b5ba1cf..b4e607aeedb 100644
--- a/docs/en/_sidebar.md
+++ b/docs/en/_sidebar.md
@@ -13,6 +13,7 @@
   - [Distributed Deployment Guide](en/deployment/distributed-deployment-guide.md)
   - Deployment By Third-party Tool 
     - [Install the HA Apollo cluster in Rainbond with one-click](en/deployment/third-party-tool-rainbond.md)
+    - [Quickly deploy Apollo based on the aaPanel](en/deployment/third-party-tool-btpanel.md)
 
 - Admin Guide
   - [Apollo Usage Guide](en/portal/apollo-user-guide.md)
diff --git a/docs/en/client/java-sdk-user-guide.md b/docs/en/client/java-sdk-user-guide.md
index 8eae4a9b848..eb8e11dbb44 100644
--- a/docs/en/client/java-sdk-user-guide.md
+++ b/docs/en/client/java-sdk-user-guide.md
@@ -171,6 +171,7 @@ The content of the file is stored in properties format, for example, if there ar
 request.timeout=2000
 batch=2000
 ```
+> Note: If deployed in a Kubernetes environment, you can also enable the configMap cache to further improve availability
 
 #### 1.2.3.1 Customizing the cache path
 
@@ -414,6 +415,96 @@ The configuration methods, in descending order of priority, are
 3. Via the `app.properties` configuration file
     * You can specify `apollo.override-system-properties=true` in `classpath:/META-INF/app.properties`
 
+#### 1.2.4.10 ConfigMap cache
+
+> For version 2.4.0 and above
+
+Starting from version 2.4.0, the availability of the client in the Kubernetes environment has been enhanced. After enabling the ConfigMap cache, the client will cache a copy of the configuration information fetched from the server in the ConfigMap. In the case of service unavailability, network issues, and loss of local cache files, the configuration can still be restored from the ConfigMap. Here are the relevant configurations:
+
+`apollo.cache.kubernetes.enable`：Whether to enable the ConfigMap cache mechanism, the default is false.
+
+`apollo.cache.kubernetes.namespace`：The namespace of the ConfigMap to be used (the namespace in Kubernetes), the default value is "default".
+
+The configuration information will be placed in the specified ConfigMap according to the following correspondence:
+
+namespace: Use the specified value, if not specified, the default is "default"
+
+configMapName: apollo-configcache-{appId}
+
+key:{cluster}___{namespace}
+
+value: The content is the JSON format string of the corresponding configuration information.
+
+> appId is the application's own appId, such as 100004458.
+> 
+> cluster is the cluster used by the application, which is usually default if not configured locally 
+> 
+> namespace Indicates the configuration namespace used by the application. If '_' appears in the namespace, it will be escaped to '__' when the key is concatenated.
+> Since this feature is extended, so the client-java dependency is set to optional. You need to import the matching version
+> Since read and write operations on the ConfigMap are required, the pod where the client is located must have the corresponding permissions. The specific configuration method can be referred to below.
+
+How to authorize a Pod's Service Account to have read and write permissions for ConfigMap:
+
+1. Create a Service Account: If there is no Service Account, you need to create one.
+   ```yaml
+   apiVersion: v1
+   kind: ServiceAccount
+   metadata:
+     name: my-service-account
+     namespace: default
+   ```
+2. Create a Role or ClusterRole: Define a Role or ClusterRole to grant read and write permissions for a specific ConfigMap. If the ConfigMap is used across multiple Namespaces, a ClusterRole should be used.
+   ```yaml
+   apiVersion: rbac.authorization.k8s.io/v1
+   kind: Role
+   metadata:
+     namespace: default
+     name: configmap-role
+   rules:
+   - apiGroups: [""]
+     resources: ["configmaps"]
+     verbs: ["get", "list", "watch", "create", "update", "delete"]
+   ```
+3. Bind the Service Account to the Role or ClusterRole: Use RoleBinding or ClusterRoleBinding to bind the Service Account to the Role or ClusterRole created above.
+   ```yaml
+   apiVersion: rbac.authorization.k8s.io/v1
+   kind: RoleBinding
+   metadata:
+     name: configmap-reader-binding
+     namespace: default
+   subjects:
+   - kind: ServiceAccount
+     name: my-service-account
+     namespace: default
+   roleRef:
+     kind: Role
+     name: configmap-role
+     apiGroup: rbac.authorization.k8s.io
+   ```
+4. Specify the Service Account in the Pod configuration: Ensure that the Pod's configuration uses the Service Account created above.
+   ```yaml
+   apiVersion: v1
+   kind: Pod
+   metadata:
+     name: my-pod
+     namespace: default
+   spec:
+     serviceAccountName: my-service-account
+     containers:
+       - name: my-container
+         image: my-image
+   ```
+5. Apply the configuration: Use the kubectl command-line tool to apply these configurations.
+   ```yaml
+   kubectl apply -f service-account.yaml
+   kubectl apply -f role.yaml
+   kubectl apply -f role-binding.yaml
+   kubectl apply -f pod.yaml
+   ```
+   
+   These steps give the Service Account in the Pod read and write permissions for the specified ConfigMap.
+   If the ConfigMap is cross-namespace, use ClusterRole and ClusterRoleBinding instead of Role and RoleBinding, and ensure that these configurations are applied in all Namespaces that need to access the ConfigMap.
+
 # II. Maven Dependency
 
 Apollo's client jar package has been uploaded to the central repository, the application only needs to be introduced in the following way when it is actually used.
diff --git a/docs/en/client/other-language-client-user-guide.md b/docs/en/client/other-language-client-user-guide.md
index ec00724c5e2..fc1325d140c 100644
--- a/docs/en/client/other-language-client-user-guide.md
+++ b/docs/en/client/other-language-client-user-guide.md
@@ -129,7 +129,7 @@ Once you have the notifications Map, you can request services. Here we describe
 If the notificationId is found to be older than the server, the latest notificationId of the corresponding namespace, HttpStatus 200, will be returned directly. 
 5. After the client gets the server side return, determine the return HttpStatus .
 6. If the returned HttpStatus is 304, that the configuration has not changed, re-execute step 1.
-7. If the returned HttpStauts is 200, the configuration has changed, for the change of namespace to pull configuration from the server again, see [1.3 Read configuration from Apollo through the Http interface without cache](en/client/other-language-client-user-guide?id=_13-reading-configuration-from-apollo-via-http-interface-without-cache). Also update the notificationId in the notifications map. re-run step 1.
+7. If the returned HttpStatus is 200, the configuration has changed, for the change of namespace to pull configuration from the server again, see [1.3 Read configuration from Apollo through the Http interface without cache](en/client/other-language-client-user-guide?id=_13-reading-configuration-from-apollo-via-http-interface-without-cache). Also update the notificationId in the notifications map. re-run step 1.
 
 
 ### 1.4.2 Http interface description
diff --git a/docs/en/deployment/distributed-deployment-guide.md b/docs/en/deployment/distributed-deployment-guide.md
index 16129301de7..b75bc898f9e 100644
--- a/docs/en/deployment/distributed-deployment-guide.md
+++ b/docs/en/deployment/distributed-deployment-guide.md
@@ -1539,9 +1539,19 @@ The default configuration is 128.
 
 The default configuration is 20000.
 
-#### 3.2.5.1 `namespace.value.length.limit.override` - Maximum length limit for namespace's configuration item value
+#### 3.2.5.1 appid.value.length.limit.override - The maximum length limit of the configuration item value of the appId dimension
 
-This configuration is used to override the `item.value.length.limit` configuration to achieve fine-grained control of the namespace's value maximum length limit, the configured value is a json format, the key of the json is the id value of the namespace in the database, the format is as follows.
+This configuration is used to override the configuration of `item.value.length.limit` to control the maximum length limit of the value at the appId granularity. The configured value is in a json format, and the key of the json is appId. The format is as follows:
+```
+appid.value.length.limit.override = {"appId-demo1":200,"appId-demo2":300}
+```
+The above configuration specifies that the maximum length limit of the value in all namespaces under `appId-demo1` is 200, and the maximum length limit of the value in all namespaces under `appId-demo2` is 300
+
+When a new namespace is created under `appId-demo1` or `appId-demo2`, it will automatically inherit the maximum length limit of the value of the namespace, unless the maximum length limit of the value of the configuration item of the namespace is overridden by `namespace.value.length.limit.override`.
+
+#### 3.2.5.2 `namespace.value.length.limit.override` - Maximum length limit for namespace's configuration item value
+
+This configuration is used to override the `item.value.length.limit` or `appid.value.length.limit.override` configuration to achieve fine-grained control of the namespace's value maximum length limit, the configured value is a json format, the key of the json is the id value of the namespace in the database, the format is as follows.
 
 ```
 namespace.value.length.limit.override = {1:200,3:20}
diff --git a/docs/en/deployment/third-party-tool-btpanel.md b/docs/en/deployment/third-party-tool-btpanel.md
new file mode 100644
index 00000000000..31c9f16047b
--- /dev/null
+++ b/docs/en/deployment/third-party-tool-btpanel.md
@@ -0,0 +1,73 @@
+## aaPanel Docker One-Click Install
+
+Go to [aaPanel official website](https://www.aapanel.com/new/download.html), Select the script to download and install(Skip this step if you already have it installed)
+
+# Deploy Apollo using aaPanel
+
+## Prerequisite
+
+To install aaPanel, go to the [aaPanel](https://www.aapanel.com/new/download.html#install) official website and select the corresponding script to download and install.
+
+## Deployment
+
+aaPanel(Applicable versions 7.0.11 and above) Deployment guidelines
+
+1. Log in to aaPanel and click `Docker` in the menu bar
+
+   ![Docker](../images/deployment/btpanel/install.png)
+
+2. The first time you will be prompted to install the `Docker` and `Docker Compose` services, click Install Now. If it is already installed, please ignore it.
+
+   ![install](../images/deployment/btpanel/install2.png)
+
+3. After the installation is complete, find `Apollo` in `One-Click Install` and click `install`  
+
+   ![install-Apollo](../images/deployment/btpanel/install-Apollo.png)
+
+4. configure basic information such as the domain name, ports to complete the installation
+
+   Note:
+   The domain is optional. If a domain is provided, it can be managed through [Website] --> [Proxy Project]. In this case, you do not need to check [Allow external access]. However, if no domain is provided, you must check [Allow external access] to enable port-based access.
+
+   ![addApollo](../images/deployment/btpanel/addApollo.png)
+
+5. After installation, enter the domain name or IP+ port set in the previous step in the browser to access.
+- Name: application name, default `Apollo-characters`
+- Version selection: default `latest`
+- Domain name: If you need to access directly through the domain name, please configure the domain name here and resolve the domain name to the server
+- Allow external access: If you need direct access through `IP+Port`, please check. If you have set up a domain name, please do not check here.
+- Web port: Default `8070`, can be modified by yourself
+- Communication port: Default `8080`, can be modified by yourself
+- Metadata port: Default `8090`, can be modified by yourself
+- **Security Note:**
+  - Ensure these ports are not exposed directly to the internet
+  - Configure your firewall to restrict access to these ports
+  - Verify that these ports are not already in use by other services
+
+6. After submission, the panel will automatically initialize the application, which will take about `1-3` minutes. It can be accessed after the initialization is completed.
+
+
+## Access Methods
+
+1. **Domain Name Access**
+   - URL Format: `http://`
+   - Example: `http://demo.apollo.org`
+
+   **Enable HTTPS (Suggestion):**
+   1. Obtain an SSL certificate (recommended providers: Let's Encrypt, Certbot)
+   2. In aaPanel, go to [Website] -> [SSL]
+   3. Install your SSL certificate
+   4. Force HTTPS redirect for enhanced security
+
+   After SSL configuration:
+   - URL Format: `https://`
+   - Example: `https://demo.apollo.org`
+
+2. **IP and Port Access**
+   - URL Format: `http://:8070`
+   - Note: Requires "Allow external access" to be enabled
+
+![console](../images/deployment/btpanel/console.png)
+
+> Default credentials: username `apollo`, password `admin`, please change the default password immediately.
+
diff --git a/docs/en/images/deployment/btpanel/addApollo.png b/docs/en/images/deployment/btpanel/addApollo.png
new file mode 100644
index 00000000000..e8b9db7ae5c
Binary files /dev/null and b/docs/en/images/deployment/btpanel/addApollo.png differ
diff --git a/docs/en/images/deployment/btpanel/console.png b/docs/en/images/deployment/btpanel/console.png
new file mode 100644
index 00000000000..5fddc00b13e
Binary files /dev/null and b/docs/en/images/deployment/btpanel/console.png differ
diff --git a/docs/en/images/deployment/btpanel/install-Apollo.png b/docs/en/images/deployment/btpanel/install-Apollo.png
new file mode 100644
index 00000000000..10c89bf1ff2
Binary files /dev/null and b/docs/en/images/deployment/btpanel/install-Apollo.png differ
diff --git a/docs/en/images/deployment/btpanel/install.png b/docs/en/images/deployment/btpanel/install.png
new file mode 100644
index 00000000000..0751fe5294c
Binary files /dev/null and b/docs/en/images/deployment/btpanel/install.png differ
diff --git a/docs/en/images/deployment/btpanel/install2.png b/docs/en/images/deployment/btpanel/install2.png
new file mode 100644
index 00000000000..8fd781d163d
Binary files /dev/null and b/docs/en/images/deployment/btpanel/install2.png differ
diff --git a/docs/zh/_sidebar.md b/docs/zh/_sidebar.md
index 26f563e090f..47e0237258f 100644
--- a/docs/zh/_sidebar.md
+++ b/docs/zh/_sidebar.md
@@ -13,6 +13,7 @@
   - [部署架构](zh/deployment/deployment-architecture.md)
   - 第三方工具部署
     - [基于Rainbond一键安装高可用Apollo集群](zh/deployment/third-party-tool-rainbond.md)
+    - [基于宝塔面板快速部署 Apollo](zh/deployment/third-party-tool-btpanel.md)
 
 - 管理端指南
   - [Apollo使用指南](zh/portal/apollo-user-guide.md)
diff --git a/docs/zh/client/java-sdk-user-guide.md b/docs/zh/client/java-sdk-user-guide.md
index db9c405d0b8..fa12873ad89 100644
--- a/docs/zh/client/java-sdk-user-guide.md
+++ b/docs/zh/client/java-sdk-user-guide.md
@@ -163,6 +163,8 @@ request.timeout=2000
 batch=2000
 ```
 
+> 注：如果部署在Kubernetes环境中，您还可以启用configMap缓存来进一步提高可用性
+
 #### 1.2.3.1 自定义缓存路径
 
 1.0.0版本开始支持以下方式自定义缓存路径，按照优先级从高到低分别为：
@@ -398,6 +400,96 @@ apollo.label=YOUR-APOLLO-LABEL
 3. 通过`app.properties`配置文件
     * 可以在`classpath:/META-INF/app.properties`指定`apollo.override-system-properties=true`
 
+#### 1.2.4.10 ConfigMap缓存设置
+
+> 适用于2.4.0及以上版本
+
+在2.4.0版本开始，客户端在Kubernetes环境下的可用性得到了加强，开启configMap缓存后，客户端会将从服务端拉取到的配置信息在configMap中缓存一份，在服务不可用，或网络不通，且本地缓存文件丢失的情况下，依然能从configMap恢复配置。以下是相关配置
+
+`apollo.cache.kubernetes.enable`：是否开启configMap缓存机制，默认false
+
+`apollo.cache.kubernetes.namespace`：将使用的configMap所在的namespace（Kubernetes中的namespace），默认值为"default"
+
+配置信息会以下面的对应关系放置于指定的configmap中：
+
+namespace：使用指定的值，若未指定默认为"default"
+
+configMapName: apollo-configcache-{appId}
+
+key:{cluster}___{namespace}
+
+value:内容为对应的配置信息的json格式字符串
+
+
+> appId是应用自己的appId，如100004458    
+> cluster是应用使用的集群，一般在本地模式下没有做过配置的话，是default  
+> namespace就是应用使用的配置namespace。 如果namespace中出现‘_’ , 将会在拼接key时被转义为‘__’
+
+> 由于此功能为拓展功能，所以对于client-java的依赖设为了optional。需用户自行导入匹配的版本
+
+> 由于需要对configmap进行读写操作，所以客户端所在pod必须有相应读写权限，具体配置方法可参考下文
+
+如何授权一个Pod的Service Account具有对ConfigMap的读写权限：
+1. 创建Service Account: 如果还没有Service Account，你需要创建一个。
+   ```yaml
+   apiVersion: v1
+   kind: ServiceAccount
+   metadata:
+     name: my-service-account
+     namespace: default
+   ```
+2. 创建Role或ClusterRole: 定义一个Role或ClusterRole，授予对特定ConfigMap的读写权限。如果ConfigMap是跨多个Namespace使用的，应该使用ClusterRole。
+   ```yaml
+   apiVersion: rbac.authorization.k8s.io/v1
+   kind: Role
+   metadata:
+     namespace: default
+     name: configmap-role
+   rules:
+   - apiGroups: [""]
+     resources: ["configmaps"]
+     verbs: ["get", "list", "watch", "create", "update", "delete"]
+   ```
+3. 绑定Service Account到Role或ClusterRole: 使用RoleBinding或ClusterRoleBinding将Service Account绑定到上面创建的Role或ClusterRole。
+   ```yaml
+   apiVersion: rbac.authorization.k8s.io/v1
+   kind: RoleBinding
+   metadata:
+     name: configmap-reader-binding
+     namespace: default
+   subjects:
+   - kind: ServiceAccount
+     name: my-service-account
+     namespace: default
+   roleRef:
+     kind: Role
+     name: configmap-role
+     apiGroup: rbac.authorization.k8s.io
+   ```
+4. 在Pod配置中指定Service Account: 确保Pod的配置中使用了上面创建的Service Account。
+   ```yaml
+   apiVersion: v1
+   kind: Pod
+   metadata:
+     name: my-pod
+     namespace: default
+   spec:
+     serviceAccountName: my-service-account
+     containers:
+       - name: my-container
+         image: my-image
+   ```
+5. 应用配置: 使用kubectl命令行工具应用这些配置。
+   ```yaml
+   kubectl apply -f service-account.yaml
+   kubectl apply -f role.yaml
+   kubectl apply -f role-binding.yaml
+   kubectl apply -f pod.yaml
+   ```
+   这些步骤使Pod中的Service Account具有对指定ConfigMap的读写权限。
+
+   如果ConfigMap是跨Namespace的，使用ClusterRole和ClusterRoleBinding代替Role和RoleBinding，并确保在所有需要访问ConfigMap的Namespace中应用这些配置。
+
 # 二、Maven Dependency
 Apollo的客户端jar包已经上传到中央仓库，应用在实际使用时只需要按照如下方式引入即可。
 ```xml
diff --git a/docs/zh/client/other-language-client-user-guide.md b/docs/zh/client/other-language-client-user-guide.md
index 669134f2db6..260ba42a26f 100644
--- a/docs/zh/client/other-language-client-user-guide.md
+++ b/docs/zh/client/other-language-client-user-guide.md
@@ -117,7 +117,7 @@ Apollo提供了基于Http long polling的配置更新推送通知，第三方客
 4. 如果传过来的notifications信息中发现有notificationId比服务端老，则直接返回对应namespace的最新notificationId, HttpStatus 200。
 5. 客户端拿到服务端返回后，判断返回的HttpStatus
 6. 如果返回的HttpStatus是304，说明配置没有变化，重新执行第1步
-7. 如果返回的HttpStauts是200，说明配置有变化，针对变化的namespace重新去服务端拉取配置，参见[1.3 通过不带缓存的Http接口从Apollo读取配置](#_13-%E9%80%9A%E8%BF%87%E4%B8%8D%E5%B8%A6%E7%BC%93%E5%AD%98%E7%9A%84http%E6%8E%A5%E5%8F%A3%E4%BB%8Eapollo%E8%AF%BB%E5%8F%96%E9%85%8D%E7%BD%AE)。同时更新notifications map中的notificationId。重新执行第1步。
+7. 如果返回的HttpStatus是200，说明配置有变化，针对变化的namespace重新去服务端拉取配置，参见[1.3 通过不带缓存的Http接口从Apollo读取配置](#_13-%E9%80%9A%E8%BF%87%E4%B8%8D%E5%B8%A6%E7%BC%93%E5%AD%98%E7%9A%84http%E6%8E%A5%E5%8F%A3%E4%BB%8Eapollo%E8%AF%BB%E5%8F%96%E9%85%8D%E7%BD%AE)。同时更新notifications map中的notificationId。重新执行第1步。
 
 
 ### 1.4.2 Http接口说明
diff --git a/docs/zh/deployment/distributed-deployment-guide.md b/docs/zh/deployment/distributed-deployment-guide.md
index 9394f7fe8af..f4243ad1991 100644
--- a/docs/zh/deployment/distributed-deployment-guide.md
+++ b/docs/zh/deployment/distributed-deployment-guide.md
@@ -1481,9 +1481,18 @@ http://5.5.5.5:8080/eureka/,http://6.6.6.6:8080/eureka/
 
 默认配置是20000。
 
-#### 3.2.5.1 namespace.value.length.limit.override - namespace 的配置项 value 最大长度限制
+#### 3.2.5.1 appid.value.length.limit.override - appId 维度的配置项 value 最大长度限制
+此配置用来覆盖 `item.value.length.limit` 的配置，做到控制 appId 粒度下的 value 最大长度限制，配置的值是一个 json 格式，json 的 key 为 appId，格式如下：
+```
+appid.value.length.limit.override = {"appId-demo1":200,"appId-demo2":300}
+```
+以上配置指定了 `appId-demo1` 下的所有 namespace 中的 value 最大长度限制为 200，`appId-demo2` 下的所有 namespace 中的 value 最大长度限制为 300
+
+当 `appId-demo1` 或 `appId-demo2` 下新建的 namespace 时，会自动继承该 namespace 的 value 最大长度限制，除非该 namespace 的配置项 value 最大长度限制被 `namespace.value.length.limit.override` 覆盖。
+
+#### 3.2.5.2 namespace.value.length.limit.override - namespace 的配置项 value 最大长度限制
 
-此配置用来覆盖 `item.value.length.limit` 的配置，做到细粒度控制 namespace 的 value 最大长度限制，配置的值是一个 json 格式，json 的 key 为 namespace 在数据库中的 id 值，格式如下：
+此配置用来覆盖 `item.value.length.limit` 或者 `appid.value.length.limit.override` 的配置，做到细粒度控制 namespace 的 value 最大长度限制，配置的值是一个 json 格式，json 的 key 为 namespace 在数据库中的 id 值，格式如下：
 ```
 namespace.value.length.limit.override = {1:200,3:20}
 ```
diff --git a/docs/zh/deployment/third-party-tool-btpanel.md b/docs/zh/deployment/third-party-tool-btpanel.md
new file mode 100644
index 00000000000..8669d56c87f
--- /dev/null
+++ b/docs/zh/deployment/third-party-tool-btpanel.md
@@ -0,0 +1,40 @@
+# 基于宝塔面板部署 Apollo
+
+## 前提
+
+- 仅适用于宝塔面板9.2.0及以上版本
+- 安装宝塔面板，前往[宝塔面板](https://www.bt.cn/new/index.html)官网，选择正式版的脚本下载安装
+
+## 部署
+
+1. 登录宝塔面板，在左侧菜单栏中点击 `Docker`
+![Docker](../images/deployment/btpanel/docker-menu.png)
+
+2. 首次会提示安装`Docker`和`Docker Compose`服务，点击立即安装，若已安装请忽略。
+![安装环境](../images/deployment/btpanel/install-docker.png)
+
+3. 安装完成后在`Docker-应用商店`中找到 `Apollo`，点击`安装`
+![安装](../images/deployment/btpanel/search-apollo.png)
+
+4. 设置域名等基本信息，点击`确定`
+- 名称：应用名称，默认`apollo_随机字符`
+- 版本选择：默认`latest`
+- 允许外部访问：如您需通过`IP+Port`直接访问，请勾选，如您已经设置了域名，请不要勾选此处
+- WEB 端口：默认`8070`，可自行修改
+- 通信端口：默认`8080`，可自行修改
+- 元数据端口：默认`8090`，可自行修改
+- **安全须知：**
+  - 请确保这些端口没有直接暴露在互联网上
+  - 配置您的防火墙以限制对这些端口的访问
+  - 验证这些端口没有被其他服务占用
+
+5. 提交后面板会自动进行应用初始化，大概需要`1-3`分钟，初始化完成后即可访问
+
+
+
+## 访问 Apollo
+- 请在浏览器地址栏中输入域名访问 `http://<宝塔面板IP>:8070`，即可访问 `Apollo` 控制台。
+![控制台](../images/deployment/btpanel/console.png)
+
+> 默认登录信息: username `apollo`, password `admin`，为了服务器安全，请在登陆后立即修改密码。
+
diff --git a/docs/zh/images/deployment/btpanel/console.png b/docs/zh/images/deployment/btpanel/console.png
new file mode 100644
index 00000000000..5fddc00b13e
Binary files /dev/null and b/docs/zh/images/deployment/btpanel/console.png differ
diff --git a/docs/zh/images/deployment/btpanel/docker-menu.png b/docs/zh/images/deployment/btpanel/docker-menu.png
new file mode 100644
index 00000000000..ae68589723b
Binary files /dev/null and b/docs/zh/images/deployment/btpanel/docker-menu.png differ
diff --git a/docs/zh/images/deployment/btpanel/install-docker.png b/docs/zh/images/deployment/btpanel/install-docker.png
new file mode 100644
index 00000000000..86c41a5e5d3
Binary files /dev/null and b/docs/zh/images/deployment/btpanel/install-docker.png differ
diff --git a/docs/zh/images/deployment/btpanel/search-apollo.png b/docs/zh/images/deployment/btpanel/search-apollo.png
new file mode 100644
index 00000000000..f8b9803bebb
Binary files /dev/null and b/docs/zh/images/deployment/btpanel/search-apollo.png differ
diff --git a/pom.xml b/pom.xml
index 9951a1596aa..28c55b0a404 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
 		2.4.0-SNAPSHOT
 		1.8
 		UTF-8
-		2.3.0-SNAPSHOT
+		2.5.0-SNAPSHOT
 		2.7.11
 		2021.0.5
 		
diff --git a/scripts/openapi/bash/openapi-usage-example.sh b/scripts/openapi/bash/openapi-usage-example.sh
index 94fd78331ea..fec3fb826f0 100644
--- a/scripts/openapi/bash/openapi-usage-example.sh
+++ b/scripts/openapi/bash/openapi-usage-example.sh
@@ -22,7 +22,7 @@
 # Chinese reference website https://www.apolloconfig.com/#/zh/portal/apollo-open-api-platform
 # English reference website https://www.apolloconfig.com/#/en/portal/apollo-open-api-platform
 
-# export global varialbes
+# export global variables
 export APOLLO_PORTAL_ADDRESS=http://106.54.227.205
 export APOLLO_OPENAPI_TOKEN=284fe833cbaeecf2764801aa73965080b184fc88
 export CURL_OPTIONS=""
@@ -80,7 +80,7 @@ printf "\n"
 item_update ${APOLLO_ENV} ${APOLLO_APP_ID} default application ${temp_item_key} ${temp_item_value} "openapi-update-item" ${APOLLO_USER}
 printf "\n\n"
 
-echo "show Update an item of a namespace, if item doesn's exist, create it"
+echo "show Update an item of a namespace, if item doesn't exist, create it"
 sleep 1
 temp_item_key="openapi-usage-item_update_create_if_not_exists-key-$(date +%s)"
 temp_item_value="openapi-usage-item_update_create_if_not_exists-value-$(date +%s)"
diff --git a/scripts/openapi/bash/openapi.sh b/scripts/openapi/bash/openapi.sh
index 0d6291b3446..6c39eb7fae8 100644
--- a/scripts/openapi/bash/openapi.sh
+++ b/scripts/openapi/bash/openapi.sh
@@ -284,7 +284,7 @@ BODY
 }
 
 #######################################
-# Update an item of a namespace, if item doesn's exist, create it.
+# Update an item of a namespace, if item doesn't exist, create it.
 # 修改配置，当配置不存在时自动创建
 # Arguments:
 #   env
diff --git a/scripts/sql/profiles/h2-default/apolloconfigdb.sql b/scripts/sql/profiles/h2-default/apolloconfigdb.sql
index a9752c286cc..44db55f50c8 100644
--- a/scripts/sql/profiles/h2-default/apolloconfigdb.sql
+++ b/scripts/sql/profiles/h2-default/apolloconfigdb.sql
@@ -142,8 +142,8 @@ CREATE TABLE `Commit` (
   `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
   `ChangeSets` longtext NOT NULL COMMENT '修改变更集',
   `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
-  `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
+  `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
+  `NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
   `Comment` varchar(500) DEFAULT NULL COMMENT '备注',
   `IsDeleted` boolean NOT NULL DEFAULT FALSE COMMENT '1: deleted, 0: normal',
   `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
@@ -258,8 +258,8 @@ CREATE TABLE `Item` (
 CREATE TABLE `Namespace` (
   `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
   `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
-  `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name',
+  `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
+  `NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name',
   `IsDeleted` boolean NOT NULL DEFAULT FALSE COMMENT '1: deleted, 0: normal',
   `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
   `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
@@ -304,8 +304,8 @@ CREATE TABLE `Release` (
   `Name` varchar(64) NOT NULL DEFAULT 'default' COMMENT '发布名字',
   `Comment` varchar(256) DEFAULT NULL COMMENT '发布说明',
   `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
-  `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
+  `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
+  `NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
   `Configurations` longtext NOT NULL COMMENT '发布配置',
   `IsAbandoned` boolean NOT NULL DEFAULT FALSE COMMENT '是否废弃',
   `IsDeleted` boolean NOT NULL DEFAULT FALSE COMMENT '1: deleted, 0: normal',
diff --git a/scripts/sql/profiles/h2-default/delta/v230-v240/apolloconfigdb-v230-v240.sql b/scripts/sql/profiles/h2-default/delta/v230-v240/apolloconfigdb-v230-v240.sql
index 459c12ff9b4..fc006312b40 100644
--- a/scripts/sql/profiles/h2-default/delta/v230-v240/apolloconfigdb-v230-v240.sql
+++ b/scripts/sql/profiles/h2-default/delta/v230-v240/apolloconfigdb-v230-v240.sql
@@ -33,6 +33,28 @@ CREATE ALIAS IF NOT EXISTS UNIX_TIMESTAMP FOR "com.ctrip.framework.apollo.common
 
 ALTER TABLE `AccessKey` ADD COLUMN `Mode` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '密钥模式，0: filter，1: observer' AFTER `Secret`;
 
+ALTER TABLE `Commit` MODIFY COLUMN `ClusterName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name';
+ALTER TABLE `Commit` MODIFY COLUMN `NamespaceName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name';
+
+ALTER TABLE `Namespace` MODIFY COLUMN `ClusterName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name';
+ALTER TABLE `Namespace` MODIFY COLUMN `NamespaceName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name';
+
+ALTER TABLE `Release` MODIFY COLUMN `ClusterName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name';
+ALTER TABLE `Release` MODIFY COLUMN `NamespaceName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name';
+
+ALTER TABLE `Commit` DROP INDEX `Commit_ClusterName`;
+ALTER TABLE `Commit` DROP INDEX `Commit_NamespaceName`;
+ALTER TABLE `Commit` ADD INDEX `Commit_ClusterName`  (`ClusterName`);
+ALTER TABLE `Commit` ADD INDEX `Commit_NamespaceName`  (`NamespaceName`);
+
+ALTER TABLE `Namespace` DROP INDEX `Namespace_UK_AppId_ClusterName_NamespaceName_DeletedAt`;
+ALTER TABLE `Namespace` DROP INDEX `Namespace_IX_NamespaceName`;
+ALTER TABLE `Namespace` ADD UNIQUE INDEX `Namespace_UK_AppId_ClusterName_NamespaceName_DeletedAt`  (`AppId`,`ClusterName`,`NamespaceName`,`DeletedAt`);
+ALTER TABLE `Namespace` ADD INDEX `Namespace_IX_NamespaceName`  (`NamespaceName`);
+
+ALTER TABLE `Release` DROP INDEX `Release_AppId_ClusterName_GroupName`;
+ALTER TABLE `Release` ADD INDEX `Release_AppId_ClusterName_GroupName`  (`AppId`,`ClusterName`,`NamespaceName`);
+
 -- 
 -- ===============================================================================
 -- ==                                                                           ==
diff --git a/scripts/sql/profiles/mysql-database-not-specified/apolloconfigdb.sql b/scripts/sql/profiles/mysql-database-not-specified/apolloconfigdb.sql
index 6c918f5f65c..9c5a40bbcbd 100644
--- a/scripts/sql/profiles/mysql-database-not-specified/apolloconfigdb.sql
+++ b/scripts/sql/profiles/mysql-database-not-specified/apolloconfigdb.sql
@@ -142,8 +142,8 @@ CREATE TABLE `Commit` (
   `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
   `ChangeSets` longtext NOT NULL COMMENT '修改变更集',
   `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
-  `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
+  `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
+  `NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
   `Comment` varchar(500) DEFAULT NULL COMMENT '备注',
   `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
   `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
@@ -154,8 +154,8 @@ CREATE TABLE `Commit` (
   PRIMARY KEY (`Id`),
   KEY `DataChange_LastTime` (`DataChange_LastTime`),
   KEY `AppId` (`AppId`),
-  KEY `ClusterName` (`ClusterName`(191)),
-  KEY `NamespaceName` (`NamespaceName`(191))
+  KEY `ClusterName` (`ClusterName`),
+  KEY `NamespaceName` (`NamespaceName`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='commit 历史表';
 
 -- Dump of table grayreleaserule
@@ -263,8 +263,8 @@ DROP TABLE IF EXISTS `Namespace`;
 CREATE TABLE `Namespace` (
   `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
   `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
-  `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name',
+  `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
+  `NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name',
   `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
   `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
   `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
@@ -272,9 +272,9 @@ CREATE TABLE `Namespace` (
   `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
   `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
   PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_AppId_ClusterName_NamespaceName_DeletedAt` (`AppId`,`ClusterName`(191),`NamespaceName`(191),`DeletedAt`),
+  UNIQUE KEY `UK_AppId_ClusterName_NamespaceName_DeletedAt` (`AppId`,`ClusterName`,`NamespaceName`,`DeletedAt`),
   KEY `DataChange_LastTime` (`DataChange_LastTime`),
-  KEY `IX_NamespaceName` (`NamespaceName`(191))
+  KEY `IX_NamespaceName` (`NamespaceName`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='命名空间';
 
 
@@ -311,8 +311,8 @@ CREATE TABLE `Release` (
   `Name` varchar(64) NOT NULL DEFAULT 'default' COMMENT '发布名字',
   `Comment` varchar(256) DEFAULT NULL COMMENT '发布说明',
   `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
-  `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
+  `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
+  `NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
   `Configurations` longtext NOT NULL COMMENT '发布配置',
   `IsAbandoned` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否废弃',
   `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
@@ -323,7 +323,7 @@ CREATE TABLE `Release` (
   `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
   PRIMARY KEY (`Id`),
   UNIQUE KEY `UK_ReleaseKey_DeletedAt` (`ReleaseKey`,`DeletedAt`),
-  KEY `AppId_ClusterName_GroupName` (`AppId`,`ClusterName`(191),`NamespaceName`(191)),
+  KEY `AppId_ClusterName_GroupName` (`AppId`,`ClusterName`,`NamespaceName`),
   KEY `DataChange_LastTime` (`DataChange_LastTime`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='发布';
 
diff --git a/scripts/sql/profiles/mysql-database-not-specified/delta/v230-v240/apolloconfigdb-v230-v240.sql b/scripts/sql/profiles/mysql-database-not-specified/delta/v230-v240/apolloconfigdb-v230-v240.sql
index c71b792aa6e..a701241a079 100644
--- a/scripts/sql/profiles/mysql-database-not-specified/delta/v230-v240/apolloconfigdb-v230-v240.sql
+++ b/scripts/sql/profiles/mysql-database-not-specified/delta/v230-v240/apolloconfigdb-v230-v240.sql
@@ -29,6 +29,30 @@
 ALTER TABLE `AccessKey`
     ADD COLUMN `Mode` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '密钥模式，0: filter，1: observer' AFTER `Secret`;
 
+ALTER TABLE `Commit`
+    MODIFY COLUMN `ClusterName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
+    MODIFY COLUMN `NamespaceName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name';
+ALTER TABLE `Namespace`
+    MODIFY COLUMN `ClusterName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
+    MODIFY COLUMN `NamespaceName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name';
+ALTER TABLE `Release`
+    MODIFY COLUMN `ClusterName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
+    MODIFY COLUMN `NamespaceName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name';
+
+ALTER TABLE `Commit`
+    DROP INDEX `ClusterName`,
+    DROP INDEX `NamespaceName`,
+    ADD INDEX `ClusterName` (`ClusterName`),
+    ADD INDEX `NamespaceName` (`NamespaceName`);
+ALTER TABLE `Namespace`
+    DROP INDEX `UK_AppId_ClusterName_NamespaceName_DeletedAt`,
+    DROP INDEX `IX_NamespaceName`,
+    ADD UNIQUE INDEX `UK_AppId_ClusterName_NamespaceName_DeletedAt` (`AppId`,`ClusterName`,`NamespaceName`,`DeletedAt`),
+    ADD INDEX `IX_NamespaceName` (`NamespaceName`);
+ALTER TABLE `Release`
+    DROP INDEX `AppId_ClusterName_GroupName`,
+    ADD INDEX `AppId_ClusterName_GroupName` (`AppId`,`ClusterName`,`NamespaceName`);
+
 -- 
 -- ===============================================================================
 -- ==                                                                           ==
diff --git a/scripts/sql/profiles/mysql-default/apolloconfigdb.sql b/scripts/sql/profiles/mysql-default/apolloconfigdb.sql
index dc751162d2a..96bd39b5edb 100644
--- a/scripts/sql/profiles/mysql-default/apolloconfigdb.sql
+++ b/scripts/sql/profiles/mysql-default/apolloconfigdb.sql
@@ -147,8 +147,8 @@ CREATE TABLE `Commit` (
   `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
   `ChangeSets` longtext NOT NULL COMMENT '修改变更集',
   `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
-  `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
+  `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
+  `NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
   `Comment` varchar(500) DEFAULT NULL COMMENT '备注',
   `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
   `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
@@ -159,8 +159,8 @@ CREATE TABLE `Commit` (
   PRIMARY KEY (`Id`),
   KEY `DataChange_LastTime` (`DataChange_LastTime`),
   KEY `AppId` (`AppId`),
-  KEY `ClusterName` (`ClusterName`(191)),
-  KEY `NamespaceName` (`NamespaceName`(191))
+  KEY `ClusterName` (`ClusterName`),
+  KEY `NamespaceName` (`NamespaceName`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='commit 历史表';
 
 -- Dump of table grayreleaserule
@@ -268,8 +268,8 @@ DROP TABLE IF EXISTS `Namespace`;
 CREATE TABLE `Namespace` (
   `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
   `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
-  `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name',
+  `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
+  `NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name',
   `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
   `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
   `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
@@ -277,9 +277,9 @@ CREATE TABLE `Namespace` (
   `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
   `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
   PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_AppId_ClusterName_NamespaceName_DeletedAt` (`AppId`,`ClusterName`(191),`NamespaceName`(191),`DeletedAt`),
+  UNIQUE KEY `UK_AppId_ClusterName_NamespaceName_DeletedAt` (`AppId`,`ClusterName`,`NamespaceName`,`DeletedAt`),
   KEY `DataChange_LastTime` (`DataChange_LastTime`),
-  KEY `IX_NamespaceName` (`NamespaceName`(191))
+  KEY `IX_NamespaceName` (`NamespaceName`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='命名空间';
 
 
@@ -316,8 +316,8 @@ CREATE TABLE `Release` (
   `Name` varchar(64) NOT NULL DEFAULT 'default' COMMENT '发布名字',
   `Comment` varchar(256) DEFAULT NULL COMMENT '发布说明',
   `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
-  `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
+  `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
+  `NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
   `Configurations` longtext NOT NULL COMMENT '发布配置',
   `IsAbandoned` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否废弃',
   `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
@@ -328,7 +328,7 @@ CREATE TABLE `Release` (
   `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
   PRIMARY KEY (`Id`),
   UNIQUE KEY `UK_ReleaseKey_DeletedAt` (`ReleaseKey`,`DeletedAt`),
-  KEY `AppId_ClusterName_GroupName` (`AppId`,`ClusterName`(191),`NamespaceName`(191)),
+  KEY `AppId_ClusterName_GroupName` (`AppId`,`ClusterName`,`NamespaceName`),
   KEY `DataChange_LastTime` (`DataChange_LastTime`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='发布';
 
diff --git a/scripts/sql/profiles/mysql-default/delta/v230-v240/apolloconfigdb-v230-v240.sql b/scripts/sql/profiles/mysql-default/delta/v230-v240/apolloconfigdb-v230-v240.sql
index 8bb5fdc1a0e..e7eb20b187b 100644
--- a/scripts/sql/profiles/mysql-default/delta/v230-v240/apolloconfigdb-v230-v240.sql
+++ b/scripts/sql/profiles/mysql-default/delta/v230-v240/apolloconfigdb-v230-v240.sql
@@ -31,6 +31,30 @@ Use ApolloConfigDB;
 ALTER TABLE `AccessKey`
     ADD COLUMN `Mode` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '密钥模式，0: filter，1: observer' AFTER `Secret`;
 
+ALTER TABLE `Commit`
+    MODIFY COLUMN `ClusterName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
+    MODIFY COLUMN `NamespaceName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name';
+ALTER TABLE `Namespace`
+    MODIFY COLUMN `ClusterName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
+    MODIFY COLUMN `NamespaceName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name';
+ALTER TABLE `Release`
+    MODIFY COLUMN `ClusterName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
+    MODIFY COLUMN `NamespaceName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name';
+
+ALTER TABLE `Commit`
+    DROP INDEX `ClusterName`,
+    DROP INDEX `NamespaceName`,
+    ADD INDEX `ClusterName` (`ClusterName`),
+    ADD INDEX `NamespaceName` (`NamespaceName`);
+ALTER TABLE `Namespace`
+    DROP INDEX `UK_AppId_ClusterName_NamespaceName_DeletedAt`,
+    DROP INDEX `IX_NamespaceName`,
+    ADD UNIQUE INDEX `UK_AppId_ClusterName_NamespaceName_DeletedAt` (`AppId`,`ClusterName`,`NamespaceName`,`DeletedAt`),
+    ADD INDEX `IX_NamespaceName` (`NamespaceName`);
+ALTER TABLE `Release`
+    DROP INDEX `AppId_ClusterName_GroupName`,
+    ADD INDEX `AppId_ClusterName_GroupName` (`AppId`,`ClusterName`,`NamespaceName`);
+
 -- 
 -- ===============================================================================
 -- ==                                                                           ==
diff --git a/scripts/sql/src/apolloconfigdb.sql b/scripts/sql/src/apolloconfigdb.sql
index 783cad8bcf2..d470643fc6e 100644
--- a/scripts/sql/src/apolloconfigdb.sql
+++ b/scripts/sql/src/apolloconfigdb.sql
@@ -135,8 +135,8 @@ CREATE TABLE `Commit` (
   `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
   `ChangeSets` longtext NOT NULL COMMENT '修改变更集',
   `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
-  `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
+  `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
+  `NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
   `Comment` varchar(500) DEFAULT NULL COMMENT '备注',
   `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
   `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
@@ -147,8 +147,8 @@ CREATE TABLE `Commit` (
   PRIMARY KEY (`Id`),
   KEY `DataChange_LastTime` (`DataChange_LastTime`),
   KEY `AppId` (`AppId`),
-  KEY `ClusterName` (`ClusterName`(191)),
-  KEY `NamespaceName` (`NamespaceName`(191))
+  KEY `ClusterName` (`ClusterName`),
+  KEY `NamespaceName` (`NamespaceName`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='commit 历史表';
 
 -- Dump of table grayreleaserule
@@ -256,8 +256,8 @@ DROP TABLE IF EXISTS `Namespace`;
 CREATE TABLE `Namespace` (
   `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
   `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
-  `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name',
+  `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
+  `NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name',
   `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
   `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
   `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
@@ -265,9 +265,9 @@ CREATE TABLE `Namespace` (
   `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
   `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
   PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_AppId_ClusterName_NamespaceName_DeletedAt` (`AppId`,`ClusterName`(191),`NamespaceName`(191),`DeletedAt`),
+  UNIQUE KEY `UK_AppId_ClusterName_NamespaceName_DeletedAt` (`AppId`,`ClusterName`,`NamespaceName`,`DeletedAt`),
   KEY `DataChange_LastTime` (`DataChange_LastTime`),
-  KEY `IX_NamespaceName` (`NamespaceName`(191))
+  KEY `IX_NamespaceName` (`NamespaceName`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='命名空间';
 
 
@@ -304,8 +304,8 @@ CREATE TABLE `Release` (
   `Name` varchar(64) NOT NULL DEFAULT 'default' COMMENT '发布名字',
   `Comment` varchar(256) DEFAULT NULL COMMENT '发布说明',
   `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
-  `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
+  `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
+  `NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
   `Configurations` longtext NOT NULL COMMENT '发布配置',
   `IsAbandoned` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否废弃',
   `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
@@ -316,7 +316,7 @@ CREATE TABLE `Release` (
   `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
   PRIMARY KEY (`Id`),
   UNIQUE KEY `UK_ReleaseKey_DeletedAt` (`ReleaseKey`,`DeletedAt`),
-  KEY `AppId_ClusterName_GroupName` (`AppId`,`ClusterName`(191),`NamespaceName`(191)),
+  KEY `AppId_ClusterName_GroupName` (`AppId`,`ClusterName`,`NamespaceName`),
   KEY `DataChange_LastTime` (`DataChange_LastTime`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='发布';
 
diff --git a/scripts/sql/src/delta/v230-v240/apolloconfigdb-v230-v240.sql b/scripts/sql/src/delta/v230-v240/apolloconfigdb-v230-v240.sql
index 2e3cddfbbea..ca5e853fcee 100644
--- a/scripts/sql/src/delta/v230-v240/apolloconfigdb-v230-v240.sql
+++ b/scripts/sql/src/delta/v230-v240/apolloconfigdb-v230-v240.sql
@@ -22,4 +22,28 @@
 ALTER TABLE `AccessKey`
     ADD COLUMN `Mode` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '密钥模式，0: filter，1: observer' AFTER `Secret`;
 
+ALTER TABLE `Commit`
+    MODIFY COLUMN `ClusterName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
+    MODIFY COLUMN `NamespaceName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name';
+ALTER TABLE `Namespace`
+    MODIFY COLUMN `ClusterName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
+    MODIFY COLUMN `NamespaceName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name';
+ALTER TABLE `Release`
+    MODIFY COLUMN `ClusterName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
+    MODIFY COLUMN `NamespaceName` VARCHAR(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name';
+
+ALTER TABLE `Commit`
+    DROP INDEX `ClusterName`,
+    DROP INDEX `NamespaceName`,
+    ADD INDEX `ClusterName` (`ClusterName`),
+    ADD INDEX `NamespaceName` (`NamespaceName`);
+ALTER TABLE `Namespace`
+    DROP INDEX `UK_AppId_ClusterName_NamespaceName_DeletedAt`,
+    DROP INDEX `IX_NamespaceName`,
+    ADD UNIQUE INDEX `UK_AppId_ClusterName_NamespaceName_DeletedAt` (`AppId`,`ClusterName`,`NamespaceName`,`DeletedAt`),
+    ADD INDEX `IX_NamespaceName` (`NamespaceName`);
+ALTER TABLE `Release`
+    DROP INDEX `AppId_ClusterName_GroupName`,
+    ADD INDEX `AppId_ClusterName_GroupName` (`AppId`,`ClusterName`,`NamespaceName`);
+
 -- ${gists.autoGeneratedDeclaration}


                             
                                 

+                                    
                                         {{'Component.Publish.Key' | translate }}
                                     
+                                    
                                         {{'Component.Publish.MasterValue' | translate }}
                                     
+                                    
                                         {{'Component.Publish.GrayValue' | translate }}
                                     
-                                        {{'Component.Publish.PublishedValue' | translate }}
-                                    
-                                        {{'Component.Publish.NoPublishedValue' | translate }}
-                                    
-                                        {{'Component.Publish.ModifyUser' | translate }}
-                                    
-                                        {{'Component.Publish.ModifyTime' | translate }}
+                                    
+                                        {{'Component.Publish.ModifyRecord' | translate }}
                                     
                                 

                             

-                                        
-                                    
+                                    
+                                        
                                     
+                                    
+                                        
+                                        
+