diff --git a/ProxySuper.Core/Models/Record.cs b/ProxySuper.Core/Models/Record.cs index 0363a9b..b48001e 100644 --- a/ProxySuper.Core/Models/Record.cs +++ b/ProxySuper.Core/Models/Record.cs @@ -42,7 +42,7 @@ namespace ProxySuper.Core.Models [JsonProperty("trojanGoSettings")] public TrojanGoSettings TrojanGoSettings { get; set; } - [JsonProperty("naiveProtoSettings")] + [JsonProperty("naiveProxySettings")] public NaiveProxySettings NaiveProxySettings { get; set; } [JsonProperty("brook")] diff --git a/ProxySuper.WPF/ProxySuper.WPF.csproj b/ProxySuper.WPF/ProxySuper.WPF.csproj index d10a899..bc4d57b 100644 --- a/ProxySuper.WPF/ProxySuper.WPF.csproj +++ b/ProxySuper.WPF/ProxySuper.WPF.csproj @@ -144,14 +144,14 @@ MTProxyGoInstallView.xaml - - NaiveProtoConfigView.xaml + + NaiveProxyConfigView.xaml - - NaiveProtoEditorView.xaml + + NaiveProxyEditorView.xaml - - NaiveProtoInstallView.xaml + + NaiveProxyInstallView.xaml ShareLinkView.xaml @@ -299,15 +299,15 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile diff --git a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml similarity index 93% rename from ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml rename to ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml index ab48e08..3603b25 100644 --- a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml +++ b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml @@ -1,4 +1,4 @@ - + Title="NaiveProxy配置" Height="450" Width="800"> diff --git a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml.cs b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml.cs similarity index 70% rename from ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml.cs rename to ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml.cs index bf2ece3..bcd9f4d 100644 --- a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml.cs +++ b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml.cs @@ -5,9 +5,9 @@ namespace ProxySuper.WPF.Views /// /// NaiveProxyConfigView.xaml 的交互逻辑 /// - public partial class NaiveProtoConfigView : MvxWindow + public partial class NaiveProxyConfigView : MvxWindow { - public NaiveProtoConfigView() + public NaiveProxyConfigView() { InitializeComponent(); } diff --git a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml similarity index 96% rename from ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml rename to ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml index cbd2b58..b764166 100644 --- a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml +++ b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml @@ -1,4 +1,4 @@ - + Title="NaiveProxy编辑配置" Height="600" Width="1000"> diff --git a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml.cs b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml.cs similarity index 70% rename from ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml.cs rename to ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml.cs index a4c4ae0..4a948bd 100644 --- a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml.cs +++ b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml.cs @@ -5,9 +5,9 @@ namespace ProxySuper.WPF.Views /// /// NaiveProxyEditorView.xaml 的交互逻辑 /// - public partial class NaiveProtoEditorView : MvxWindow + public partial class NaiveProxyEditorView : MvxWindow { - public NaiveProtoEditorView() + public NaiveProxyEditorView() { InitializeComponent(); } diff --git a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml similarity index 96% rename from ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml rename to ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml index 0798cd3..a2dfd4e 100644 --- a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml +++ b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml @@ -1,4 +1,4 @@ - + Title="TrojanGo安装" Height="600" Width="1000"> diff --git a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml.cs b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml.cs similarity index 85% rename from ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml.cs rename to ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml.cs index 62da6f2..da77f21 100644 --- a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml.cs +++ b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml.cs @@ -18,9 +18,9 @@ namespace ProxySuper.WPF.Views.NaiveProxy /// /// NaiveProxyInstallViewModel.xaml 的交互逻辑 /// - public partial class NaiveProtoInstallView : MvxWindow + public partial class NaiveProxyInstallView : MvxWindow { - public NaiveProtoInstallView() + public NaiveProxyInstallView() { InitializeComponent(); }