From 035a0535da04b1f13834fad907b49ced7d9b7cf5 Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Fri, 28 Mar 2025 11:27:25 +0800
Subject: [PATCH] bugfix
---
ruoyi-admin/pom.xml | 9 ++++-----
.../java/com/ruoyi/gysl/controller/DpclglController.java | 3 ---
.../ruoyi/web/controller/common/CommonController.java | 6 ++++++
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index aad287b..42513e2 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -103,11 +103,10 @@
knife4j-openapi2-spring-boot-starter
4.4.0
-
- com.itextpdf
- html2pdf
- 1.17.2
-
+
+
+
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/DpclglController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/DpclglController.java
index b7808ee..a1fec8a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/DpclglController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/DpclglController.java
@@ -109,10 +109,7 @@ public class DpclglController extends BaseController {
@ApiOperation(value = "副编辑器内容生成pdf文件url")
@GetMapping("/unloadPdf")
public AjaxResult unloadPdf(@RequestParam(defaultValue = "文章标题") String htmlArticleTitle, @RequestParam(defaultValue = "文章内容") String htmlContent) throws Exception {
-
MultipartFile multipartFile = HtmlToPdfConverter.convertHtmlToPdf(htmlArticleTitle, htmlContent);
-
-
return AjaxResult.success(commonController.uploadFile(multipartFile));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index cec5006..6f81204 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -4,6 +4,10 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +31,7 @@ import com.ruoyi.framework.config.ServerConfig;
* @author ruoyi
*/
@RestController
+@Api(tags = "通用请求处理")
@RequestMapping("/common")
public class CommonController
{
@@ -44,6 +49,7 @@ public class CommonController
* @param delete 是否删除
*/
@GetMapping("/download")
+ @ApiOperation("通用下载请求")
public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
{
try