[feat #1839]: Make dashboard support deploying under subpath (#1851)

alibaba · Nov 23, 2020 · 699532e · 699532e
1 parent 8c4f251
commit 699532e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/sentinel-dashboard/src/main/webapp/resources/app/scripts/app.js b/sentinel-dashboard/src/main/webapp/resources/app/scripts/app.js
@@ -38,6 +38,9 @@ angular
         return response;
       },
       'request' : function(config) {
+        // Resolved resource loading failure after configuring ContextPath
+    	  var baseUrl = $window.document.getElementsByTagName('base')[0].href;
+    	  config.url = baseUrl + config.url;
         return config;
       },
       'requestError' : function(config){

diff --git a/sentinel-dashboard/src/main/webapp/resources/app/views/login.html b/sentinel-dashboard/src/main/webapp/resources/app/views/login.html
@@ -1,6 +1,6 @@
 <div class="container">
     <div class="row" style="margin: 200px auto 15px auto; text-align: center;">
-        <img src="../../assets/img/sentinel-logo.png" alt="Sentinel Logo"
+        <img src="./assets/img/sentinel-logo.png" alt="Sentinel Logo"
              style="max-height: 25%; max-width: 25%;">
         <!-- <h1 id='login_title'>Sentinel 控制台</h1> -->
     </div>

diff --git a/sentinel-dashboard/src/main/webapp/resources/dist/js/app.js b/sentinel-dashboard/src/main/webapp/resources/dist/js/app.js
diff --git a/sentinel-dashboard/src/main/webapp/resources/index.htm b/sentinel-dashboard/src/main/webapp/resources/index.htm
@@ -10,6 +10,7 @@
   <link rel="stylesheet" href="./lib/css/bootstrap.min.css" />
   <link rel="stylesheet" href="./lib/css/font-awesome.min.css">
   <link rel="stylesheet" href="./dist/css/app.css">
+  <base href="./">
 </head>
 
 <body>

diff --git a/sentinel-dashboard/src/main/webapp/resources/index_dev.htm b/sentinel-dashboard/src/main/webapp/resources/index_dev.htm
@@ -10,6 +10,7 @@
   <link rel="stylesheet" href="//cdn.bootcss.com/bootstrap/3.0.3/css/bootstrap.min.css" />
   <link rel="stylesheet" href="//cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css">
   <link rel="stylesheet" href="http://localhost:1234/css/app.css">
+  <base href="./">
 </head>
 
 <body>