From 77d4d34086dae1d5a3855bd914de07fef00b3003 Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Tue, 2 Mar 2021 14:37:28 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-48327=20=E6=96=B0=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=88=91=E7=9A=84=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8B=E6=8F=92=E4=BB=B6=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=87=BA=E6=9D=A5=20=E3=80=90=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E3=80=91=E6=AD=A4=E5=89=8Dupm=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=9B=BE=E7=89=87=E8=B5=B0Files.probeContentType()?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E8=83=BD=E5=A4=9F=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E4=BD=86=E6=98=AF=E6=9C=89=E4=B8=AA?=
 =?UTF-8?q?=E6=94=B9=E5=8A=A8=E4=B8=BAJxbrowser=E6=B7=BB=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=AF=B9png?=
 =?UTF-8?q?=E7=BB=93=E5=B0=BE=E7=9A=84=E5=9B=BE=E7=89=87=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?Content-type=E4=B8=BAimage/png=E6=97=B6=EF=BC=8C=E4=BC=9A?=
 =?UTF-8?q?=E9=80=A0=E6=88=90=E5=9B=BE=E7=89=87=E6=8C=82=E6=8E=89=20?=
 =?UTF-8?q?=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E5=9C=A8?=
 =?UTF-8?q?=E5=88=A4=E6=96=ADpath=E6=98=AF=E4=B8=8D=E6=98=AF=E4=BB=A5png?=
 =?UTF-8?q?=E7=BB=93=E5=B0=BE=E7=9A=84=E6=9D=A1=E4=BB=B6=E4=B8=AD=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BAupm?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E4=B8=8B=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E6=98=AF=E7=9A=84=EF=BC=8C=E4=BE=9D=E6=97=A7=E8=B5=B0=E5=8E=9F?=
 =?UTF-8?q?=E6=9D=A5=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E4=B8=8D=E6=98=AF=EF=BC=8C=E8=B5=B0=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer-base/src/main/java/com/fr/design/ui/Assistant.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/ui/Assistant.java b/designer-base/src/main/java/com/fr/design/ui/Assistant.java
index 7e9430672..1c4d7e14a 100644
--- a/designer-base/src/main/java/com/fr/design/ui/Assistant.java
+++ b/designer-base/src/main/java/com/fr/design/ui/Assistant.java
@@ -48,7 +48,8 @@ public class Assistant {
         if (path.endsWith(".svg")) {
             return "image/svg+xml";
         }
-        if (path.endsWith(".png")) {
+        // upm 文件夹中的图片如果返回 Content-type 为 image/png 时会显示异常
+        if (path.endsWith(".png") && !path.contains("/upm")) {
             return "image/png";
         }
         if (path.endsWith(".woff")) {