Merge branch 'master' into apollo/for/pr

apolloconfig · Dec 12, 2021 · 2f5ebaa · 2f5ebaa
2 parents 2ad325c + 4156c05
commit 2f5ebaa
Show file tree

Hide file tree

Showing 29 changed files with 63 additions and 1,672 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -24,6 +24,8 @@ Apollo 2.0.0
 * [Optimize top navbar style](https://github.com/apolloconfig/apollo/pull/4073)
 * [Support export/import configs by apollo env](https://github.com/apolloconfig/apollo/pull/3947)
 * [Catch LinkageError for ClassLoaderUtil.isClassPresent in case class is present but is failed to load](https://github.com/apolloconfig/apollo/pull/4097)
+* [Split helm chart into another repo](https://github.com/apolloconfig/apollo/pull/4125)
+* [fix gray publish refresh item status](https://github.com/apolloconfig/apollo/pull/4128)
 
 ------------------
 All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)
diff --git a/...ient/src/main/java/com/ctrip/framework/apollo/spring/annotation/SpringValueProcessor.java b/...ient/src/main/java/com/ctrip/framework/apollo/spring/annotation/SpringValueProcessor.java
@@ -28,6 +28,7 @@
 import com.google.common.collect.Multimap;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
+import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Set;
@@ -46,7 +47,7 @@
 /**
  * Spring value processor of field or method which has @Value and xml config placeholders.
  *
- * @author github.com/zhegexiaohuozi  seimimaster@gmail.com
+ * @author github.com/zhegexiaohuozi  seimimaster@gmail.com  mghio.dev@gmail.com
  * @since 2017/12/20.
  */
 public class SpringValueProcessor extends ApolloProcessor implements BeanFactoryPostProcessor, BeanFactoryAware {
@@ -94,17 +95,8 @@ protected void processField(Object bean, String beanName, Field field) {
     if (value == null) {
       return;
     }
-    Set<String> keys = placeholderHelper.extractPlaceholderKeys(value.value());
 
-    if (keys.isEmpty()) {
-      return;
-    }
-
-    for (String key : keys) {
-      SpringValue springValue = new SpringValue(key, value.value(), bean, beanName, field, false);
-      springValueRegistry.register(beanFactory, key, springValue);
-      logger.debug("Monitoring {}", springValue);
-    }
+    doRegister(bean, beanName, field, value);
   }
 
   @Override
@@ -124,20 +116,33 @@ protected void processMethod(Object bean, String beanName, Method method) {
       return;
     }
 
-    Set<String> keys = placeholderHelper.extractPlaceholderKeys(value.value());
+    doRegister(bean, beanName, method, value);
+  }
 
+  private void doRegister(Object bean, String beanName, Member member, Value value) {
+    Set<String> keys = placeholderHelper.extractPlaceholderKeys(value.value());
     if (keys.isEmpty()) {
       return;
     }
 
     for (String key : keys) {
-      SpringValue springValue = new SpringValue(key, value.value(), bean, beanName, method, false);
+      SpringValue springValue;
+      if (member instanceof Field) {
+        Field field = (Field) member;
+        springValue = new SpringValue(key, value.value(), bean, beanName, field, false);
+      } else if (member instanceof Method) {
+        Method method = (Method) member;
+        springValue = new SpringValue(key, value.value(), bean, beanName, method, false);
+      } else {
+        logger.error("Apollo @Value annotation currently only support to be used on methods and fields, "
+            + "but is used on {}", member.getClass());
+        return;
+      }
       springValueRegistry.register(beanFactory, key, springValue);
       logger.info("Monitoring {}", springValue);
     }
   }
 
-
   private void processBeanPropertyValues(Object bean, String beanName) {
     Collection<SpringValueDefinition> propertySpringValues = beanName2SpringValueDefinitions
         .get(beanName);

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
@@ -111,13 +111,16 @@ function releaseModalDirective($translate, toastr, AppUtil, EventManager, Releas
                             scope.releaseBtnDisabled = false;
 
                             //refresh item status
-                            scope.toReleaseNamespace.branchItems.forEach(function (item, index) {
+                            for (let index = 0; index < scope.toReleaseNamespace.branchItems.length; index++) {
+                                const item = scope.toReleaseNamespace.branchItems[index];
                                 if (item.isDeleted) {
                                     scope.toReleaseNamespace.branchItems.splice(index, 1);
+                                    index--;
                                 } else {
                                     item.isModified = false;
                                 }
-                            });
+                            }
+
                             //reset namespace status
                             scope.toReleaseNamespace.itemModifiedCnt = 0;
                             scope.toReleaseNamespace.lockOwner = undefined;

diff --git a/docs/en/community/team.md b/docs/en/community/team.md
@@ -8,25 +8,32 @@ For more information about the community governance model, please refer [GOVERNA
 
 Members include Project Management Committee members and committers. The list is in alphabet order.
 
-### Project Management Committee
+### Project Management Committee(PMC)
 
-| GitHub ID  | Name       | Organization |
-| ---------- | ---------- | ------------ |
-| JaredTan95 | Jared Tan  | DaoCloud     |
-| kezhenxu94 | Zhenxu Ke  | Tetrate      |
-| nobodyiam  | Jason Song | Ant Group    |
-| zouyx      | Joe Zou    | Shein        |
+| GitHub ID  | Name          | Organization |
+| ---------- | ------------- | ------------ |
+| Anilople   | Xiaoquan Wang | Some Bank    |
+| JaredTan95 | Jared Tan     | DaoCloud     |
+| kezhenxu94 | Zhenxu Ke     | Tetrate      |
+| lepdou     | Le Zhang      | Tencent      |
+| nobodyiam  | Jason Song    | Ant Group    |
+| zouyx      | Joe Zou       | Shein        |
 
 ### Committer
+
 | GitHub ID   | Name          | Organization |
 | ----------- | ------------- | ------------ |
-| Anilople    | Xiaoquan Wang | Some Bank    |
 | Accelerater | Zhuohao Li    | Daocloud     |
+| Anilople    | Xiaoquan Wang | Some Bank    |
+| JaredTan95  | Jared Tan     | DaoCloud     |
+| kezhenxu94  | Zhenxu Ke     | Tetrate      |
 | klboke      | Kailing Chen  | TapTap       |
-| lepdou      | Le Zhang      | Ant Group    |
+| lepdou      | Le Zhang      | Tencent      |
 | nisiyong    | Stephen Ni    | Qihoo 360    |
+| nobodyiam   | Jason Song    | Ant Group    |
 | pengweiqhca | Wei Peng      | Tuhu         |
 | vdisk-group | Lvqiu Ye      | Hundsun      |
+| zouyx       | Joe Zou       | Shein        |
 
 ## Contributors
 

diff --git a/docs/zh/community/team.md b/docs/zh/community/team.md
@@ -10,23 +10,30 @@ Member 包括 PMC 成员和 Committer，该列表按字母顺序排列。
 
 ### Project Management Committee(PMC)
 
-| GitHub ID  | Name       | Organization |
-| ---------- | ---------- | ------------ |
-| JaredTan95 | Jared Tan  | DaoCloud     |
-| kezhenxu94 | Zhenxu Ke  | Tetrate      |
-| nobodyiam  | Jason Song | Ant Group    |
-| zouyx      | Joe Zou    | Shein        |
+| GitHub ID  | Name          | Organization |
+| ---------- | ------------- | ------------ |
+| Anilople   | Xiaoquan Wang | Some Bank    |
+| JaredTan95 | Jared Tan     | DaoCloud     |
+| kezhenxu94 | Zhenxu Ke     | Tetrate      |
+| lepdou     | Le Zhang      | Tencent      |
+| nobodyiam  | Jason Song    | Ant Group    |
+| zouyx      | Joe Zou       | Shein        |
 
 ### Committer
+
 | GitHub ID   | Name          | Organization |
 | ----------- | ------------- | ------------ |
-| Anilople    | Xiaoquan Wang | Some Bank    |
 | Accelerater | Zhuohao Li    | Daocloud     |
+| Anilople    | Xiaoquan Wang | Some Bank    |
+| JaredTan95  | Jared Tan     | DaoCloud     |
+| kezhenxu94  | Zhenxu Ke     | Tetrate      |
 | klboke      | Kailing Chen  | TapTap       |
-| lepdou      | Le Zhang      | Ant Group    |
+| lepdou      | Le Zhang      | Tencent      |
 | nisiyong    | Stephen Ni    | Qihoo 360    |
+| nobodyiam   | Jason Song    | Ant Group    |
 | pengweiqhca | Wei Peng      | Tuhu         |
 | vdisk-group | Lvqiu Ye      | Hundsun      |
+| zouyx       | Joe Zou       | Shein        |
 
 ## Contributor
 

diff --git a/docs/zh/deployment/distributed-deployment-guide.md b/docs/zh/deployment/distributed-deployment-guide.md
@@ -672,7 +672,7 @@ Apollo 1.7.0版本增加了基于Kubernetes原生服务发现的部署模式，
 #### 2.4.1.2 添加Apollo Helm Chart仓库
 
 ```bash
-$ helm repo add apollo https://www.apolloconfig.com/charts
+$ helm repo add apollo https://charts.apolloconfig.com
 $ helm search repo apollo
 ```
 

diff --git a/docs/zh/development/apollo-release-guide.md b/docs/zh/development/apollo-release-guide.md
@@ -119,15 +119,15 @@ github 创建 pre-release
 
 ### 4.8.1 更新 chart 内容
 
-1. cd ${apollo_home}/scripts/helm
+1. cd [apollo-helm-chart](https://github.com/apolloconfig/apollo-helm-chart)
 2. helm package apollo-portal && helm package apollo-service
-3. mv *.tgz ${apollo_home}/apollo/docs/charts/
-4. cd ${apollo_home}/apollo/docs/charts/
+3. mv *.tgz docs
+4. cd docs
 5. helm repo index .
 
-### 4.8.2 分支合并到 master
+### 4.8.2 分支合并到 main
 
-创建一个 pull request，把上述产物合并到 master 分支。
+创建一个 pull request，把上述产物合并到 [main](https://github.com/apolloconfig/apollo-helm-chart) 分支。
 
 # 5. 发布公告