This is an automated email from the ASF dual-hosted git repository.

leonbao pushed a commit to branch 1.3.1-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git

commit 0f708737a8d2ef9218bbaa6ce2299fc5bcc393b1
Author: break60 <790061...@qq.com>
AuthorDate: Tue Jun 30 14:34:11 2020 +0800

    Change favicon.ico icon introduction method and package compilation to 
increase version number (#3030)
---
 dolphinscheduler-ui/build/config.js           |   6 ++++--
 dolphinscheduler-ui/favicon.ico               | Bin 0 -> 4286 bytes
 dolphinscheduler-ui/src/view/home/index.html  |   2 +-
 dolphinscheduler-ui/src/view/login/index.html |   2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dolphinscheduler-ui/build/config.js 
b/dolphinscheduler-ui/build/config.js
index b5db173..91d59a0 100644
--- a/dolphinscheduler-ui/build/config.js
+++ b/dolphinscheduler-ui/build/config.js
@@ -95,7 +95,7 @@ const rewriterPath = p => {
     }
   }
 }
-
+const version = new Date().getTime();
 const pages = glob.sync(['*/!(_*).html'], { cwd: viewDir }).map(p => {
   let pagePath = `${path.join(viewDir, p)}`
   let newPagePath = rewriterPath(pagePath)
@@ -109,7 +109,9 @@ const pages = glob.sync(['*/!(_*).html'], { cwd: viewDir 
}).map(p => {
     filename: newPagePath || path.join('view', p),
     template: `${path.join('src/view', p)}`,
     cache: true,
+    favicon:'./favicon.ico',
     inject: true,
+    hash: version,
     chunks: chunks,
     minify: minifierConfig
   })
@@ -120,7 +122,7 @@ const baseConfig = {
   output: {
     path: distDir,
     publicPath: '/',
-    filename: 'js/[name].[chunkhash:7].js'
+    filename: 'js/[name].[chunkhash:7]'+version+'.js'
   },
   module: {
     rules: [
diff --git a/dolphinscheduler-ui/favicon.ico b/dolphinscheduler-ui/favicon.ico
new file mode 100644
index 0000000..acf4cf7
Binary files /dev/null and b/dolphinscheduler-ui/favicon.ico differ
diff --git a/dolphinscheduler-ui/src/view/home/index.html 
b/dolphinscheduler-ui/src/view/home/index.html
index 2a18be2..b29d116 100644
--- a/dolphinscheduler-ui/src/view/home/index.html
+++ b/dolphinscheduler-ui/src/view/home/index.html
@@ -33,7 +33,7 @@
     <meta name="theme-color" content="#4a8dee">
     <meta name="msapplication-navbutton-color" content="#4a8dee">
     <meta name="viewport" 
content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
-    <link rel="shortcut icon" href="<%= PUBLIC_PATH %>/images/favicon.ico"/>
+    
     <title>DolphinScheduler</title>
   </head>
   <body>
diff --git a/dolphinscheduler-ui/src/view/login/index.html 
b/dolphinscheduler-ui/src/view/login/index.html
index df456f6..cd1243f 100644
--- a/dolphinscheduler-ui/src/view/login/index.html
+++ b/dolphinscheduler-ui/src/view/login/index.html
@@ -31,7 +31,7 @@
     <meta name="theme-color" content="#4a8dee">
     <meta name="msapplication-navbutton-color" content="#4a8dee">
     <meta name="viewport" 
content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
-    <link rel="shortcut icon" href="<%= PUBLIC_PATH %>/images/favicon.ico"/>
+    
     <title>Login - DolphinScheduler</title>
   </head>
   <body>

Reply via email to