From 95e530d9237921f1a1aa1127d1f9d9dd73ed72c0 Mon Sep 17 00:00:00 2001
From: MHSanaei <ho3ein.sanaei@gmail.com>
Date: Mon, 20 Apr 2026 01:08:41 +0200
Subject: [PATCH] fix

---
 sub/subClashService.go |  6 +++++-
 web/html/inbounds.html |  1 -
 web/service/setting.go | 16 +---------------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/sub/subClashService.go b/sub/subClashService.go
index f0a8ca8a..24271a13 100644
--- a/sub/subClashService.go
+++ b/sub/subClashService.go
@@ -34,6 +34,9 @@ func (s *SubClashService) GetClash(subId string, host string) (string, string, e
 		return "", "", err
 	}
 
+	requestHost := strings.TrimSpace(host)
+	defaultClientHost := s.SubService.getDefaultClientHost()
+
 	var traffic xray.ClientTraffic
 	var clientTraffics []xray.ClientTraffic
 	var proxies []map[string]any
@@ -57,7 +60,8 @@ func (s *SubClashService) GetClash(subId string, host string) (string, string, e
 		for _, client := range clients {
 			if client.Enable && client.SubID == subId {
 				clientTraffics = append(clientTraffics, s.SubService.getClientTraffics(inbound.ClientStats, client.Email))
-				proxies = append(proxies, s.getProxies(inbound, client, host)...)
+				resolvedHost := s.SubService.ResolveClientHostWithDefault(inbound, client, requestHost, defaultClientHost)
+				proxies = append(proxies, s.getProxies(inbound, client, resolvedHost)...)
 			}
 		}
 	}
diff --git a/web/html/inbounds.html b/web/html/inbounds.html
index c7fa641e..f224ed25 100644
--- a/web/html/inbounds.html
+++ b/web/html/inbounds.html
@@ -1763,7 +1763,6 @@
     },
   });
 </script>
-{{ template "page/body_end" .}}
 <style>
   #content-layout > .ant-layout-content > .ant-spin-nested-loading > div > .ant-spin {
     position: fixed !important;
diff --git a/web/service/setting.go b/web/service/setting.go
index 59d0397e..e1d5d736 100644
--- a/web/service/setting.go
+++ b/web/service/setting.go
@@ -763,21 +763,6 @@ func extractHostname(host string) string {
 func (s *SettingService) GetDefaultSettings(host string) (any, error) {
 	type settingFunc func() (any, error)
 	settings := map[string]settingFunc{
-		"expireDiff":    func() (any, error) { return s.GetExpireDiff() },
-		"trafficDiff":   func() (any, error) { return s.GetTrafficDiff() },
-		"pageSize":      func() (any, error) { return s.GetPageSize() },
-		"defaultCert":   func() (any, error) { return s.GetCertFile() },
-		"defaultKey":    func() (any, error) { return s.GetKeyFile() },
-		"tgBotEnable":   func() (any, error) { return s.GetTgbotEnabled() },
-		"subEnable":     func() (any, error) { return s.GetSubEnable() },
-		"subJsonEnable": func() (any, error) { return s.GetSubJsonEnable() },
-		"subTitle":      func() (any, error) { return s.GetSubTitle() },
-		"subURI":        func() (any, error) { return s.GetSubURI() },
-		"subJsonURI":    func() (any, error) { return s.GetSubJsonURI() },
-		"subDefaultHost": func() (any, error) {
-			return s.GetSubDefaultHost()
-		},
-		"remarkModel":   func() (any, error) { return s.GetRemarkModel() },
 		"expireDiff":     func() (any, error) { return s.GetExpireDiff() },
 		"trafficDiff":    func() (any, error) { return s.GetTrafficDiff() },
 		"pageSize":       func() (any, error) { return s.GetPageSize() },
@@ -791,6 +776,7 @@ func (s *SettingService) GetDefaultSettings(host string) (any, error) {
 		"subURI":         func() (any, error) { return s.GetSubURI() },
 		"subJsonURI":     func() (any, error) { return s.GetSubJsonURI() },
 		"subClashURI":    func() (any, error) { return s.GetSubClashURI() },
+		"subDefaultHost": func() (any, error) { return s.GetSubDefaultHost() },
 		"remarkModel":    func() (any, error) { return s.GetRemarkModel() },
 		"datepicker":     func() (any, error) { return s.GetDatepicker() },
 		"ipLimitEnable":  func() (any, error) { return s.GetIpLimitEnable() },