From 8fbe459c317d1d3ff3a6f46b0f374f49ac704ba1 Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Thu, 27 Apr 2023 10:48:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 报表上传以后目前可以正常预览 --- .../main/java/com/adc/da/main/config/WebMvcConfig.java | 2 +- adc-da-main/src/main/resources/application-dev.properties | 2 -- .../src/main/java/com/adc/da/report/util/PdfUtil.java | 8 ++------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/WebMvcConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/WebMvcConfig.java index da045a1..968ab09 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/config/WebMvcConfig.java +++ b/adc-da-main/src/main/java/com/adc/da/main/config/WebMvcConfig.java @@ -21,7 +21,7 @@ public class WebMvcConfig implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { // /home/file/**为前端URL访问路径 后面 file:xxxx为本地磁盘映射 - registry.addResourceHandler(picPath+"**").addResourceLocations("file://"+uploadFile); + registry.addResourceHandler(picPath + "**").addResourceLocations("file:" + uploadFile); } } diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 7e5bae3..5d1090d 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -67,8 +67,6 @@ uploadFile=D:\\uploadfile\\tmp\\ #uploadFile=/data/DeploymentPackage/report_library/uploadfile/ # \u672C\u5730\u6587\u4EF6\u8BBF\u95EE\u7684url\u5730\u5740 picPath=/api/home/pic/ -#picPath=D:\\uploadfile\\tmp\\pic\\ - serverIp=http://127.0.0.1:7060/ diff --git a/adc-da-report/src/main/java/com/adc/da/report/util/PdfUtil.java b/adc-da-report/src/main/java/com/adc/da/report/util/PdfUtil.java index e555ba5..9fb2c15 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/util/PdfUtil.java +++ b/adc-da-report/src/main/java/com/adc/da/report/util/PdfUtil.java @@ -69,12 +69,8 @@ public class PdfUtil { log.error(e.getMessage(), e); } - //判断是否是服务器环境 - if ("local".equals(uploadType)) { - list.add(targetPath + fileName + "/" + i + ".png"); - } else { - list.add(ipAddress + "api/home/pic" + "/" + fileName + "/" + i + ".png"); - } + list.add(ipAddress + "api/home/pic" + "/" + fileName + "/" + i + ".png"); + } catch (Exception e) { }