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,6 +32,8 @@ 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("/**")
+                .addResourceLocations("classpath:/META-INF/resources/templates/");
         registry.addResourceHandler("/static/**")
                 .addResourceLocations("classpath:/static/");
         registry.addResourceHandler("/doc/**")

src/main/java/com/zjty/inspect/utils/FreeMakerUtils.java

@@ -28,7 +28,7 @@ public class FreeMakerUtils {
                 String filePath= "/opt/monitor/inspect/static/ins/doc/";
 
                 //文件名称
-                String fileName = System.currentTimeMillis()+".doc";
+                String fileName = System.currentTimeMillis()+".docx";
                 // 输出文件
                 File outFile = new File(filePath + File.separator + fileName);