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模板文档 */