From e1a160380ee8f41ceb9f3646ac48009bea027683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 25 Jul 2023 17:15:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E8=B4=A8=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/system/SysPdfTemplateController.java | 5 ++++-
 src/main/java/com/glxp/api/upload/uploadController.java      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java
index 78a3bf67..2f1f1fb1 100644
--- a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java
+++ b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java
@@ -18,6 +18,7 @@ import com.glxp.api.service.system.SystemPDFTemplateService;
 import com.glxp.api.util.JasperUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -36,6 +37,8 @@ public class SysPdfTemplateController {
 
     @Resource
     private SystemPDFTemplateService systemPDFTemplateService;
+    @Value("${file_path}")
+    private String filePath;
 
     @AuthRuleAnnotation("system/pdf/template/list")
     @GetMapping("/system/pdf/template/list")
@@ -84,7 +87,7 @@ public class SysPdfTemplateController {
                    "[{\"area\":\"福建省厦门市湖里区\",\"vaiDate\":\"2023-03-15\",\"code\":\"1113\",\"companyName\":\"盛夏科技\",\"classes\":\"经营企业\",\"mobile\":\"18575144832\",\"index\":\"1\",\"remark\":\"12\",\"detailAddr\":\"湖里\",\"name\":\"业务许可证\",\"creditNum\":\"6464684643\",\"auditStatus\":\"审核通过\",\"expireDate\":\"2023-03-16\",\"contacts\":\"东\",\"email\":\"46456@qq.com\",\"status\":\"有效\"}]";
         }
 
-        JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf");
+        JasperUtils.jasperReport(request, response, data, filePath + "/pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf");
 
 
 
diff --git a/src/main/java/com/glxp/api/upload/uploadController.java b/src/main/java/com/glxp/api/upload/uploadController.java
index c006b3da..861b61ea 100644
--- a/src/main/java/com/glxp/api/upload/uploadController.java
+++ b/src/main/java/com/glxp/api/upload/uploadController.java
@@ -54,7 +54,7 @@ public class uploadController {
             file.transferTo(file1);
             Map<String, String> rMap = new HashMap<>();
             rMap.put("msg", "上传成功");
-            rMap.put("path", savePath + "/" + newName);
+            rMap.put("path", newName);
             return ResultVOUtils.success(rMap);
         } catch (IOException e) {
             e.printStackTrace();