Commit c601f57b authored by Jason Song's avatar Jason Song Committed by GitHub

Merge pull request #1618 from birdie7761/ctrip-apollo-master

Fix #1609
parents 7b19853d 71313dcc
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment