bugfix: fixed urls that missing the customized prefix such as '/apollo'

apolloconfig · May 4, 2024 · ae2ab02 · ae2ab02
1 parent 3d14e6f
commit ae2ab02
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,6 @@ Apollo 2.3.0
 * [apollo assembly optimization](https://github.com/apolloconfig/apollo/pull/5035)
 * [update the config item table column width](https://github.com/apolloconfig/apollo/pull/5131)
 * [sync apollo portal server config to apollo quick start server](https://github.com/apolloconfig/apollo/pull/5134)
-
+* [Fix missing **prefix path** of some URLs in Apollo Portal](https://github.com/apolloconfig/apollo/pull/5138)
 ------------------
 All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/14?closed=1)
diff --git a/apollo-portal/src/main/resources/static/scripts/controller/ConfigExportController.js b/apollo-portal/src/main/resources/static/scripts/controller/ConfigExportController.js
@@ -63,7 +63,7 @@ config_export_module.controller('ConfigExportController',
                                          }
 
                                          var selectedEnvStr = selectedEnvs.join(",");
-                                         $window.location.href = '/configs/export?envs=' + selectedEnvStr;
+                                         $window.location.href = AppUtil.prefixPath() + '/configs/export?envs=' + selectedEnvStr;
 
                                          toastr.success($translate.instant('ConfigExport.ExportSuccess'));
                                      };
@@ -93,7 +93,7 @@ config_export_module.controller('ConfigExportController',
                                          form.append('file', file);
                                          $http({
                                                    method: 'POST',
-                                                   url: '/configs/import?envs=' + selectedEnvStr + "&conflictAction="
+                                                   url: AppUtil.prefixPath() + '/configs/import?envs=' + selectedEnvStr + "&conflictAction="
                                                         + $scope.conflictAction,
                                                    data: form,
                                                    headers: {'Content-Type': undefined},

diff --git a/...lo-portal/src/main/resources/static/scripts/directive/import-namespace-modal-directive.js b/...lo-portal/src/main/resources/static/scripts/directive/import-namespace-modal-directive.js
@@ -54,7 +54,7 @@ function importNamespaceModalDirective($window, $q, $translate, $http, toastr, A
                 form.append('file', file);
                 $http({
                           method: 'POST',
-                          url: '/apps/' + toImportNamespace.baseInfo.appId + '/envs/' + scope.env + '/clusters/'
+                          url: AppUtil.prefixPath() + '/apps/' + toImportNamespace.baseInfo.appId + '/envs/' + scope.env + '/clusters/'
                                + toImportNamespace.baseInfo.clusterName
                                + '/namespaces/' + toImportNamespace.baseInfo.namespaceName + "/items/import",
                           data: form,

diff --git a/apollo-portal/src/main/resources/static/scripts/services/ClusterService.js b/apollo-portal/src/main/resources/static/scripts/services/ClusterService.js
@@ -14,19 +14,19 @@
  * limitations under the License.
  *
  */
-appService.service('ClusterService', ['$resource', '$q', function ($resource, $q) {
+appService.service('ClusterService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) {
     var cluster_resource = $resource('', {}, {
         create_cluster: {
             method: 'POST',
-            url: 'apps/:appId/envs/:env/clusters'
+            url: AppUtil.prefixPath() + 'apps/:appId/envs/:env/clusters'
         },
         load_cluster: {
             method: 'GET',
-            url: 'apps/:appId/envs/:env/clusters/:clusterName'
+            url: AppUtil.prefixPath() + 'apps/:appId/envs/:env/clusters/:clusterName'
         },
         delete_cluster: {
             method: 'DELETE',
-            url: 'apps/:appId/envs/:env/clusters/:clusterName'
+            url: AppUtil.prefixPath() + 'apps/:appId/envs/:env/clusters/:clusterName'
         }
     });
     return {

diff --git a/apollo-portal/src/main/resources/static/scripts/services/ExportService.js b/apollo-portal/src/main/resources/static/scripts/services/ExportService.js
@@ -14,11 +14,11 @@
  * limitations under the License.
  *
  */
-appService.service('ExportService', ['$resource', '$q', function ($resource, $q) {
+appService.service('ExportService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) {
     var resource = $resource('', {}, {
         importConfig: {
             method: 'POST',
-            url: '/import',
+            url: AppUtil.prefixPath() + '/import',
             headers: {'Content-Type': undefined},
         }
     });

diff --git a/apollo-portal/src/main/resources/static/scripts/services/NamespaceLockService.js b/apollo-portal/src/main/resources/static/scripts/services/NamespaceLockService.js
@@ -14,11 +14,11 @@
  * limitations under the License.
  *
  */
-appService.service('NamespaceLockService', ['$resource', '$q', function ($resource, $q) {
+appService.service('NamespaceLockService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) {
     var resource = $resource('', {}, {
         get_namespace_lock: {
             method: 'GET',
-            url: 'apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/lock-info'
+            url: AppUtil.prefixPath() + 'apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/lock-info'
         }
     });