1 files changed, 11 insertions, 0 deletions
diff --git a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index db37edc4f..0a2a91fa6 100644
--- a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -9,10 +9,12 @@ import com.mitchellbosecke.pebble.loader.Loader;
 import com.mitchellbosecke.pebble.loader.ServletLoader;
 import com.mitchellbosecke.pebble.spring4.PebbleViewResolver;
 import com.mitchellbosecke.pebble.spring4.extension.SpringExtension;
+import org.springframework.beans.factory.config.PlaceholderConfigurerSupport;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.env.Environment;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
@@ -49,6 +51,15 @@ public class WebsocketConfiguration extends WebMvcConfigurationSupport implement
     private ServletContext servletContext;
 
     @Bean
+    public static PlaceholderConfigurerSupport propertySourcesPlaceholderConfigurer() {
+        PlaceholderConfigurerSupport configurer = new PropertySourcesPlaceholderConfigurer();
+
+        configurer.setFileEncoding("utf-8");
+        configurer.setOrder(1);
+        return configurer;
+    }
+
+    @Bean
     public WebsocketComponent wsHandler() {
         return new WebsocketComponent();
     }