|
|
@@ -41,14 +41,13 @@ public class WebAppConfiguration extends WebMvcConfigurerAdapter {
|
|
|
// 使用/src/main/webapp下资源均需在此添加
|
|
|
registry.addResourceHandler("/static/**").addResourceLocations("/resources/");
|
|
|
registry.addResourceHandler("/WEB-INF/**").addResourceLocations("/WEB-INF/");
|
|
|
- registry.addResourceHandler("/html/**").addResourceLocations("/html/");
|
|
|
registry.addResourceHandler("/app/**").addResourceLocations("/app/");
|
|
|
super.addResourceHandlers(registry);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public void configureViewResolvers(ViewResolverRegistry registry) {
|
|
|
- InternalResourceViewResolver viewResolver = new InternalResourceViewResolver("", ".html");
|
|
|
+ InternalResourceViewResolver viewResolver = new InternalResourceViewResolver("/WEB-INF/views/", ".html");
|
|
|
viewResolver.setContentType("text/html;charset=UTF-8");
|
|
|
registry.viewResolver(viewResolver);
|
|
|
super.configureViewResolvers(registry);
|
|
|
@@ -56,13 +55,15 @@ public class WebAppConfiguration extends WebMvcConfigurerAdapter {
|
|
|
|
|
|
@Override
|
|
|
public void addViewControllers(ViewControllerRegistry registry) {
|
|
|
- registry.addViewController("/").setViewName("/WEB-INF/views/index");
|
|
|
- registry.addViewController("/index").setViewName("/WEB-INF/views/index");
|
|
|
- registry.addViewController("/console").setViewName("/WEB-INF/views/console");
|
|
|
- registry.addViewController("/fileUpload").setViewName("/WEB-INF/views/fileUpload");
|
|
|
- registry.addViewController("/board").setViewName("/html/board");
|
|
|
- registry.addViewController("/desktop").setViewName("/html/desktop");
|
|
|
- registry.addViewController("/login").setViewName("/html/login");
|
|
|
+ registry.addViewController("/").setViewName("desktop");
|
|
|
+ registry.addViewController("/index").setViewName("desktop");
|
|
|
+ registry.addViewController("/desktop").setViewName("desktop");
|
|
|
+ registry.addViewController("/board").setViewName("board");
|
|
|
+ registry.addViewController("/boardshow").setViewName("boardshow");
|
|
|
+ registry.addViewController("/login").setViewName("login");
|
|
|
+
|
|
|
+ registry.addViewController("/console").setViewName("console");
|
|
|
+ registry.addViewController("/fileUpload").setViewName("fileUpload");
|
|
|
super.addViewControllers(registry);
|
|
|
}
|
|
|
|
sunyj
