diff --git a/web/html/xui/settings.html b/web/html/xui/settings.html index d18964f8..d7383061 100644 --- a/web/html/xui/settings.html +++ b/web/html/xui/settings.html @@ -383,12 +383,12 @@ - + - + @@ -476,7 +476,7 @@ ] }, ], - geoIPOptions: [ + IPsOptions: [ { label: 'Private IP', value: 'private' }, { label: '🇮🇷 Iran', value: 'ir' }, { label: '🇨🇳 China', value: 'cn' }, @@ -488,7 +488,7 @@ { label: '🇹🇷 Türkiye', value: 'tr' }, { label: '🇧🇷 Brazil', value: 'br' }, ], - geoSiteOptions: [ + DomainsOptions: [ { label: '🇮🇷 Iran', value: 'ir' }, { label: '🇨🇳 China', value: 'cn' }, { label: '🇷🇺 Russia', value: 'ru' }, @@ -746,7 +746,7 @@ this.allSetting.subJsonRules = v ? JSON.stringify(this.defaultRules) : ""; } }, - geoIP: { + directIPs: { get: function () { if (!this.enableDirect) return []; const rules = JSON.parse(this.allSetting.subJsonRules); @@ -772,7 +772,7 @@ this.allSetting.subJsonRules = JSON.stringify(rules); } }, - geoSite: { + directDomains: { get: function () { if (!this.enableDirect) return []; const rules = JSON.parse(this.allSetting.subJsonRules); diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html index a5a842c4..b9e39e35 100644 --- a/web/html/xui/xray.html +++ b/web/html/xui/xray.html @@ -230,6 +230,25 @@ + + + + + + + + + + @@ -316,7 +335,7 @@ v-model="directDomains" :dropdown-class-name="themeSwitcher.currentTheme"> [[ p.label ]] + v-for="p in settingsData.DomainsOptions"> [[ p.label ]] @@ -898,7 +917,7 @@ bittorrent: ["bittorrent"], }, IPsOptions: [ - { label: 'Private IP', value: 'geoip:private' }, + { label: 'Private IPs', value: 'geoip:private' }, { label: '🇮🇷 Iran', value: 'ext:geoip_IR.dat:ir' }, { label: '🇨🇳 China', value: 'geoip:cn' }, { label: '🇷🇺 Russia', value: 'geoip:ru' }, @@ -910,12 +929,6 @@ { label: '🇧🇷 Brazil', value: 'geoip:br' }, ], DomainsOptions: [ - { label: 'Ads All', value: 'geosite:category-ads-all' }, - { label: 'Ads IR 🇮🇷', value: 'ext:geosite_IR.dat:category-ads-all' }, - { label: 'Ads VN 🇻🇳', value: 'ext:geosite_VN.dat:ads' }, - { label: 'Sec-IR malware', value: 'geosite_IR.dat:malware' }, - { label: 'Sec-IR phishing', value: 'geosite_IR.dat:phishing' }, - { label: 'Sec-IR cryptominers', value: 'geosite_IR.dat:cryptominers' }, { label: '🇮🇷 Iran', value: 'ext:geosite_IR.dat:ir' }, { label: '🇮🇷 .ir', value: 'regexp:.*\\.ir$' }, { label: '🇮🇷 .ایران', value: 'regexp:.*\\.xn--mgba3a4f16a$' }, @@ -926,16 +939,13 @@ { label: '🇻🇳 Vietnam', value: 'ext:geosite_VN.dat:vn' }, { label: '🇻🇳 .vn', value: 'regexp:.*\\.vn$' }, ], - DirectDomainsOptions: [ - { label: '🇮🇷 Iran', value: 'ext:geosite_IR.dat:ir' }, - { label: '🇮🇷 .ir', value: 'regexp:.*\\.ir$' }, - { label: '🇮🇷 .ایران', value: 'regexp:.*\\.xn--mgba3a4f16a$' }, - { label: '🇨🇳 China', value: 'geosite:cn' }, - { label: '🇨🇳 .cn', value: 'regexp:.*\\.cn$' }, - { label: '🇷🇺 Russia', value: 'geosite:category-ru' }, - { label: '🇷🇺 .ru', value: 'regexp:.*\\.ru' }, - { label: '🇻🇳 Vietnam', value: 'ext:geosite_VN.dat:vn' }, - { label: '🇻🇳 .vn', value: 'regexp:.*\\.vn$' }, + ProtectionOptions: [ + { label: 'Ads All', value: 'geosite:category-ads-all' }, + { label: 'Ads IR 🇮🇷', value: 'ext:geosite_IR.dat:category-ads-all' }, + { label: 'Ads VN 🇻🇳', value: 'ext:geosite_VN.dat:ads' }, + { label: 'Malware 🇮🇷', value: 'geosite_IR.dat:malware' }, + { label: 'Phishing 🇮🇷', value: 'geosite_IR.dat:phishing' }, + { label: 'Cryptominers 🇮🇷', value: 'geosite_IR.dat:cryptominers' }, ], ServicesOptions: [ { label: 'Apple', value: 'geosite:apple' },