Commit a7ebb8c2 by fsn

第二个可用版本

parent ee9ead26
...@@ -156,10 +156,6 @@ ...@@ -156,10 +156,6 @@
<resources> <resources>
<resource> <resource>
<directory>src/main/webapp</directory> <directory>src/main/webapp</directory>
<includes>
<include>**/**</include>
</includes>
<targetPath>/META-INF/resources</targetPath>
</resource> </resource>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
......
...@@ -29,7 +29,7 @@ public class WebConfig { ...@@ -29,7 +29,7 @@ public class WebConfig {
@Bean(initMethod = "init") @Bean(initMethod = "init")
public BeetlConfiguration beetlConfiguration() { public BeetlConfiguration beetlConfiguration() {
BeetlConfiguration beetlConfiguration = new BeetlConfiguration(); BeetlConfiguration beetlConfiguration = new BeetlConfiguration();
beetlConfiguration.setResourceLoader(new ClasspathResourceLoader(WebConfig.class.getClassLoader(), "/templates")); beetlConfiguration.setResourceLoader(new ClasspathResourceLoader(WebConfig.class.getClassLoader(), "/WEB-INF/view"));
beetlConfiguration.setConfigProperties(BeetlProperties.newInstance()); beetlConfiguration.setConfigProperties(BeetlProperties.newInstance());
return beetlConfiguration; return beetlConfiguration;
} }
......
...@@ -76,7 +76,7 @@ public class NoticeController extends BaseController { ...@@ -76,7 +76,7 @@ public class NoticeController extends BaseController {
public String hello() { public String hello() {
List<Map<String, Object>> notices = noticeDao.list(null); List<Map<String, Object>> notices = noticeDao.list(null);
super.setAttr("noticeList",notices); super.setAttr("noticeList",notices);
return "blackboard.html"; return "/blackboard.html";
} }
/** /**
......
...@@ -6,7 +6,7 @@ spring: ...@@ -6,7 +6,7 @@ spring:
active: dev active: dev
mvc: mvc:
view: view:
prefix: /templates prefix: /WEB-INF/view/
mybatis-plus: mybatis-plus:
mapper-locations: classpath*:com/stylefeng/guns/**/mapping/*.xml mapper-locations: classpath*:com/stylefeng/guns/**/mapping/*.xml
......
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