Skip to content

Commit 6a72b85

Browse files
committed
修复Bug
1 parent 7cf19e7 commit 6a72b85

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

ProxySU/ResultClientInformation.xaml.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ public ResultClientInformation()
292292
TextBlockTrojanGoWebSocketPath.Visibility = Visibility.Hidden;
293293
TextBlockTrojanGoCaption.Visibility = Visibility.Hidden;
294294

295-
TextBlockQrURLexplain.Text = "可用于ShadowRocket (ios)、igniter(Android)、Trojan-QT5 (windows) 扫码和导入url";
295+
TextBlockQrURLexplain.Text = "可用于ShadowRocket (ios)、igniter(Android)、Trojan-QT5 (windows) 扫码和导入url。注意:有的客户端可能不支持WebSocket模式。";
296296

297297
//主机地址
298298
TextBoxTrojanGoServerHost.Text = MainWindow.ReceiveConfigurationParameters[4];
@@ -319,15 +319,15 @@ public ResultClientInformation()
319319
GroupBoxTrojanClient.Visibility = Visibility.Visible;
320320
GroupBoxNaiveProxyClient.Visibility = Visibility.Collapsed;
321321

322+
TextBlockQrURLexplain.Text = "可用于ShadowRocket (ios)、igniter(Android)、Trojan-QT5 (windows) 扫码和导入url";
323+
322324
//主机地址
323325
TextBoxTrojanServerHost.Text = MainWindow.ReceiveConfigurationParameters[4];
324326
//主机端口
325327
TextBoxTrojanServerPort.Text = "443";
326328
//密钥(uuid)
327329
TextBoxTrojanServerPassword.Text = MainWindow.ReceiveConfigurationParameters[2];
328330

329-
TextBlockQrURLexplain.Text = "可用于ShadowRocket (ios)、igniter(Android)、Trojan-QT5 (windows) 扫码和导入url";
330-
331331
CheckDir("trojan_config");
332332
GenerateTrojanShareQRcodeAndBase64Url();
333333
}
@@ -502,7 +502,7 @@ private void GenerateV2rayShareQRcodeAndBase64Url()
502502
private void GenerateTrojanGoShareQRcodeAndBase64Url()
503503
{
504504

505-
string saveFileFolderFirst = TextBoxTrojanServerHost.Text;
505+
string saveFileFolderFirst = TextBoxTrojanGoServerHost.Text;
506506
int num = 1;
507507
saveFileFolder = saveFileFolderFirst;
508508
CheckDir("trojan-go_config");
@@ -512,7 +512,7 @@ private void GenerateTrojanGoShareQRcodeAndBase64Url()
512512
num++;
513513
}
514514
CheckDir(@"trojan-go_config\" + saveFileFolder);
515-
string trojanUrl = $"trojan://{TextBoxTrojanServerPassword.Text}@{TextBoxTrojanServerHost.Text}:{TextBoxTrojanServerPort.Text}?allowinsecure=0&tfo=0&sni=&mux=0&ws=0&group=#{TextBoxTrojanServerHost.Text}";
515+
string trojanUrl = $"trojan://{TextBoxTrojanGoServerPassword.Text}@{TextBoxTrojanGoServerHost.Text}:{TextBoxTrojanGoServerPort.Text}?allowinsecure=0&tfo=0&sni=&mux=0&ws=0&group=#{TextBoxTrojanGoServerHost.Text}";
516516
//MessageBox.Show(v2rayNjsonObject.ToString());
517517
//string trojanUrl = "trojan://" + ToBase64Encode(v2rayNjsonObject.ToString());
518518
TextBoxURL.Text = trojanUrl;
@@ -549,9 +549,9 @@ private void GenerateTrojanGoShareQRcodeAndBase64Url()
549549
sw.WriteLine("此文件为Trojan-QT5 (windows)、igniter(Android)、Shadowrocket(ios)复制粘贴导入节点的网址(Trojan-Go的WebSocket模式暂不支持)");
550550
sw.WriteLine("-----------------------------------------\n");
551551
sw.WriteLine("服务器通用连接配置参数");
552-
sw.WriteLine($"地址(address):{TextBoxTrojanServerHost.Text}");
553-
sw.WriteLine($"端口(Port):{TextBoxTrojanServerPort.Text}");
554-
sw.WriteLine($"密钥:{TextBoxTrojanServerPassword.Text}");
552+
sw.WriteLine($"地址(address):{TextBoxTrojanGoServerHost.Text}");
553+
sw.WriteLine($"端口(Port):{TextBoxTrojanGoServerPort.Text}");
554+
sw.WriteLine($"密钥:{TextBoxTrojanGoServerPassword.Text}");
555555
sw.WriteLine($"WebSocket路径:{TextBoxTrojanGoWSPath.Text}");
556556

557557
}

ProxySU/bin/Beta/Beta.zip

45 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)