From 907641e56c2085aaa81f267946dc3e3e9fca73e7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 九月 2024 09:39:02 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 123 ++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 43 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..8ad8488 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,30 @@
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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.beans.factory.annotation.Value;
+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 +35,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;
/**
* 閫氱敤璇锋眰澶勭悊
@@ -51,6 +46,7 @@
* @author ruoyi
*/
@RestController
+@Api(description = "閫氳繃璇锋眰澶勭悊")
@RequestMapping("/common")
public class CommonController {
private static final Logger log = LoggerFactory.getLogger(CommonController.class);
@@ -59,6 +55,9 @@
private ServerConfig serverConfig;
private static final String FILE_DELIMETER = ",";
+
+ @Value("${uploadSwitch}")
+ private Integer uploadSwitch;
/**
* 閫氱敤涓嬭浇璇锋眰
@@ -89,6 +88,7 @@
/**
* 鍒嗙被涓婁紶璇锋眰
*/
+ @ApiOperation("鍒嗙被涓婁紶璇锋眰")
@PostMapping("/uploadSort")
public AjaxResult uploadFileSort(MultipartFile file) {
try {
@@ -106,7 +106,15 @@
}
// 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
String fileName = FileUploadUtils.uploadSort(filePath, file);
- String url = serverConfig.getUrl() + fileName;
+ String url = null;
+ //鏂板崕鍖婚櫌鐗规畩锛岃繖涓棰戠殑璁块棶寰楄浆
+ String xhPath = "http://218.108.11.22:8093/profile-api";
+ if (uploadSwitch == 1) {
+ String fn = fileName.replaceAll("/profile", "");
+ url = xhPath + fn;
+ } else {
+ url = serverConfig.getUrl() + fileName;
+ }
AjaxResult ajax = AjaxResult.success();
ajax.put("url", url);
ajax.put("fileName", fileName);
@@ -121,6 +129,7 @@
/**
* 涓婁紶骞惰浆鎴恏tml璇锋眰
*/
+ @ApiOperation("word鏂囦欢涓婁紶骞惰浆鎴恏tml")
@PostMapping("/uploadShow")
public AjaxResult uploadFileShow(MultipartFile file) {
try {
@@ -133,7 +142,15 @@
//灏唚ord杞垚html
convertDocToHtml(filePath + "\\" + file.getOriginalFilename(), filePath + "\\" + file.getOriginalFilename().split("\\.", 2)[0] + ".html");
- String url = serverConfig.getUrl() + fileName.replaceAll("\\.[^.]*$", ".html");
+ String url = null;
+ String xhPath = "http://218.108.11.22:8093/profile-api";
+ if (uploadSwitch == 1) {
+ String fn = fileName.replaceAll("\\.[^.]*$", ".html").replaceAll("/profile", "");
+ url = xhPath + fn;
+
+ } else {
+ url = serverConfig.getUrl() + fileName.replaceAll("\\.[^.]*$", ".html");
+ }
AjaxResult ajax = AjaxResult.success();
ajax.put("url", url);
ajax.put("fileName", fileName);
@@ -148,6 +165,7 @@
/**
* 閫氱敤涓婁紶璇锋眰锛堝崟涓級
*/
+ @ApiOperation("閫氱敤涓婁紶璇锋眰")
@PostMapping("/upload")
public AjaxResult uploadFile(MultipartFile file) {
try {
@@ -223,22 +241,41 @@
}
/**
- * @param HtmlContentVO
+ * @param
* @return
*/
- @GetMapping("/common/htmlContent")
+ @ApiOperation("瀵屾枃鏈浆html")
+ @PostMapping("/htmlContent")
public AjaxResult htmlContent(@RequestBody HtmlContentVO htmlContentVO) {
+ log.error("htmlContentVO鍏ュ弬涓猴細{}", htmlContentVO);
// 鑾峰彇鏂囦欢鐨勫師濮嬪悕绉�
String fileName = htmlContentVO.getFileName();
+ if (!fileName.endsWith(".html")) {
+ // 鍘绘帀涔嬪墠鐨勬墿灞曞悕
+ int lastIndex = fileName.lastIndexOf('.');
+ if (lastIndex != -1) {
+ fileName = fileName.substring(0, lastIndex); // 鍘绘帀鎵╁睍鍚�
+ }
+ // 娣诲姞.html鍚庣紑
+ fileName += ".html";
+ }
+ FileUtils.createFile(RuoYiConfig.getUploadPath() + "/show/" + fileName.split("\\.", 2)[0]);
// 灏嗘枃浠朵繚瀛樺埌鎸囧畾鐩綍
- File outputFile = new File(RuoYiConfig.getUploadPath() + "/show/" + fileName.split("\\.", 2)[0] + fileName);
- try (BufferedWriter writer = new BufferedWriter(new FileWriter(outputFile))) {
- writer.write(htmlContentVO.getContent());
-
+ File outputFile = new File(RuoYiConfig.getUploadPath() + "/show/" + fileName.split("\\.", 2)[0] + "/" + fileName);
+ try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputFile), "UTF-8"))) {
+ if (StringUtils.isNotEmpty(htmlContentVO.getContent()))
+ writer.write(htmlContentVO.getContent());
} catch (IOException e) {
e.printStackTrace();
}
- return AjaxResult.success();
+ String url = null;
+ String xhPath = "http://218.108.11.22:8093/profile-api";
+ if (uploadSwitch == 1) {
+ url = xhPath + "/upload/show/" + fileName.split("\\.", 2)[0] + "/" + fileName;
+ } else {
+ url = serverConfig.getUrl() + "/profile/upload/show/" + fileName.split("\\.", 2)[0] + "/" + fileName;
+ }
+ return AjaxResult.success(url);
}
--
Gitblit v1.9.3