From 9eab95e8705a8c675b1c360bbf18b58b6b57ce2d Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 2 Nov 2019 11:07:31 +0800
Subject: [PATCH] up test

---
 v2rayN/v2rayN/Global.cs                         | 2 ++
 v2rayN/v2rayN/Handler/ConfigHandler.cs          | 6 +++++-
 v2rayN/v2rayN/Handler/SpeedtestHandler.cs       | 4 ++++
 v2rayN/v2rayN/HttpProxyHandler/PACListHandle.cs | 4 ++--
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index 23ff973d..af6ab9e8 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -25,6 +25,8 @@ namespace v2rayN
         /// </summary>
         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>
         /// PromotionUrl
         /// </summary>
diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index b5046ccb..51ed743f 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -121,6 +121,10 @@ namespace v2rayN.Handler
             //{
             //    config.pacPort = 8888;
             //}
+            if (Utils.IsNullOrEmpty(config.urlGFWList))
+            {
+                config.urlGFWList = Global.GFWLIST_URL;
+            }
 
             if (config.subItem == null)
             {
@@ -579,7 +583,7 @@ namespace v2rayN.Handler
             vmessItem.address = vmessItem.address.TrimEx();
             vmessItem.id = vmessItem.id.TrimEx();
             vmessItem.security = vmessItem.security.TrimEx();
-           
+
             if (index >= 0)
             {
                 //修改
diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
index f8a6e5be..c2df82fc 100644
--- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
+++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
@@ -140,6 +140,8 @@ namespace v2rayN.Handler
                 Global.reloadV2ray = true;
                 _v2rayHandler.LoadV2ray(_config, _selecteds);
 
+                Thread.Sleep(5000);
+
                 var httpPort = _config.GetLocalPort("speedtest");
                 for (int k = 0; k < _selecteds.Count; k++)
                 {
@@ -191,6 +193,8 @@ namespace v2rayN.Handler
             Global.reloadV2ray = true;
             _v2rayHandler.LoadV2ray(_config, _selecteds);
 
+            Thread.Sleep(5000);
+
             string url = Global.SpeedTestUrl;
             testCounter = 0;
             if (downloadHandle2 == null)
diff --git a/v2rayN/v2rayN/HttpProxyHandler/PACListHandle.cs b/v2rayN/v2rayN/HttpProxyHandler/PACListHandle.cs
index 0fa76f7c..85a53c14 100644
--- a/v2rayN/v2rayN/HttpProxyHandler/PACListHandle.cs
+++ b/v2rayN/v2rayN/HttpProxyHandler/PACListHandle.cs
@@ -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[] { '!', '[' };
 
         public void UpdatePACFromGFWList(Config config)
         {
-            string url = GFWLIST_URL;
+            string url = Global.GFWLIST_URL;
             if (!Utils.IsNullOrEmpty(config.urlGFWList))
             {
                 url = config.urlGFWList;