From 395c945b779005248fa093a5cde23ab34e75ba9d Mon Sep 17 00:00:00 2001
From: WangHao <43278047@qq.com>
Date: Thu, 27 Aug 2020 21:54:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=88=99=20=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E4=B8=BA=E5=B8=B8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/common/utils/BookmarkHtml/Const.java   | 3 +++
 .../java/com/ruoyi/common/utils/BookmarkHtml/ImportHtml.java   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BookmarkHtml/Const.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BookmarkHtml/Const.java
index 17c796bdd..0bdb77298 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BookmarkHtml/Const.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BookmarkHtml/Const.java
@@ -15,6 +15,7 @@ public class Const {
     public static String LOGIN_SESSION_KEY = "Favorites_user";
 
     public static String PASSWORD_KEY = "@#$%^&*()OPG#$%^&*(HG";
+    public static String URL_CODE = "(?<=charset=)(.+)(?=\")";//取网址的编码
 
     public static String DES3_KEY = "9964DYByKL967c3308imytCB";
 
@@ -29,6 +30,8 @@ public class Const {
     public static int COOKIE_TIMEOUT= 30*24*60*60;
 
 
+
+
 //	  @Autowired(required = true)
 //	  public void setBasePath(@Value("${favorites.base.path}")String basePath) {
 //		  Const.BASE_PATH = basePath;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BookmarkHtml/ImportHtml.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BookmarkHtml/ImportHtml.java
index fb2963a2b..b81bd05ca 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BookmarkHtml/ImportHtml.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BookmarkHtml/ImportHtml.java
@@ -283,7 +283,7 @@ public class ImportHtml {
 //	}
 //
     public static String matchCharset(String content) {
-        Pattern p = Pattern.compile("(?<=charset=)(.+)(?=\")");
+        Pattern p = Pattern.compile(Const.URL_CODE);
         Matcher m = p.matcher(content);
         if (m.find()){
             return m.group();