From c05c65a4e25b3f76ba7da1731cb2e089a64fa6ed Mon Sep 17 00:00:00 2001
From: kino <378907426@qq.com>
Date: Tue, 19 Jan 2021 10:07:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/goods/GoodsMainController.java | 16 ++++++++++
 .../com/ruoyi/winery/utils/RichTextUtil.java  | 29 +++++++++++++++++++
 .../controller/common/CommonController.java   |  3 +-
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 hope-winery/src/main/java/com/ruoyi/winery/utils/RichTextUtil.java

diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsMainController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsMainController.java
index 8e0fe9e48..6618d2ec2 100644
--- a/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsMainController.java
+++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsMainController.java
@@ -1,13 +1,19 @@
 package com.ruoyi.winery.controller.goods;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
 import java.util.List;
 import java.util.Arrays;
 
+import com.itextpdf.styledxmlparser.jsoup.Jsoup;
+import com.itextpdf.styledxmlparser.jsoup.nodes.Document;
+import com.itextpdf.styledxmlparser.jsoup.nodes.Element;
+import com.itextpdf.styledxmlparser.jsoup.select.Elements;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.winery.utils.RichTextUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -110,6 +116,11 @@ public class GoodsMainController extends BaseController {
     @PostMapping
     public AjaxResult add(UsernamePasswordAuthenticationToken token, @RequestBody GoodsMain goodsMain) {
         goodsMain.setDeptId(getDeptId());
+        String richText = goodsMain.getGoodsDesc();
+        if (richText != null && StringUtils.isNotEmpty(richText)) {
+            Document doc = RichTextUtil.setImgStyle(richText, "width: 100%");
+            goodsMain.setGoodsDesc(doc.body().children().toString());
+        }
         return toAjax(iWineryGoodsService.save(goodsMain) ? 1 : 0);
     }
 
@@ -121,6 +132,11 @@ public class GoodsMainController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody GoodsMain goodsMain) {
         goodsMain.setUpdateBy(getUsername());
+        String richText = goodsMain.getGoodsDesc();
+        if (richText != null && StringUtils.isNotEmpty(richText)) {
+            Document doc = RichTextUtil.setImgStyle(richText, "width: 100%");
+            goodsMain.setGoodsDesc(doc.body().children().toString());
+        }
         return toAjax(iWineryGoodsService.updateById(goodsMain) ? 1 : 0);
     }
 
diff --git a/hope-winery/src/main/java/com/ruoyi/winery/utils/RichTextUtil.java b/hope-winery/src/main/java/com/ruoyi/winery/utils/RichTextUtil.java
new file mode 100644
index 000000000..17b6cc407
--- /dev/null
+++ b/hope-winery/src/main/java/com/ruoyi/winery/utils/RichTextUtil.java
@@ -0,0 +1,29 @@
+package com.ruoyi.winery.utils;
+
+import cn.hutool.core.collection.CollUtil;
+import com.itextpdf.styledxmlparser.jsoup.Jsoup;
+import com.itextpdf.styledxmlparser.jsoup.nodes.Document;
+import com.itextpdf.styledxmlparser.jsoup.nodes.Element;
+import com.itextpdf.styledxmlparser.jsoup.select.Elements;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * @author kino
+ * @since 2021/01/19 9:49
+ */
+public class RichTextUtil {
+
+    public static Document setImgStyle(String richText, String style) {
+        Document doc = Jsoup.parse(richText);
+        Elements img = doc.getElementsByTag("img");
+        if (CollUtil.isNotEmpty(img)) {
+            for (Element i : img) {
+                String s = i.attr("style");
+                if (StringUtils.isEmpty(s)) {
+                    i.attr("style", style);
+                }
+            }
+        }
+        return doc;
+    }
+}
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 96dc5643e..58bee50e7 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
@@ -81,7 +81,8 @@ public class CommonController {
 
 
             String fileName = cosUtils.upload(type, file);
-            String url = serverConfig.getUrl() + "/common/file?fileName=" + fileName;
+            // String url = serverConfig.getUrl() + "/common/file?fileName=" + fileName;
+            String url = "https://winery-1257413599.cos.ap-beijing.myqcloud.com/" + fileName;
             AjaxResult ajax = AjaxResult.success();
             ajax.put("fileName", fileName);
             ajax.put("url", url);