mirror/ProxySU
1
0
Fork 0
mirror of https://github.com/proxysu/ProxySU.git synced 2025-04-11 13:11:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'proxysu:master' into master

Browse source
This commit is contained in:
Stklv 2022-04-26 19:01:20 +08:00 • committed by GitHub
commit 3b413693d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -199,3 +199,4 @@ FakesAssemblies/
# vs code # vs code
.vscode/* .vscode/*
/ProxySU_Core/Data/Record.json /ProxySU_Core/Data/Record.json
/ProxySuper.WPF/bin

4
ProxySuper.Core/Services/ServiceBase.cs
View file

@ -412,7 +412,7 @@ namespace ProxySuper.Core.Services
string cmd; string cmd;
Progress.Desc = ("检测IPv4"); Progress.Desc = ("检测IPv4");
cmd = RunCmd(@"curl -s https://api.ip.sb/ip --ipv4 --max-time 8"); cmd = RunCmd(@"curl -4 ip.sb");
IPv4 = cmd.TrimEnd('\r', '\n'); IPv4 = cmd.TrimEnd('\r', '\n');
Progress.Desc = ($"IPv4地址为{IPv4}"); Progress.Desc = ($"IPv4地址为{IPv4}");
@ -423,7 +423,7 @@ namespace ProxySuper.Core.Services
else else
{ {
Progress.Desc = ("检测IPv6"); Progress.Desc = ("检测IPv6");
cmd = RunCmd(@"curl -s https://api.ip.sb/ip --ipv6 --max-time 8"); cmd = RunCmd(@"curl -6 ip.sb");
IPv6 = cmd.TrimEnd('\r', '\n'); IPv6 = cmd.TrimEnd('\r', '\n');
Progress.Desc = ($"IPv6地址为{IPv6}"); Progress.Desc = ($"IPv6地址为{IPv6}");

4
ProxySuper.Core/ViewModels/HomeViewModel.cs
View file

@ -53,6 +53,10 @@ namespace ProxySuper.Core.ViewModels
{ {
ContractResolver = new CamelCasePropertyNamesContractResolver() ContractResolver = new CamelCasePropertyNamesContractResolver()
}); });
if (!Directory.Exists("Data"))
{
Directory.CreateDirectory("Data");
}
File.WriteAllText("Data/Record.json", json); File.WriteAllText("Data/Record.json", json);
} }