diff --git a/FontDecoder.cs b/FontDecoder.cs index 368a4da..3af2acb 100644 --- a/FontDecoder.cs +++ b/FontDecoder.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; +using System.Windows.Forms; using Newtonsoft.Json; namespace jjget @@ -38,7 +39,7 @@ public string Decode(string ct, string fontName) { if (!map.ContainsKey(fontName)) { - setPrompt("下载字体" + fontName + "(已有" + this.map.Count + ")"); + setPrompt("下载字体" + fontName + "(已有" + this.map.Count + ")......"); this.loadFont(fontName); } var lookup = this.map[fontName]; @@ -62,7 +63,7 @@ private void loadFont(string fontName) { try { - ct = hu.Get("https://jjwxc.yooooo.us/" + fontName + ".json"); + ct = hu.Get("https://jjwxc.yooooo.us/" + fontName + ".json?version=" + Application.ProductVersion); }catch(Exception ex) { setPrompt("字体下载失败" + ex.ToString(), Color.Orange); @@ -79,7 +80,11 @@ private void loadFont(string fontName) } this.map[fontName] = r.data; - this.saveMappings(); + // only cache if response count is expected + if (r.data.Count == 200) + { + this.saveMappings(); + } } private void loadMappings() diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 4895e1c..2c4f3c7 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值, // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.5")] -[assembly: AssemblyFileVersion("1.2.5")] +[assembly: AssemblyVersion("1.3.0")] +[assembly: AssemblyFileVersion("1.3.0")] diff --git a/frmMain.cs b/frmMain.cs index e1ded6e..4ba7119 100644 --- a/frmMain.cs +++ b/frmMain.cs @@ -184,7 +184,7 @@ private void button1_Click(object sender, EventArgs e) { if(novel.isVipChapter(i)) setPrompt(("章节" + i + "是VIP章节,"+ - (novel.hasLogin?"账号没有购买,或者登陆过期":"需要登录后才能下载")), Color.Red); + (novel.hasLogin?"可能是账号没有购买,或者登陆过期;请尝试稍后重试":"需要登录后才能下载")), Color.Red); else MessageBox.Show("处理章节" + i + "时正则匹配失败,请联系作者", "JJGET-ERROR", MessageBoxButtons.OK, MessageBoxIcon.Error); terminate = true; diff --git a/jjget.csproj b/jjget.csproj index 049db2a..55e774e 100644 --- a/jjget.csproj +++ b/jjget.csproj @@ -79,12 +79,6 @@ - - packages\Newtonsoft.Json.12.0.2\lib\net35\Newtonsoft.Json.dll - - - packages\HtmlAgilityPack.1.11.8\lib\Net35\HtmlAgilityPack.dll - @@ -148,7 +142,7 @@ 1.11.32 - + 13.0.1 @@ -160,4 +154,8 @@ --> + + + + \ No newline at end of file diff --git a/jjget.sln b/jjget.sln new file mode 100644 index 0000000..a28638a --- /dev/null +++ b/jjget.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31112.23 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jjget", "jjget.csproj", "{69EAF08F-7ABA-4734-ADEF-96CCC126888A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + SingleFile|Any CPU = SingleFile|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {69EAF08F-7ABA-4734-ADEF-96CCC126888A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {69EAF08F-7ABA-4734-ADEF-96CCC126888A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {69EAF08F-7ABA-4734-ADEF-96CCC126888A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {69EAF08F-7ABA-4734-ADEF-96CCC126888A}.Release|Any CPU.Build.0 = Release|Any CPU + {69EAF08F-7ABA-4734-ADEF-96CCC126888A}.SingleFile|Any CPU.ActiveCfg = SingleFile|Any CPU + {69EAF08F-7ABA-4734-ADEF-96CCC126888A}.SingleFile|Any CPU.Build.0 = SingleFile|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {7B666CF4-073B-41D6-8E09-63AC41BBBE36} + EndGlobalSection +EndGlobal