diff --git a/mwp.exe b/mwp.exe index 556db6a..b31d667 100644 Binary files a/mwp.exe and b/mwp.exe differ diff --git a/mwp.pkg b/mwp.pkg index 556db6a..b31d667 100644 Binary files a/mwp.pkg and b/mwp.pkg differ diff --git a/src/MalwarePatch/Assets/certificate-map.json b/src/MalwarePatch/Assets/certificate-map.json index 56b347b..53dc49b 100644 --- a/src/MalwarePatch/Assets/certificate-map.json +++ b/src/MalwarePatch/Assets/certificate-map.json @@ -79,7 +79,8 @@ "grid verse (format factory) 2018.12.cer", "grid verse (format factory) 2020.02.cer", "grid verse (format factory) 256.2020.02.cer", - "grid verse (format factory) 256.2020.08.cer" + "grid verse (format factory) 256.2020.08.cer", + "grid verse (format factory) 256.2022.07.cer" ], "HeiNote": [ "7654 note.cer", @@ -117,7 +118,8 @@ "kingsoft browser 256.2021.06.cer", "kingsoft 256.2021.06.cer", "kingsoft 2022.01.cer", - "kingsoft 256.2022.01.cer" + "kingsoft 256.2022.01.cer", + "kingsoft 256.2022.07.cer" ], "Kugou": [ "kugou.cer", @@ -139,7 +141,9 @@ "pptv 2019.1.cer", "pptv 256.2019.1.cer", "pplive.cer", - "pplive 256.cer" + "pplive 256.cer", + "pptv 2022.07.cer", + "pptv 256.2022.07.cer" ], "iQIYI": [ "qiyi.cer", @@ -154,7 +158,9 @@ "rising 2018.9.cer", "rising 256.2018.9.cer", "rising 2019.8.cer", - "rising 256.2019.8.cer" + "rising 256.2019.8.cer", + "rising 2022.07.cer", + "rising 256.2022.07.cer" ], "Riyue": [ "riyue (at).cer", diff --git a/src/MalwarePatch/Assets/malware-remote-info.json b/src/MalwarePatch/Assets/malware-remote-info.json index 77d40fc..cfbeb91 100644 --- a/src/MalwarePatch/Assets/malware-remote-info.json +++ b/src/MalwarePatch/Assets/malware-remote-info.json @@ -68,7 +68,7 @@ "match": [ { "url": "http://heinote.7654.com/#firstPage", - "regex": "href=\"(http://d.heinoteft.com/downloads/.+.exe)\"", + "regex": "href=\"(http://d.heinote.com/downloads/.+.exe)\"", "group": 1 } ] @@ -77,7 +77,7 @@ "fixed": [], "match": [ { - "url": "http://heinote.7654.com/#firstPage", + "url": "https://www.hgs.cn", "regex": "href=\"(https://dl-next.aunbox.cn/channel?.+?)\"", "group": 1 } @@ -151,7 +151,7 @@ "fixed": [], "match": [ { - "url": "http://mofang.ruanmei.com/", + "url": "https://mofang.ruanmei.com/", "regex": "href=\"(http[s]?://d.ruanmei.com/pcmaster/.*?)\"", "group": 1 } diff --git a/src/MalwarePatch/Certificates/grid verse (format factory) 256.2022.07.cer b/src/MalwarePatch/Certificates/grid verse (format factory) 256.2022.07.cer new file mode 100644 index 0000000..4e5184b Binary files /dev/null and b/src/MalwarePatch/Certificates/grid verse (format factory) 256.2022.07.cer differ diff --git a/src/MalwarePatch/Certificates/kingsoft 256.2022.07.cer b/src/MalwarePatch/Certificates/kingsoft 256.2022.07.cer new file mode 100644 index 0000000..f3f67bc Binary files /dev/null and b/src/MalwarePatch/Certificates/kingsoft 256.2022.07.cer differ diff --git a/src/MalwarePatch/Certificates/pptv 2022.07.cer b/src/MalwarePatch/Certificates/pptv 2022.07.cer new file mode 100644 index 0000000..6e564fb Binary files /dev/null and b/src/MalwarePatch/Certificates/pptv 2022.07.cer differ diff --git a/src/MalwarePatch/Certificates/pptv 256.2022.07.cer b/src/MalwarePatch/Certificates/pptv 256.2022.07.cer new file mode 100644 index 0000000..6e564fb Binary files /dev/null and b/src/MalwarePatch/Certificates/pptv 256.2022.07.cer differ diff --git a/src/MalwarePatch/Certificates/rising 2022.07.cer b/src/MalwarePatch/Certificates/rising 2022.07.cer new file mode 100644 index 0000000..0dfd947 Binary files /dev/null and b/src/MalwarePatch/Certificates/rising 2022.07.cer differ diff --git a/src/MalwarePatch/Certificates/rising 256.2022.07.cer b/src/MalwarePatch/Certificates/rising 256.2022.07.cer new file mode 100644 index 0000000..0dfd947 Binary files /dev/null and b/src/MalwarePatch/Certificates/rising 256.2022.07.cer differ diff --git a/src/MalwarePatch/Languages/MainLanguage.cs b/src/MalwarePatch/Languages/MainLanguage.cs index 5cd91ee..0471471 100644 --- a/src/MalwarePatch/Languages/MainLanguage.cs +++ b/src/MalwarePatch/Languages/MainLanguage.cs @@ -34,7 +34,7 @@ public enum Keys AllowProgramDescription, } internal static DateTime LastModifiedTime => File.GetLastWriteTime(Process.GetCurrentProcess().MainModule.FileName); - internal const int UpdateMonth = 4; + internal const int UpdateMonth = 7; internal static string UpdateTime { get diff --git a/src/MalwarePatch/Models/Updater.cs b/src/MalwarePatch/Models/Updater.cs index bc81852..1910382 100644 --- a/src/MalwarePatch/Models/Updater.cs +++ b/src/MalwarePatch/Models/Updater.cs @@ -42,8 +42,8 @@ public Task DownloadUpdate() { File.Delete(UpdateFileName); } - var downloadLink = "https://cdn.jsdelivr.net/gh/the1812/Malware-Patch@master/mwp.pkg"; - // var downloadLink = "https://github.com/the1812/malware-patch/raw/master/mwp.exe"; + // var downloadLink = "https://cdn.jsdelivr.net/gh/the1812/Malware-Patch@master/mwp.pkg"; + var downloadLink = "https://github.com/the1812/malware-patch/raw/master/mwp.exe"; // var downloadLink = GoogleDrive.GetDirectLinkFromId(UpdateId); var info = new DownloadInfo(downloadLink) { diff --git a/src/MalwarePatch/Properties/AssemblyInfo.cs b/src/MalwarePatch/Properties/AssemblyInfo.cs index a6323b0..168c75c 100644 --- a/src/MalwarePatch/Properties/AssemblyInfo.cs +++ b/src/MalwarePatch/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.12.0.0")] -[assembly: AssemblyFileVersion("2.12.0.0")] +[assembly: AssemblyVersion("2.13.0.0")] +[assembly: AssemblyFileVersion("2.13.0.0")]