Merge pull request #1525 from nobodyiam/issue-1482

fix #1482

apollo-client/src/main/java/com/ctrip/framework/apollo/spring/annotation/ApolloConfigRegistrar.java

 package com.ctrip.framework.apollo.spring.annotation;
 
 import com.ctrip.framework.apollo.spring.property.SpringValueDefinitionProcessor;
+import java.util.HashMap;
+import java.util.Map;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
@@ -23,8 +25,12 @@ public class ApolloConfigRegistrar implements ImportBeanDefinitionRegistrar {
     int order = attributes.getNumber("order");
     PropertySourcesProcessor.addNamespaces(Lists.newArrayList(namespaces), order);
 
+    Map<String, Object> propertySourcesPlaceholderPropertyValues = new HashMap<>();
+    // to make sure the default PropertySourcesPlaceholderConfigurer's priority is higher than PropertyPlaceholderConfigurer
+    propertySourcesPlaceholderPropertyValues.put("order", 0);
+
     BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, PropertySourcesPlaceholderConfigurer.class.getName(),
-        PropertySourcesPlaceholderConfigurer.class);
+        PropertySourcesPlaceholderConfigurer.class, propertySourcesPlaceholderPropertyValues);
 
     BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, PropertySourcesProcessor.class.getName(),
         PropertySourcesProcessor.class);

apollo-client/src/main/java/com/ctrip/framework/apollo/spring/config/ConfigPropertySourcesProcessor.java

@@ -3,6 +3,8 @@ package com.ctrip.framework.apollo.spring.config;
 import com.ctrip.framework.apollo.spring.annotation.SpringValueProcessor;
 import com.ctrip.framework.apollo.spring.property.SpringValueDefinitionProcessor;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValueProcessor;
+import java.util.HashMap;
+import java.util.Map;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
@@ -21,8 +23,12 @@ public class ConfigPropertySourcesProcessor extends PropertySourcesProcessor
 
   @Override
   public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
+    Map<String, Object> propertySourcesPlaceholderPropertyValues = new HashMap<>();
+    // to make sure the default PropertySourcesPlaceholderConfigurer's priority is higher than PropertyPlaceholderConfigurer
+    propertySourcesPlaceholderPropertyValues.put("order", 0);
+
     BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, PropertySourcesPlaceholderConfigurer.class.getName(),
-        PropertySourcesPlaceholderConfigurer.class);
+        PropertySourcesPlaceholderConfigurer.class, propertySourcesPlaceholderPropertyValues);
     BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, ApolloAnnotationProcessor.class.getName(),
         ApolloAnnotationProcessor.class);
     BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, SpringValueProcessor.class.getName(), SpringValueProcessor.class);

apollo-client/src/main/java/com/ctrip/framework/apollo/spring/util/BeanRegistrationUtil.java

 package com.ctrip.framework.apollo.spring.util;
 
+import java.util.Map;
 import java.util.Objects;
 
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -12,6 +13,11 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 public class BeanRegistrationUtil {
   public static boolean registerBeanDefinitionIfNotExists(BeanDefinitionRegistry registry, String beanName,
       Class<?> beanClass) {
+    return registerBeanDefinitionIfNotExists(registry, beanName, beanClass, null);
+  }
+
+  public static boolean registerBeanDefinitionIfNotExists(BeanDefinitionRegistry registry, String beanName,
+                                                          Class<?> beanClass, Map<String, Object> extraPropertyValues) {
     if (registry.containsBeanDefinition(beanName)) {
       return false;
     }
@@ -25,9 +31,18 @@ public class BeanRegistrationUtil {
       }
     }
 
-    BeanDefinition annotationProcessor = BeanDefinitionBuilder.genericBeanDefinition(beanClass).getBeanDefinition();
-    registry.registerBeanDefinition(beanName, annotationProcessor);
+    BeanDefinition beanDefinition = BeanDefinitionBuilder.genericBeanDefinition(beanClass).getBeanDefinition();
+
+    if (extraPropertyValues != null) {
+      for (Map.Entry<String, Object> entry : extraPropertyValues.entrySet()) {
+        beanDefinition.getPropertyValues().add(entry.getKey(), entry.getValue());
+      }
+    }
+
+    registry.registerBeanDefinition(beanName, beanDefinition);
 
     return true;
   }
+
+
 }