Merge branch 'lj-project' of git.yfzx.zjtys.com.cn:912-system/monitor/inspect into lj-project

src/main/java/com/zjty/inspect/config/MvcConfig.java

@@ -32,7 +32,7 @@ public class MvcConfig extends WebMvcConfigurationSupport {
         registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
         registry.addResourceHandler("/webjars/**")
                 .addResourceLocations("classpath:/META-INF/resources/webjars/");
-        registry.addResourceHandler("/**")
+        registry.addResourceHandler("/templates/**")
                 .addResourceLocations("classpath:/META-INF/resources/templates/");
         registry.addResourceHandler("/static/**")
                 .addResourceLocations("classpath:/static/");

src/main/java/com/zjty/inspect/controller/EvaluationController.java

@@ -191,7 +191,7 @@ public class EvaluationController {
         }else{
             wps.put("agree", "不同意");
         }
-        String w = FreeMakerUtils.parseTpl("报告模板", wps);
+        String w = FreeMakerUtils.parseTpl("reportTemplate", wps);
         if(w==null){
             return ResponseEntity.status(500).build();
         }

src/main/resources/application.properties

@@ -61,7 +61,7 @@ spring.jackson.time-zone=GMT
 spring.freemarker.charset=UTF-8
 spring.freemarker.suffix=.ftl
 spring.freemarker.content-type=text/html; charset=utf-8
-spring.freemarker.template-loader-path=classpath:/templates
+spring.freemarker.template-loader-path=classpath:/templates/
 #spring.redis.host=127.0.0.1
 ##Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
 #spring.redis.port=6379