From 315f4c35f059b6c981eb282fbb7da12be9b74635 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Wed, 10 Apr 2024 13:32:50 +0800 Subject: [PATCH] Code clean --- v2rayN/v2rayN/Common/Utils.cs | 2 +- v2rayN/v2rayN/Global.cs | 2 +- v2rayN/v2rayN/Handler/ShareHandler.cs | 2 +- v2rayN/v2rayN/Models/SingboxConfig.cs | 3 +-- v2rayN/v2rayN/ViewModels/AddServerViewModel.cs | 2 +- v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/v2rayN/v2rayN/Common/Utils.cs b/v2rayN/v2rayN/Common/Utils.cs index 64df907e..0fe1a666 100644 --- a/v2rayN/v2rayN/Common/Utils.cs +++ b/v2rayN/v2rayN/Common/Utils.cs @@ -1186,4 +1186,4 @@ namespace v2rayN #endregion Windows API } -} +} \ No newline at end of file diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs index 3d493309..d5033de2 100644 --- a/v2rayN/v2rayN/Global.cs +++ b/v2rayN/v2rayN/Global.cs @@ -143,7 +143,7 @@ namespace v2rayN { {EConfigType.VMess,"vmess"}, {EConfigType.Shadowsocks,"shadowsocks"}, - {EConfigType.Socks,"socks"}, + {EConfigType.Socks,"socks"}, {EConfigType.Http,"http"}, {EConfigType.VLESS,"vless"}, {EConfigType.Trojan,"trojan"}, diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs index 90490578..a647b5bb 100644 --- a/v2rayN/v2rayN/Handler/ShareHandler.cs +++ b/v2rayN/v2rayN/Handler/ShareHandler.cs @@ -982,7 +982,7 @@ namespace v2rayN.Handler break; case nameof(ETransport.grpc): - item.requestHost = Utils.UrlDecode(query["authority"] ?? ""); + item.requestHost = Utils.UrlDecode(query["authority"] ?? ""); item.path = Utils.UrlDecode(query["serviceName"] ?? ""); item.headerType = Utils.UrlDecode(query["mode"] ?? Global.GrpcGunMode); break; diff --git a/v2rayN/v2rayN/Models/SingboxConfig.cs b/v2rayN/v2rayN/Models/SingboxConfig.cs index 013a883b..44b0d7d6 100644 --- a/v2rayN/v2rayN/Models/SingboxConfig.cs +++ b/v2rayN/v2rayN/Models/SingboxConfig.cs @@ -60,7 +60,7 @@ public List? geoip { get; set; } public List? ip_cidr { get; set; } public List? source_ip_cidr { get; set; } - public List? process_name { get; set; } + public List? process_name { get; set; } public List? rule_set { get; set; } } @@ -241,5 +241,4 @@ public string? url { get; set; } public string? download_detour { get; set; } } - } \ No newline at end of file diff --git a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs index b3e54bd4..a014d9a2 100644 --- a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs @@ -80,7 +80,7 @@ namespace v2rayN.ViewModels return; } } - if (SelectedSource.configType != EConfigType.Socks + if (SelectedSource.configType != EConfigType.Socks && SelectedSource.configType != EConfigType.Http) { if (Utils.IsNullOrEmpty(SelectedSource.id)) diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs index b39f0ebd..f4ae6d85 100644 --- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs @@ -86,7 +86,7 @@ namespace v2rayN.ViewModels public ReactiveCommand AddVlessServerCmd { get; } public ReactiveCommand AddShadowsocksServerCmd { get; } public ReactiveCommand AddSocksServerCmd { get; } - public ReactiveCommand AddHttpServerCmd { get; } + public ReactiveCommand AddHttpServerCmd { get; } public ReactiveCommand AddTrojanServerCmd { get; } public ReactiveCommand AddHysteria2ServerCmd { get; } public ReactiveCommand AddTuicServerCmd { get; }