Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-06-08 14:14:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix

Browse source
This commit is contained in:
MHSanaei 2026-04-20 01:08:41 +02:00
parent 26079b66cd
commit 95e530d923
No known key found for this signature in database
GPG key ID: 7E4060F2FBE5AB7A
3 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sub/subClashService.go
View file

@ -34,6 +34,9 @@ func (s *SubClashService) GetClash(subId string, host string) (string, string, e
return "", "", err return "", "", err
} }
requestHost := strings.TrimSpace(host)
defaultClientHost := s.SubService.getDefaultClientHost()
var traffic xray.ClientTraffic var traffic xray.ClientTraffic
var clientTraffics []xray.ClientTraffic var clientTraffics []xray.ClientTraffic
var proxies []map[string]any var proxies []map[string]any
@ -57,7 +60,8 @@ func (s *SubClashService) GetClash(subId string, host string) (string, string, e
for _, client := range clients { for _, client := range clients {
if client.Enable && client.SubID == subId { if client.Enable && client.SubID == subId {
clientTraffics = append(clientTraffics, s.SubService.getClientTraffics(inbound.ClientStats, client.Email)) 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)...)
} }
} }
} }

1
web/html/inbounds.html
View file

@ -1763,7 +1763,6 @@
}, },
}); });
</script> </script>
{{ template "page/body_end" .}}
<style> <style>
#content-layout > .ant-layout-content > .ant-spin-nested-loading > div > .ant-spin { #content-layout > .ant-layout-content > .ant-spin-nested-loading > div > .ant-spin {
position: fixed !important; position: fixed !important;

16
web/service/setting.go
View file

@ -763,21 +763,6 @@ func extractHostname(host string) string {
func (s *SettingService) GetDefaultSettings(host string) (any, error) { func (s *SettingService) GetDefaultSettings(host string) (any, error) {
type settingFunc func() (any, error) type settingFunc func() (any, error)
settings := map[string]settingFunc{ 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() }, "expireDiff": func() (any, error) { return s.GetExpireDiff() },
"trafficDiff": func() (any, error) { return s.GetTrafficDiff() }, "trafficDiff": func() (any, error) { return s.GetTrafficDiff() },
"pageSize": func() (any, error) { return s.GetPageSize() }, "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() }, "subURI": func() (any, error) { return s.GetSubURI() },
"subJsonURI": func() (any, error) { return s.GetSubJsonURI() }, "subJsonURI": func() (any, error) { return s.GetSubJsonURI() },
"subClashURI": func() (any, error) { return s.GetSubClashURI() }, "subClashURI": func() (any, error) { return s.GetSubClashURI() },
"subDefaultHost": func() (any, error) { return s.GetSubDefaultHost() },
"remarkModel": func() (any, error) { return s.GetRemarkModel() }, "remarkModel": func() (any, error) { return s.GetRemarkModel() },
"datepicker": func() (any, error) { return s.GetDatepicker() }, "datepicker": func() (any, error) { return s.GetDatepicker() },
"ipLimitEnable": func() (any, error) { return s.GetIpLimitEnable() }, "ipLimitEnable": func() (any, error) { return s.GetIpLimitEnable() },