提交 f36e2a30 authored 作者: 孙洁清's avatar 孙洁清

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

# Conflicts: # src/main/java/com/zjty/inspect/utils/DocumentWordUtil.java
上级 96165440
...@@ -35,7 +35,7 @@ public class MvcConfig extends WebMvcConfigurationSupport { ...@@ -35,7 +35,7 @@ public class MvcConfig extends WebMvcConfigurationSupport {
registry.addResourceHandler("/static/**") registry.addResourceHandler("/static/**")
.addResourceLocations("classpath:/static/"); .addResourceLocations("classpath:/static/");
registry.addResourceHandler("/doc/**") registry.addResourceHandler("/doc/**")
.addResourceLocations("file:./ins/doc/"); .addResourceLocations("file:/opt/monitor/inspect/static/ins/doc/");
} }
@Override @Override
......
...@@ -25,7 +25,7 @@ public class FreeMakerUtils { ...@@ -25,7 +25,7 @@ public class FreeMakerUtils {
public static String createWord(Template template, Map<String, List<TechnologyContent>> dataMap){ public static String createWord(Template template, Map<String, List<TechnologyContent>> dataMap){
try { try {
//文件路径 //文件路径
String filePath= "./ins/doc/"; String filePath= "/opt/monitor/inspect/static/ins/doc/";
//文件名称 //文件名称
String fileName = System.currentTimeMillis()+".doc"; String fileName = System.currentTimeMillis()+".doc";
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论