From 3de1d7208bb10dc720a57458facd684e9f07f11a Mon Sep 17 00:00:00 2001
From: Lo_ading <Lo_ading@outlook.com>
Date: Thu, 1 Apr 2021 08:12:28 +0800
Subject: [PATCH] Fix the issue that loading some resources failed when
 context-path is configured (#3609)

---
 .../src/main/resources/static/app.html        |  2 +-
 .../src/main/resources/static/index.html      | 14 ++++++++++++++
 .../src/main/resources/static/login.html      | 19 ++++++++++++++-----
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/apollo-portal/src/main/resources/static/app.html b/apollo-portal/src/main/resources/static/app.html
index a21e5a7f7c5..313bf08fbe5 100644
--- a/apollo-portal/src/main/resources/static/app.html
+++ b/apollo-portal/src/main/resources/static/app.html
@@ -118,7 +118,7 @@
 <!-- bootstrap.js -->
 <script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
 
-<script src="../vendor/lodash.min.js"></script>
+<script src="vendor/lodash.min.js"></script>
 
 <!--valdr-->
 <script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
diff --git a/apollo-portal/src/main/resources/static/index.html b/apollo-portal/src/main/resources/static/index.html
index 36a87bc1405..cbcc3dd80d5 100644
--- a/apollo-portal/src/main/resources/static/index.html
+++ b/apollo-portal/src/main/resources/static/index.html
@@ -124,6 +124,20 @@ <h5 ng-bind="app.name"></h5>
     <!-- bootstrap.js -->
     <script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
 
+    <script type="application/javascript">
+        function getPrefixPath() {
+            $.ajax({
+                method: 'get',
+                async: false,
+                url: 'prefix-path',
+                success: function (res) {
+                    window.localStorage.setItem("prefixPath", res);
+                }
+            })
+        }
+        getPrefixPath();
+    </script>
+
     <script type="application/javascript" src="scripts/app.js"></script>
     <script type="application/javascript" src="scripts/services/AppService.js"></script>
     <script type="application/javascript" src="scripts/services/EnvService.js"></script>
diff --git a/apollo-portal/src/main/resources/static/login.html b/apollo-portal/src/main/resources/static/login.html
index 8249494c276..5f7c2bca083 100644
--- a/apollo-portal/src/main/resources/static/login.html
+++ b/apollo-portal/src/main/resources/static/login.html
@@ -283,6 +283,20 @@
 <script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
 <script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
 
+<script type="application/javascript">
+    function getPrefixPath() {
+        $.ajax({
+            method: 'get',
+            async: false,
+            url: 'prefix-path',
+            success: function (res) {
+                window.localStorage.setItem("prefixPath", res);
+            }
+        })
+    }
+    getPrefixPath();
+</script>
+
 <script type="application/javascript" src="scripts/app.js"></script>
 <script type="application/javascript" src="scripts/AppUtils.js"></script>
 <script type="application/javascript" src="scripts/directive/directive.js"></script>
@@ -306,11 +320,6 @@
             $(this).addClass('active');
             e.preventDefault();
         });
-
-        $.get("prefix-path", function(result){
-            window.localStorage.setItem("prefixPath",result);
-        });
-
     });
 
 </script>