diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml
index 5047b56..4010c70 100644
--- a/ProxySU/MainWindow.xaml
+++ b/ProxySU/MainWindow.xaml
@@ -314,7 +314,7 @@
-
+
diff --git a/ProxySU/NaiveProxyResultInfoWindow.xaml b/ProxySU/NaiveProxyResultInfoWindow.xaml
index 52c4355..ab1b958 100644
--- a/ProxySU/NaiveProxyResultInfoWindow.xaml
+++ b/ProxySU/NaiveProxyResultInfoWindow.xaml
@@ -5,9 +5,13 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:ProxySU"
mc:Ignorable="d"
- Title="NaiveProxyResultInfoWindow" Height="200" Width="400">
+ Title="NaiveProxyResultInfoWindow" Height="300" Width="400">
-
+
+
+
+
+
@@ -33,5 +37,8 @@
+
+
+
diff --git a/ProxySU/NaiveProxyResultInfoWindow.xaml.cs b/ProxySU/NaiveProxyResultInfoWindow.xaml.cs
index 4c7e9d1..22c7424 100644
--- a/ProxySU/NaiveProxyResultInfoWindow.xaml.cs
+++ b/ProxySU/NaiveProxyResultInfoWindow.xaml.cs
@@ -47,15 +47,15 @@ namespace ProxySU
num++;
}
CheckDir(@"naive_config\" + saveFileFolder);
- //string trojanUrl = $"trojan://{TextBoxTrojanServerPassword.Text}@{TextBoxTrojanServerHost.Text}:{TextBoxTrojanServerPort.Text}#{TextBoxTrojanServerHost.Text}";
+ string naiveUrl = $"https://{TextBoxNaiveUser.Text}:{TextBoxNaivePassword.Text}@{TextBoxNaiveServerHost.Text}:443/?name={TextBoxNaiveServerHost.Text}&padding=true";
//MessageBox.Show(v2rayNjsonObject.ToString());
//string trojanUrl = "trojan://" + ToBase64Encode(v2rayNjsonObject.ToString());
- //TextBoxTrojanUrl.Text = trojanUrl;
- //using (StreamWriter sw = new StreamWriter($"trojan_config\\{saveFileFolder}\\url.txt"))
- //{
- // sw.WriteLine(trojanUrl);
+ TextBoxNaiveGUIurl.Text = naiveUrl;
+ using (StreamWriter sw = new StreamWriter($"naive_config\\{saveFileFolder}\\url.txt"))
+ {
+ sw.WriteLine(naiveUrl);
- //}
+ }
//CreateQRCode(trojanUrl);
//移动NaiveProxy官方程序配置文件到相应目录
@@ -73,7 +73,7 @@ namespace ProxySU
sw.WriteLine("NaiveProxy官方程序下载地址:https://github.com/klzgrad/naiveproxy/releases");
sw.WriteLine("下载相应版本,Windows选择naiveproxy-x.xx-win.zip,解压后提取naive.exe。与config.json放在同一目录,运行naive.exe即可。");
sw.WriteLine("-----------------------------------------\n");
- sw.WriteLine("其他平台的客户端,暂未发布");
+ //sw.WriteLine("其他平台的客户端,暂未发布");
//sw.WriteLine("QR.bmp");
//sw.WriteLine("此文件为Trojan-QT5 (windows)、igniter(Android)、Shadowrocket(ios)扫码导入节点");
//sw.WriteLine("Trojan-QT5 (windows)下载网址:https://github.com/TheWanderingCoel/Trojan-Qt5/releases");
@@ -81,9 +81,11 @@ namespace ProxySU
//sw.WriteLine("Shadowrocket(ios)下载,需要使用国外区的AppleID。请自行谷歌方法。");
//sw.WriteLine("-----------------------------------------\n");
- //sw.WriteLine("url.txt");
- //sw.WriteLine("此文件为Trojan-QT5 (windows)、igniter(Android)、Shadowrocket(ios)复制粘贴导入节点的网址");
- //sw.WriteLine("-----------------------------------------\n");
+ sw.WriteLine("url.txt");
+ sw.WriteLine("此文件为NaiveGUI(windows)复制粘贴导入节点的网址");
+ sw.WriteLine("NaiveGUI(windows)下载网址:https://github.com/ExcitedCodes/NaiveGUI/releases");
+
+ sw.WriteLine("-----------------------------------------\n");
sw.WriteLine("服务器通用连接配置参数");
sw.WriteLine($"地址(address):{TextBoxNaiveServerHost.Text}");
sw.WriteLine($"用户名:{TextBoxNaiveUser.Text}");
diff --git a/ProxySU/Properties/AssemblyInfo.cs b/ProxySU/Properties/AssemblyInfo.cs
index f1ab3e2..48dffcb 100644
--- a/ProxySU/Properties/AssemblyInfo.cs
+++ b/ProxySU/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.2.0")]
-[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyVersion("1.5.3.0")]
+[assembly: AssemblyFileVersion("1.5.3.0")]
diff --git a/ProxySU/bin/Beta/Beta.zip b/ProxySU/bin/Beta/Beta.zip
index eace1c9..67ebb78 100644
Binary files a/ProxySU/bin/Beta/Beta.zip and b/ProxySU/bin/Beta/Beta.zip differ