Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-merge

4 years ago · 6613f823c0
4 changed files with 6 additions and 4 deletions
--- 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: [
--- a/dolphinscheduler-ui/favicon.ico
+++ b/dolphinscheduler-ui/favicon.ico
--- 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>
--- 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>