提交 6613f823 编写于 作者: L lenboo

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

...@@ -95,7 +95,7 @@ const rewriterPath = p => { ...@@ -95,7 +95,7 @@ const rewriterPath = p => {
} }
} }
} }
const version = new Date().getTime();
const pages = glob.sync(['*/!(_*).html'], { cwd: viewDir }).map(p => { const pages = glob.sync(['*/!(_*).html'], { cwd: viewDir }).map(p => {
let pagePath = `${path.join(viewDir, p)}` let pagePath = `${path.join(viewDir, p)}`
let newPagePath = rewriterPath(pagePath) let newPagePath = rewriterPath(pagePath)
...@@ -109,7 +109,9 @@ const pages = glob.sync(['*/!(_*).html'], { cwd: viewDir }).map(p => { ...@@ -109,7 +109,9 @@ const pages = glob.sync(['*/!(_*).html'], { cwd: viewDir }).map(p => {
filename: newPagePath || path.join('view', p), filename: newPagePath || path.join('view', p),
template: `${path.join('src/view', p)}`, template: `${path.join('src/view', p)}`,
cache: true, cache: true,
favicon:'./favicon.ico',
inject: true, inject: true,
hash: version,
chunks: chunks, chunks: chunks,
minify: minifierConfig minify: minifierConfig
}) })
...@@ -120,7 +122,7 @@ const baseConfig = { ...@@ -120,7 +122,7 @@ const baseConfig = {
output: { output: {
path: distDir, path: distDir,
publicPath: '/', publicPath: '/',
filename: 'js/[name].[chunkhash:7].js' filename: 'js/[name].[chunkhash:7]'+version+'.js'
}, },
module: { module: {
rules: [ rules: [
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<meta name="theme-color" content="#4a8dee"> <meta name="theme-color" content="#4a8dee">
<meta name="msapplication-navbutton-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"> <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> <title>DolphinScheduler</title>
</head> </head>
<body> <body>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<meta name="theme-color" content="#4a8dee"> <meta name="theme-color" content="#4a8dee">
<meta name="msapplication-navbutton-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"> <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> <title>Login - DolphinScheduler</title>
</head> </head>
<body> <body>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册