Fixed consideration of adminContextPath in HTML templates

codecentric · Nov 9, 2018 · 749b665 · 749b665
1 parent 892d96e
commit 749b665
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/spring-boot-admin-server-ui/src/main/frontend/index.html b/spring-boot-admin-server-ui/src/main/frontend/index.html
@@ -18,7 +18,7 @@
 
 <html>
 <head>
-    <base th:href="@{''}" href="/">
+    <base th:href="@{${adminContextPath} + '/'}" href="/">
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="format-detection" content="telephone=no,email=no">

diff --git a/spring-boot-admin-server-ui/src/main/frontend/login.html b/spring-boot-admin-server-ui/src/main/frontend/login.html
@@ -18,7 +18,7 @@
 
 <html>
 <head>
-    <base th:href="@{''}" href="/">
+    <base th:href="@{${adminContextPath} + '/'}" href="/">
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="format-detection" content="telephone=no,email=no">

diff --git a/spring-boot-admin-server-ui/vue.config.js b/spring-boot-admin-server-ui/vue.config.js
@@ -20,6 +20,7 @@ const CopyPlugin = require('copy-webpack-plugin');
 
 
 module.exports = {
+  baseUrl: './',
   outputDir: 'target/dist',
   assetsDir: 'assets',
   pages: {
@@ -34,7 +35,7 @@ module.exports = {
       filename: 'login.html'
     }
   },
-  chainWebpack: config => {
+  chainWebpack: config => {	
     config.resolve.alias.set('@', resolve(__dirname, 'src/main/frontend'));
     config.module.rule('html')
       .test(/\.html$/)