From ddf54f0204890b93995b5940a86e80c28c3b6351 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Wed, 26 Jul 2023 11:51:29 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20icon=20=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api-test/frontend/public/index.html                         | 4 ++--
 framework/gateway/pom.xml                                   | 3 +++
 .../io/metersphere/gateway/service/BaseDisplayService.java  | 4 ++--
 framework/sdk-parent/frontend/public/index.html             | 4 ++--
 performance-test/frontend/public/index.html                 | 4 ++--
 project-management/frontend/public/index.html               | 4 ++--
 report-stat/frontend/public/index.html                      | 4 ++--
 system-setting/frontend/public/index.html                   | 4 ++--
 test-track/frontend/public/index.html                       | 4 ++--
 workstation/frontend/public/index.html                      | 6 +++---
 10 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/api-test/frontend/public/index.html b/api-test/frontend/public/index.html
index bc9da8bdf5..6bdb9566b0 100644
--- a/api-test/frontend/public/index.html
+++ b/api-test/frontend/public/index.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+  <link rel="shortcut icon" href="/display/file/logo" type="image/x-icon">
   <title>
     <%= htmlWebpackPlugin.options.title %>
   </title>
@@ -22,4 +22,4 @@
   <!-- built files will be auto injected -->
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/framework/gateway/pom.xml b/framework/gateway/pom.xml
index 6ed373d18a..11c9fffa77 100644
--- a/framework/gateway/pom.xml
+++ b/framework/gateway/pom.xml
@@ -280,6 +280,9 @@
                                 <copy todir="src/main/resources/static/assets">
                                     <fileset dir="../sdk-parent/frontend/src/assets"/>
                                 </copy>
+                                <copy todir="src/main/resources/static/assets">
+                                    <fileset dir="../sdk-parent/frontend/public" includes="favicon.ico"/>
+                                </copy>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/gateway/src/main/java/io/metersphere/gateway/service/BaseDisplayService.java b/framework/gateway/src/main/java/io/metersphere/gateway/service/BaseDisplayService.java
index 89d4823a4e..dee743d28e 100644
--- a/framework/gateway/src/main/java/io/metersphere/gateway/service/BaseDisplayService.java
+++ b/framework/gateway/src/main/java/io/metersphere/gateway/service/BaseDisplayService.java
@@ -57,8 +57,8 @@ public class BaseDisplayService {
             PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(getClass().getClassLoader());
             switch (imageName) {
                 case "logo":
-                    bytes = IOUtils.toByteArray(resolver.getResource("/static/assets/logo-light-MeterSphere.svg").getInputStream());
-                    contentType = MediaType.valueOf("image/svg+xml");
+                    bytes = IOUtils.toByteArray(resolver.getResource("/static/assets/favicon.ico").getInputStream());
+                    contentType = MediaType.valueOf("image/vnd.microsoft.icon");
                     break;
                 case "loginImage":
                     bytes = IOUtils.toByteArray(resolver.getResource("/static/assets/info.png").getInputStream());
diff --git a/framework/sdk-parent/frontend/public/index.html b/framework/sdk-parent/frontend/public/index.html
index 035f22a53c..cd803b8c0a 100644
--- a/framework/sdk-parent/frontend/public/index.html
+++ b/framework/sdk-parent/frontend/public/index.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+  <link rel="shortcut icon" href="/display/file/logo" type="image/x-icon">
 
 </head>
 
@@ -19,4 +19,4 @@
   <!-- built files will be auto injected -->
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/performance-test/frontend/public/index.html b/performance-test/frontend/public/index.html
index 6049bc7437..2c0e51c8af 100644
--- a/performance-test/frontend/public/index.html
+++ b/performance-test/frontend/public/index.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+  <link rel="shortcut icon" href="/display/file/logo" type="image/x-icon">
   <title>
     <%= htmlWebpackPlugin.options.title %>
   </title>
@@ -21,4 +21,4 @@
   <!-- built files will be auto injected -->
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/project-management/frontend/public/index.html b/project-management/frontend/public/index.html
index 6049bc7437..2c0e51c8af 100644
--- a/project-management/frontend/public/index.html
+++ b/project-management/frontend/public/index.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+  <link rel="shortcut icon" href="/display/file/logo" type="image/x-icon">
   <title>
     <%= htmlWebpackPlugin.options.title %>
   </title>
@@ -21,4 +21,4 @@
   <!-- built files will be auto injected -->
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/report-stat/frontend/public/index.html b/report-stat/frontend/public/index.html
index 6049bc7437..2c0e51c8af 100644
--- a/report-stat/frontend/public/index.html
+++ b/report-stat/frontend/public/index.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+  <link rel="shortcut icon" href="/display/file/logo" type="image/x-icon">
   <title>
     <%= htmlWebpackPlugin.options.title %>
   </title>
@@ -21,4 +21,4 @@
   <!-- built files will be auto injected -->
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/system-setting/frontend/public/index.html b/system-setting/frontend/public/index.html
index 6049bc7437..2c0e51c8af 100644
--- a/system-setting/frontend/public/index.html
+++ b/system-setting/frontend/public/index.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+  <link rel="shortcut icon" href="/display/file/logo" type="image/x-icon">
   <title>
     <%= htmlWebpackPlugin.options.title %>
   </title>
@@ -21,4 +21,4 @@
   <!-- built files will be auto injected -->
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/test-track/frontend/public/index.html b/test-track/frontend/public/index.html
index 6049bc7437..2c0e51c8af 100644
--- a/test-track/frontend/public/index.html
+++ b/test-track/frontend/public/index.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+  <link rel="shortcut icon" href="/display/file/logo" type="image/x-icon">
   <title>
     <%= htmlWebpackPlugin.options.title %>
   </title>
@@ -21,4 +21,4 @@
   <!-- built files will be auto injected -->
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/workstation/frontend/public/index.html b/workstation/frontend/public/index.html
index 6049bc7437..929274507f 100644
--- a/workstation/frontend/public/index.html
+++ b/workstation/frontend/public/index.html
@@ -5,8 +5,8 @@
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
-  <title>
+  <link rel="shortcut icon" href="/display/file/logo" type="image/x-icon">
+    <title>
     <%= htmlWebpackPlugin.options.title %>
   </title>
 </head>
@@ -21,4 +21,4 @@
   <!-- built files will be auto injected -->
 </body>
 
-</html>
\ No newline at end of file
+</html>