github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

refine GFWLIST_URL option

pull/695/head
YFdyh000 2020-04-19 00:58:55 +08:00
parent be7d76947b
commit 2c02285def
5 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
v2rayN/v2rayN/Forms/MainForm.cs
View File

@ -1460,7 +1460,8 @@ namespace v2rayN.Forms
}; };
} }
AppendText(false, UIRes.I18N("MsgStartUpdatingPAC")); AppendText(false, UIRes.I18N("MsgStartUpdatingPAC"));
pacListHandle.WebDownloadString(config.urlGFWList); string url = Utils.IsNullOrEmpty(config.urlGFWList) ? Global.GFWLIST_URL : config.urlGFWList;
pacListHandle.WebDownloadString(url);
} }
private void tsbCheckClearPACList_Click(object sender, EventArgs e) private void tsbCheckClearPACList_Click(object sender, EventArgs e)

9
v2rayN/v2rayN/Forms/OptionSettingForm.resx
View File

@ -964,7 +964,7 @@
<value>27</value> <value>27</value>
</data> </data>
<data name="label13.Text" xml:space="preserve"> <data name="label13.Text" xml:space="preserve">
<value>Custom GFWList address (please fill in the blank without customization)</value> <value>Custom GFWList address (use default value if leave blank)</value>
</data> </data>
<data name="&gt;&gt;label13.Type" xml:space="preserve"> <data name="&gt;&gt;label13.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@ -1915,10 +1915,7 @@
<value>4</value> <value>4</value>
</data> </data>
<data name="txturlGFWList.Location" type="System.Drawing.Point, System.Drawing"> <data name="txturlGFWList.Location" type="System.Drawing.Point, System.Drawing">
<value>32, 205</value> <value>32, 200</value>
</data>
<data name="txturlGFWList.Multiline" type="System.Boolean, mscorlib">
<value>True</value>
</data> </data>
<data name="&gt;&gt;txturlGFWList.Name" xml:space="preserve"> <data name="&gt;&gt;txturlGFWList.Name" xml:space="preserve">
<value>txturlGFWList</value> <value>txturlGFWList</value>
@ -1927,7 +1924,7 @@
<value>tabGUI</value> <value>tabGUI</value>
</data> </data>
<data name="txturlGFWList.Size" type="System.Drawing.Size, System.Drawing"> <data name="txturlGFWList.Size" type="System.Drawing.Size, System.Drawing">
<value>541, 100</value> <value>541, 21</value>
</data> </data>
<data name="txturlGFWList.TabIndex" type="System.Int32, mscorlib"> <data name="txturlGFWList.TabIndex" type="System.Int32, mscorlib">
<value>28</value> <value>28</value>

2
v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
View File

@ -252,7 +252,7 @@
<value>227, 12</value> <value>227, 12</value>
</data> </data>
<data name="label13.Text" xml:space="preserve"> <data name="label13.Text" xml:space="preserve">
<value>自定义GFWList地址(不需自定义请填空白)</value> <value>自定义GFWList地址(留空则使用默认值)</value>
</data> </data>
<data name="label14.Size" type="System.Drawing.Size, System.Drawing"> <data name="label14.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 12</value> <value>191, 12</value>

4
v2rayN/v2rayN/Handler/ConfigHandler.cs
View File

@ -133,10 +133,6 @@ namespace v2rayN.Handler
{ {
config.speedPingTestUrl = Global.SpeedPingTestUrl; config.speedPingTestUrl = Global.SpeedPingTestUrl;
} }
if (Utils.IsNullOrEmpty(config.urlGFWList))
{
config.urlGFWList = Global.GFWLIST_URL;
}
//if (Utils.IsNullOrEmpty(config.remoteDNS)) //if (Utils.IsNullOrEmpty(config.remoteDNS))
//{ //{
// config.remoteDNS = "1.1.1.1"; // config.remoteDNS = "1.1.1.1";

2
v2rayN/v2rayN/Mode/Config.cs
View File

@ -86,7 +86,7 @@ namespace v2rayN.Mode
/// </summary> /// </summary>
public string speedPingTestUrl { get; set; } public string speedPingTestUrl { get; set; }
/// <summary> /// <summary>
/// 自定义GFWList url /// 自定义GFWList url。空白则使用 Global.GFWLIST_URL
/// </summary> /// </summary>
public string urlGFWList { get; set; } public string urlGFWList { get; set; }