Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-04-19 13:42:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

up test

Browse source
This commit is contained in:
2dust 2019-11-02 11:07:31 +08:00
parent f199e3bf82
commit 9eab95e870
4 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
v2rayN/v2rayN/Global.cs
View file

@ -25,6 +25,8 @@ namespace v2rayN
/// </summary> /// </summary>
public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/"; public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/";
public const string GFWLIST_URL = "https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt";
/// <summary> /// <summary>
/// PromotionUrl /// PromotionUrl
/// </summary> /// </summary>

6
v2rayN/v2rayN/Handler/ConfigHandler.cs
View file

@ -121,6 +121,10 @@ namespace v2rayN.Handler
//{ //{
// config.pacPort = 8888; // config.pacPort = 8888;
//} //}
if (Utils.IsNullOrEmpty(config.urlGFWList))
{
config.urlGFWList = Global.GFWLIST_URL;
}
if (config.subItem == null) if (config.subItem == null)
{ {
@ -579,7 +583,7 @@ namespace v2rayN.Handler
vmessItem.address = vmessItem.address.TrimEx(); vmessItem.address = vmessItem.address.TrimEx();
vmessItem.id = vmessItem.id.TrimEx(); vmessItem.id = vmessItem.id.TrimEx();
vmessItem.security = vmessItem.security.TrimEx(); vmessItem.security = vmessItem.security.TrimEx();
if (index >= 0) if (index >= 0)
{ {
//修改 //修改

4
v2rayN/v2rayN/Handler/SpeedtestHandler.cs
View file

@ -140,6 +140,8 @@ namespace v2rayN.Handler
Global.reloadV2ray = true; Global.reloadV2ray = true;
_v2rayHandler.LoadV2ray(_config, _selecteds); _v2rayHandler.LoadV2ray(_config, _selecteds);
Thread.Sleep(5000);
var httpPort = _config.GetLocalPort("speedtest"); var httpPort = _config.GetLocalPort("speedtest");
for (int k = 0; k < _selecteds.Count; k++) for (int k = 0; k < _selecteds.Count; k++)
{ {
@ -191,6 +193,8 @@ namespace v2rayN.Handler
Global.reloadV2ray = true; Global.reloadV2ray = true;
_v2rayHandler.LoadV2ray(_config, _selecteds); _v2rayHandler.LoadV2ray(_config, _selecteds);
Thread.Sleep(5000);
string url = Global.SpeedTestUrl; string url = Global.SpeedTestUrl;
testCounter = 0; testCounter = 0;
if (downloadHandle2 == null) if (downloadHandle2 == null)

4
v2rayN/v2rayN/HttpProxyHandler/PACListHandle.cs
View file

@ -29,13 +29,13 @@ namespace v2rayN.HttpProxyHandler
} }
} }
private const string GFWLIST_URL = "https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt";
private static readonly IEnumerable<char> IgnoredLineBegins = new[] { '!', '[' }; private static readonly IEnumerable<char> IgnoredLineBegins = new[] { '!', '[' };
public void UpdatePACFromGFWList(Config config) public void UpdatePACFromGFWList(Config config)
{ {
string url = GFWLIST_URL; string url = Global.GFWLIST_URL;
if (!Utils.IsNullOrEmpty(config.urlGFWList)) if (!Utils.IsNullOrEmpty(config.urlGFWList))
{ {
url = config.urlGFWList; url = config.urlGFWList;