From 9c8c9675325a22c69ac113ab26f9285b60582ae1 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 09 七月 2024 10:10:26 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 72 ++++++++++++++++--------------------
1 files changed, 32 insertions(+), 40 deletions(-)
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 124b1cb..fc69251 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
@@ -1,12 +1,27 @@
package com.ruoyi.web.controller.common;
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.lang.model.util.Elements;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.PhotoEnum;
+import com.ruoyi.common.enums.RadioEnum;
+import com.ruoyi.common.enums.VadioEnum;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.framework.config.ServerConfig;
+import com.smartor.domain.HtmlContentVO;
+import org.apache.poi.hwpf.HWPFDocument;
+import org.apache.poi.hwpf.converter.PicturesManager;
+import org.apache.poi.hwpf.converter.WordToHtmlConverter;
+import org.apache.poi.hwpf.usermodel.PictureType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -17,33 +32,10 @@
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-
-import com.ruoyi.common.enums.PhotoEnum;
-import com.ruoyi.common.enums.RadioEnum;
-import com.ruoyi.common.enums.VadioEnum;
-import com.smartor.domain.HtmlContentVO;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.converter.PicturesManager;
-import org.apache.poi.hwpf.converter.WordToHtmlConverter;
-import org.apache.poi.hwpf.usermodel.Picture;
-import org.apache.poi.hwpf.usermodel.PictureType;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.framework.config.ServerConfig;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
-import org.w3c.dom.Document;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
/**
* 閫氱敤璇锋眰澶勭悊
@@ -223,22 +215,22 @@
}
/**
- * @param HtmlContentVO
+ * @param
* @return
*/
- @GetMapping("/common/htmlContent")
+ @PostMapping("/htmlContent")
public AjaxResult htmlContent(@RequestBody HtmlContentVO htmlContentVO) {
// 鑾峰彇鏂囦欢鐨勫師濮嬪悕绉�
String fileName = htmlContentVO.getFileName();
// 灏嗘枃浠朵繚瀛樺埌鎸囧畾鐩綍
- File outputFile = new File(RuoYiConfig.getUploadPath() + "/show/" + fileName.split("\\.", 2)[0] + fileName);
- try (BufferedWriter writer = new BufferedWriter(new FileWriter(outputFile))) {
+ File outputFile = new File(RuoYiConfig.getUploadPath() + "/show/" + fileName.split("\\.", 2)[0] + "/" + fileName);
+ try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputFile), "UTF-8"))) {
writer.write(htmlContentVO.getContent());
-
} catch (IOException e) {
e.printStackTrace();
}
- return AjaxResult.success();
+ String url = serverConfig.getUrl() + "/profile/upload/show/" + fileName.split("\\.", 2)[0] + "/" + fileName;
+ return AjaxResult.success(url);
}
--
Gitblit v1.9.3