Voomra/skeleton-springmvc
Archived
0
Fork 0
Code Activity

update dependency

Browse Source
This commit is contained in:
DmitriyMX
2018-09-23 14:48:38 +03:00
parent cd997be598
commit 486eb96106
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -81,7 +81,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.thymeleaf</groupId> <groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf-spring4</artifactId> <artifactId>thymeleaf-spring5</artifactId>
<version>3.0.9.RELEASE</version> <version>3.0.9.RELEASE</version>
</dependency> </dependency>

12
src/main/java/ru/dmitriymx/skeleton/springmvc/SpringConfigMVC.java
View File

@@ -7,10 +7,10 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.ViewResolver; import org.springframework.web.servlet.ViewResolver;
import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.thymeleaf.TemplateEngine; import org.thymeleaf.spring5.ISpringTemplateEngine;
import org.thymeleaf.spring4.SpringTemplateEngine; import org.thymeleaf.spring5.SpringTemplateEngine;
import org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver; import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
import org.thymeleaf.spring4.view.ThymeleafViewResolver; import org.thymeleaf.spring5.view.ThymeleafViewResolver;
import org.thymeleaf.templatemode.TemplateMode; import org.thymeleaf.templatemode.TemplateMode;
import org.thymeleaf.templateresolver.ITemplateResolver; import org.thymeleaf.templateresolver.ITemplateResolver;
@@ -34,7 +34,7 @@ public class SpringConfigMVC implements WebMvcConfigurer {
@Bean @Bean
@Autowired @Autowired
public TemplateEngine templateEngine(ITemplateResolver templateResolver){ public ISpringTemplateEngine templateEngine(ITemplateResolver templateResolver){
SpringTemplateEngine engine = new SpringTemplateEngine(); SpringTemplateEngine engine = new SpringTemplateEngine();
engine.setTemplateResolver(templateResolver); engine.setTemplateResolver(templateResolver);
return engine; return engine;
@@ -47,7 +47,7 @@ public class SpringConfigMVC implements WebMvcConfigurer {
*/ */
@Bean @Bean
@Autowired @Autowired
public ViewResolver viewResolver(TemplateEngine templateEngine) { public ViewResolver viewResolver(ISpringTemplateEngine templateEngine) {
ThymeleafViewResolver viewResolver = new ThymeleafViewResolver(); ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
viewResolver.setTemplateEngine(templateEngine); viewResolver.setTemplateEngine(templateEngine);
viewResolver.setContentType("text/html;charset=UTF-8"); viewResolver.setContentType("text/html;charset=UTF-8");