From 41e05da9a811cd9394ce9bddf5edcb7cde58db06 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 06 三月 2025 16:49:36 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/PdfUtils.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/PdfUtils.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/PdfUtils.java
index 2668c3c..c786d9b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/PdfUtils.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/PdfUtils.java
@@ -1,7 +1,5 @@
package com.ruoyi.web.controller.tool;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpUtil;
import com.documents4j.api.DocumentType;
import com.documents4j.api.IConverter;
import com.documents4j.job.LocalConverter;
@@ -11,11 +9,9 @@
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
import java.io.*;
import java.net.URL;
import java.nio.file.Files;
-import java.util.HashMap;
@Slf4j
@Component
@@ -54,7 +50,7 @@
//上传图片
byte2File(stream.toByteArray(),filePath + "/pdf",fileName.substring(0,fileName.lastIndexOf(".")) + ".pdf");
MultipartFile multipartFile = convertToMultipartFile(stream,fileName.substring(0,fileName.lastIndexOf(".")) );
- String s = tencentCosUtil.upLoadFile(multipartFile);
+ String s = tencentCosUtil.upLoadFile(multipartFile,"/wordToPdf");
stream.close();
inputStream.close();
@@ -213,7 +209,7 @@
}
public String test(String fileName){
- String url = "file:///D:\\"+fileName;
+ String url = "file:///E:\\"+fileName;
// String filePath = "E:\\qiyeweixin\\WXWork\\1688855207501340\\Cache\\File\\2024-09";
// String fileName = "专业技术工作总结.docx";4
String filePath = "E:\\";
--
Gitblit v1.7.1