From e9e425038c9e1d21cffc76da8e3f77ef977e8a4e Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Fri, 14 Mar 2025 14:53:08 +0800
Subject: [PATCH] fix: Fix the abnormal display of system upgrade loading
 (#8154)

---
 core/init/hook/hook.go              | 2 +-
 core/init/router/router.go          | 2 +-
 frontend/src/api/modules/setting.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/init/hook/hook.go b/core/init/hook/hook.go
index c38a1ce89..6b78193d9 100644
--- a/core/init/hook/hook.go
+++ b/core/init/hook/hook.go
@@ -1,10 +1,10 @@
 package hook
 
 import (
-	"github.com/1Panel-dev/1Panel/core/app/service"
 	"strings"
 
 	"github.com/1Panel-dev/1Panel/core/app/repo"
+	"github.com/1Panel-dev/1Panel/core/app/service"
 	"github.com/1Panel-dev/1Panel/core/constant"
 	"github.com/1Panel-dev/1Panel/core/global"
 	"github.com/1Panel-dev/1Panel/core/utils/cmd"
diff --git a/core/init/router/router.go b/core/init/router/router.go
index a068a9c17..d70d6ad23 100644
--- a/core/init/router/router.go
+++ b/core/init/router/router.go
@@ -218,12 +218,12 @@ func Routers() *gin.Engine {
 	if global.CONF.Base.IsDemo {
 		Router.Use(middleware.DemoHandle())
 	}
+	Router.Use(middleware.GlobalLoading())
 	Router.Use(Proxy())
 
 	PrivateGroup := Router.Group("/api/v2/core")
 	PrivateGroup.Use(middleware.WhiteAllow())
 	PrivateGroup.Use(middleware.BindDomain())
-	PrivateGroup.Use(middleware.GlobalLoading())
 	PrivateGroup.Use(middleware.SetPasswordPublicKey())
 	for _, router := range rou.RouterGroupApp {
 		router.InitRouter(PrivateGroup)
diff --git a/frontend/src/api/modules/setting.ts b/frontend/src/api/modules/setting.ts
index 927818e00..886f3010e 100644
--- a/frontend/src/api/modules/setting.ts
+++ b/frontend/src/api/modules/setting.ts
@@ -65,7 +65,7 @@ export const UpdateTerminalInfo = (param: Setting.TerminalInfo) => {
     return http.post(`/core/settings/terminal/update`, param);
 };
 export const getSystemAvailable = () => {
-    return http.get(`/settings/search/available`);
+    return http.get(`/core/settings/search/available`);
 };
 export const updateSetting = (param: Setting.SettingUpdate) => {
     return http.post(`/core/settings/update`, param);