mirror/ProxySU
1
0
Fork 0
mirror of https://github.com/proxysu/ProxySU.git synced 2024-11-22 21:26:09 +03:00
Code Issues Projects Releases Wiki Activity

修复Bug

Browse Source
This commit is contained in:
ProxySU 2020-08-25 10:09:50 +08:00
parent 7cf19e7dc5
commit 6a72b85785
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ProxySU/ResultClientInformation.xaml.cs
View File

@ -292,7 +292,7 @@ namespace ProxySU
TextBlockTrojanGoWebSocketPath.Visibility = Visibility.Hidden; TextBlockTrojanGoWebSocketPath.Visibility = Visibility.Hidden;
TextBlockTrojanGoCaption.Visibility = Visibility.Hidden; TextBlockTrojanGoCaption.Visibility = Visibility.Hidden;
TextBlockQrURLexplain.Text = "可用于ShadowRocket (ios)、igniter（Android）、Trojan-QT5 (windows) 扫码和导入url"; TextBlockQrURLexplain.Text = "可用于ShadowRocket (ios)、igniter（Android）、Trojan-QT5 (windows) 扫码和导入url。注意：有的客户端可能不支持WebSocket模式。";
//主机地址 //主机地址
TextBoxTrojanGoServerHost.Text = MainWindow.ReceiveConfigurationParameters[4]; TextBoxTrojanGoServerHost.Text = MainWindow.ReceiveConfigurationParameters[4];
@ -319,6 +319,8 @@ namespace ProxySU
GroupBoxTrojanClient.Visibility = Visibility.Visible; GroupBoxTrojanClient.Visibility = Visibility.Visible;
GroupBoxNaiveProxyClient.Visibility = Visibility.Collapsed; GroupBoxNaiveProxyClient.Visibility = Visibility.Collapsed;
TextBlockQrURLexplain.Text = "可用于ShadowRocket (ios)、igniter（Android）、Trojan-QT5 (windows) 扫码和导入url";
//主机地址 //主机地址
TextBoxTrojanServerHost.Text = MainWindow.ReceiveConfigurationParameters[4]; TextBoxTrojanServerHost.Text = MainWindow.ReceiveConfigurationParameters[4];
//主机端口 //主机端口
@ -326,8 +328,6 @@ namespace ProxySU
//密钥（uuid） //密钥（uuid）
TextBoxTrojanServerPassword.Text = MainWindow.ReceiveConfigurationParameters[2]; TextBoxTrojanServerPassword.Text = MainWindow.ReceiveConfigurationParameters[2];
TextBlockQrURLexplain.Text = "可用于ShadowRocket (ios)、igniter（Android）、Trojan-QT5 (windows) 扫码和导入url";
CheckDir("trojan_config"); CheckDir("trojan_config");
GenerateTrojanShareQRcodeAndBase64Url(); GenerateTrojanShareQRcodeAndBase64Url();
} }
@ -502,7 +502,7 @@ namespace ProxySU
private void GenerateTrojanGoShareQRcodeAndBase64Url() private void GenerateTrojanGoShareQRcodeAndBase64Url()
{ {
string saveFileFolderFirst = TextBoxTrojanServerHost.Text; string saveFileFolderFirst = TextBoxTrojanGoServerHost.Text;
int num = 1; int num = 1;
saveFileFolder = saveFileFolderFirst; saveFileFolder = saveFileFolderFirst;
CheckDir("trojan-go_config"); CheckDir("trojan-go_config");
@ -512,7 +512,7 @@ namespace ProxySU
num++; num++;
} }
CheckDir(@"trojan-go_config\" + saveFileFolder); CheckDir(@"trojan-go_config\" + saveFileFolder);
string trojanUrl = $"trojan://{TextBoxTrojanServerPassword.Text}@{TextBoxTrojanServerHost.Text}:{TextBoxTrojanServerPort.Text}?allowinsecure=0&tfo=0&sni=&mux=0&ws=0&group=#{TextBoxTrojanServerHost.Text}"; string trojanUrl = $"trojan://{TextBoxTrojanGoServerPassword.Text}@{TextBoxTrojanGoServerHost.Text}:{TextBoxTrojanGoServerPort.Text}?allowinsecure=0&tfo=0&sni=&mux=0&ws=0&group=#{TextBoxTrojanGoServerHost.Text}";
//MessageBox.Show(v2rayNjsonObject.ToString()); //MessageBox.Show(v2rayNjsonObject.ToString());
//string trojanUrl = "trojan://" + ToBase64Encode(v2rayNjsonObject.ToString()); //string trojanUrl = "trojan://" + ToBase64Encode(v2rayNjsonObject.ToString());
TextBoxURL.Text = trojanUrl; TextBoxURL.Text = trojanUrl;
@ -549,9 +549,9 @@ namespace ProxySU
sw.WriteLine("此文件为Trojan-QT5 (windows)、igniter（Android）、Shadowrocket(ios)复制粘贴导入节点的网址（Trojan-Go的WebSocket模式暂不支持）"); sw.WriteLine("此文件为Trojan-QT5 (windows)、igniter（Android）、Shadowrocket(ios)复制粘贴导入节点的网址（Trojan-Go的WebSocket模式暂不支持）");
sw.WriteLine("-----------------------------------------\n"); sw.WriteLine("-----------------------------------------\n");
sw.WriteLine("服务器通用连接配置参数"); sw.WriteLine("服务器通用连接配置参数");
sw.WriteLine($"地址(address)：{TextBoxTrojanServerHost.Text}"); sw.WriteLine($"地址(address)：{TextBoxTrojanGoServerHost.Text}");
sw.WriteLine($"端口(Port)：{TextBoxTrojanServerPort.Text}"); sw.WriteLine($"端口(Port)：{TextBoxTrojanGoServerPort.Text}");
sw.WriteLine($"密钥：{TextBoxTrojanServerPassword.Text}"); sw.WriteLine($"密钥：{TextBoxTrojanGoServerPassword.Text}");
sw.WriteLine($"WebSocket路径：{TextBoxTrojanGoWSPath.Text}"); sw.WriteLine($"WebSocket路径：{TextBoxTrojanGoWSPath.Text}");
} }

BIN
ProxySU/bin/Beta/Beta.zip
View File

Binary file not shown.