Merge branch 'master' into ldap_support_ad

README.md

@@ -229,3 +229,5 @@ The project is licensed under the [Apache 2 license](https://github.com/ctripcor
 ![小影](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/known-users/xiaoying.png) 
 ![彩贝壳](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/known-users/caibeike.png) 
 ![YEELIGHT](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/known-users/yeelight.png) 
+![积目](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/known-users/itsgmu.png) 
+![极致医疗](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/known-users/acmedcare.png) 

apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceAutoConfiguration.java

@@ -14,6 +14,7 @@ import com.ctrip.framework.apollo.configservice.service.config.DefaultConfigServ
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.security.crypto.password.NoOpPasswordEncoder;
 
 /**
  * @author Jason Song(song_s@ctrip.com)
@@ -37,6 +38,11 @@ public class ConfigServiceAutoConfiguration {
     return new DefaultConfigService();
   }
 
+  @Bean
+  public static NoOpPasswordEncoder passwordEncoder() {
+    return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance();
+  }
+
   @Configuration
   static class MessageScannerConfiguration {
     @Autowired