mirror of
https://github.com/proxysu/ProxySU.git
synced 2024-11-29 08:36:08 +03:00
修复域名测试bug
This commit is contained in:
parent
1829de1e48
commit
fe6a424255
@ -221,6 +221,11 @@
|
|||||||
<WebBrowser x:Name="WebBrowserResourcesAndTools" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="9" Grid.RowSpan="13" Source="https://github.com/proxysu/windows/wiki/ResourcesAndTools" />
|
<WebBrowser x:Name="WebBrowserResourcesAndTools" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="9" Grid.RowSpan="13" Source="https://github.com/proxysu/windows/wiki/ResourcesAndTools" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
<!--<TabItem Header="关于" Width="110" Height="30">
|
||||||
|
<Grid>
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
</TabItem>-->
|
||||||
</TabControl>
|
</TabControl>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
|
@ -551,13 +551,34 @@ namespace ProxySU
|
|||||||
}
|
}
|
||||||
//MessageBox.Show(timesStamp2.ToString());
|
//MessageBox.Show(timesStamp2.ToString());
|
||||||
|
|
||||||
//如果使用如果是WebSocket + TLS + Web模式,需要检测域名解析是否正确
|
//如果使用如果是WebSocket + TLS + Web/http2/Http2Web/tcp_TLS/WebSocket_TLS模式,需要检测域名解析是否正确
|
||||||
if (serverConfig.Contains("WebSocketTLSWeb") == true || serverConfig.Contains("http2") == true)
|
if (serverConfig.Contains("WebSocketTLSWeb") == true || serverConfig.Contains("http2") == true || serverConfig.Contains("Http2Web") == true || serverConfig.Contains("tcp_TLS") == true || serverConfig.Contains("WebSocket_TLS") == true)
|
||||||
{
|
{
|
||||||
currentStatus = "正在检测域名是否解析到当前VPS的IP上......";
|
currentStatus = "正在检测域名是否解析到当前VPS的IP上......";
|
||||||
textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
|
textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
|
||||||
Thread.Sleep(1000);
|
Thread.Sleep(1000);
|
||||||
|
|
||||||
|
//在相应系统内安装curl(如果没有安装curl)
|
||||||
|
if (string.IsNullOrEmpty(client.RunCommand("command -v curl").Result) == true)
|
||||||
|
{
|
||||||
|
//为假则表示系统有相应的组件。
|
||||||
|
if (getApt == false)
|
||||||
|
{
|
||||||
|
client.RunCommand("apt-get -qq update");
|
||||||
|
client.RunCommand("apt-get -y -qq install curl");
|
||||||
|
}
|
||||||
|
if (getYum == false)
|
||||||
|
{
|
||||||
|
client.RunCommand("yum -q makecache");
|
||||||
|
client.RunCommand("yum -y -q install curl");
|
||||||
|
}
|
||||||
|
if (getZypper == false)
|
||||||
|
{
|
||||||
|
client.RunCommand("zypper ref");
|
||||||
|
client.RunCommand("zypper -y install curl");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
string nativeIp = client.RunCommand("curl -4 ip.sb").Result.ToString();
|
string nativeIp = client.RunCommand("curl -4 ip.sb").Result.ToString();
|
||||||
string testDomainCmd = "ping " + ReceiveConfigurationParameters[4] + " -c 1 | grep -oE -m1 \"([0-9]{1,3}\\.){3}[0-9]{1,3}\"";
|
string testDomainCmd = "ping " + ReceiveConfigurationParameters[4] + " -c 1 | grep -oE -m1 \"([0-9]{1,3}\\.){3}[0-9]{1,3}\"";
|
||||||
string resultCmd = client.RunCommand(testDomainCmd).Result.ToString();
|
string resultCmd = client.RunCommand(testDomainCmd).Result.ToString();
|
||||||
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user