From 20b311dd4c63b1d4c50e68066ebb83e8b32c15e1 Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Sat, 3 Aug 2024 12:00:09 +0800
Subject: [PATCH] =?UTF-8?q?-024-08-03=20=E5=A2=9E=E5=8A=A0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E7=9A=84=E5=88=A0=E9=99=A4=E6=97=B6=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../win/web/controller/print/WinPrintServerControler.java    | 4 ++--
 .../web/controller/print/WinPrintServerControlerTest.java    | 4 +---
 .../com/win/print/controller/WinPrintModelController.java    | 5 +++--
 .../win/print/controller/WinPrintTasksLogsController.java    | 4 ++--
 win-print/src/main/java/com/win/print/util/PdfModelUitl.java | 4 ----
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/win-admin/src/main/java/com/win/web/controller/print/WinPrintServerControler.java b/win-admin/src/main/java/com/win/web/controller/print/WinPrintServerControler.java
index cb8d505..0a0bff0 100644
--- a/win-admin/src/main/java/com/win/web/controller/print/WinPrintServerControler.java
+++ b/win-admin/src/main/java/com/win/web/controller/print/WinPrintServerControler.java
@@ -50,9 +50,9 @@ public class WinPrintServerControler extends BaseController {
     private static final Logger log = LoggerFactory.getLogger(WinPrintServerControler.class);
     private String prefix = "/service/print";
     @Value("${win.path.template}")
-    private String templatePathDefault; //打印模版的存储路径
+    private String templatePathDefault="/models"; //打印模版的存储路径
     @Value("${win.path.print}")
-    private String printFilepath;  //生成的打印文件存储路径
+    private String printFilepath="/print";  //生成的打印文件存储路径
     @Resource
     QRCodeService qrCodeService;
     @Resource
diff --git a/win-admin/src/main/java/com/win/web/controller/print/WinPrintServerControlerTest.java b/win-admin/src/main/java/com/win/web/controller/print/WinPrintServerControlerTest.java
index a279ed4..f1a1de5 100644
--- a/win-admin/src/main/java/com/win/web/controller/print/WinPrintServerControlerTest.java
+++ b/win-admin/src/main/java/com/win/web/controller/print/WinPrintServerControlerTest.java
@@ -43,9 +43,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 public class WinPrintServerControlerTest extends BaseController {
     private String prefix = "/service/test";
     @Value("${win.path.template}")
-    private   String templatePath;
-    @Value("${win.path.print}")
-    private String printFilepath;
+    private   String templatePath="/models";
     @Resource
     QRCodeService qrCodeService;
     @GetMapping("/pdf")
diff --git a/win-print/src/main/java/com/win/print/controller/WinPrintModelController.java b/win-print/src/main/java/com/win/print/controller/WinPrintModelController.java
index c273226..c8f1bfe 100644
--- a/win-print/src/main/java/com/win/print/controller/WinPrintModelController.java
+++ b/win-print/src/main/java/com/win/print/controller/WinPrintModelController.java
@@ -8,6 +8,7 @@ import com.win.common.utils.ServletUtils;
 import com.win.common.utils.file.FileUploadUtils;
 import com.win.common.utils.file.FileUtils;
 import com.win.print.util.DataUnitl;
+import jakarta.annotation.Resource;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -40,10 +41,10 @@ public class WinPrintModelController extends BaseController
 {
     private String prefix = "print/modelmanager";
 
-    @Autowired
+    @Resource
     private IWinPrintModelService winPrintModelService;
     @Value("${win.path.template}")
-    private String templatePathDefault;
+    private String templatePathDefault="/models";
     @RequiresPermissions("print:modelmanager:view")
     @GetMapping()
     public String modelmanager()
diff --git a/win-print/src/main/java/com/win/print/controller/WinPrintTasksLogsController.java b/win-print/src/main/java/com/win/print/controller/WinPrintTasksLogsController.java
index 9cfddbc..9654ded 100644
--- a/win-print/src/main/java/com/win/print/controller/WinPrintTasksLogsController.java
+++ b/win-print/src/main/java/com/win/print/controller/WinPrintTasksLogsController.java
@@ -57,9 +57,9 @@ public class WinPrintTasksLogsController extends BaseController {
     @Resource
     private IWinPrintTasksLogsService winPrintTasksLogsService;
     @Value("${win.path.print}")
-    private String printFilepath;  //生成的打印文件存储路径
+    private String printFilepath="/print";  //生成的打印文件存储路径
     @Value("${win.file.print.delSync}")
-    private Boolean delSync;  //删除日志记录时是否删除文件
+    private Boolean delSync=Boolean.FALSE;  //删除日志记录时是否删除文件
 
     @RequiresPermissions("print:logmanager:view")
     @GetMapping()
diff --git a/win-print/src/main/java/com/win/print/util/PdfModelUitl.java b/win-print/src/main/java/com/win/print/util/PdfModelUitl.java
index f31e95a..5d3cb2b 100644
--- a/win-print/src/main/java/com/win/print/util/PdfModelUitl.java
+++ b/win-print/src/main/java/com/win/print/util/PdfModelUitl.java
@@ -55,10 +55,6 @@ public class PdfModelUitl {
 
     @Resource
     QRCodeService qrCodeService;
-    @Value("${win.path.template}")
-    private String templatePathDefault; //打印模版的存储路径
-    @Value("${win.path.print}")
-    private String printFilepath;  //生成的打印文件存储路径
     /**
      * 待填充的PDF模板文档
      */