Update to v2.9.1

the1812 · Jan 3, 2020 · fab36b7 · fab36b7
1 parent b9834a7
commit fab36b7
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 130 deletions.
diff --git a/mwp-ver.txt b/mwp-ver.txt
@@ -1 +1 @@
-2.9.0.0
+2.9.1.0
diff --git a/mwp.exe b/mwp.exe
diff --git a/src/MalwarePatch/Assets/certificate-map.json b/src/MalwarePatch/Assets/certificate-map.json
@@ -35,7 +35,9 @@
   ],
   "DongfangToutiao": [
     "donfang toutiao.cer",
-    "donfang toutiao 256.cer"
+    "donfang toutiao 256.cer",
+	"donfang toutiao 2020.1.cer",
+    "donfang toutiao 256.2020.1.cer"
   ],
   "DriverLife": [
     "driveTheLife.cer",
@@ -151,7 +153,9 @@
     "thunder accel.cer",
     "thunder accel 256.cer",
     "thunder player 2018.12.cer",
-    "thunder player 256.2018.12.cer"
+    "thunder player 256.2018.12.cer",
+	"thunder 2020.1.cer",
+	"thunder 256.2020.1.cer"
   ],
   "Youku": [
     "youku.cer",
@@ -164,6 +168,8 @@
     "yy 256.cer",
     "yy browser.cer",
     "yy 2018.12.cer",
-    "yy 256.2018.12.cer"
+    "yy 256.2018.12.cer",
+	"yy 2020.1.cer",
+	"yy 256.2020.1.cer"
   ]
 }
diff --git a/src/MalwarePatch/Assets/malware-remote-info.json b/src/MalwarePatch/Assets/malware-remote-info.json
@@ -57,7 +57,7 @@
     "match": [
       {
         "url": "http://www.160.com/",
-        "regex": "href=\"(https://file1.updrv.com/soft/dtl8/.*?\.exe)",
+        "regex": "href=\"(http[s]?://file1.updrv.com/soft/dtl8/.*?\.exe)",
         "group": 1
       }
     ]
@@ -98,7 +98,7 @@
       },
       {
         "url": "https://www.liebao.cn/",
-        "regex": "class=\"btn10192\".*href=\"(.*?)\"",
+        "regex": "href=\"(http[s]?://dl.liebao.cn/kb/KSbrowser.*?)\"",
         "group": 1
       },
       {
@@ -147,7 +147,7 @@
     "match": [
       {
         "url": "http://mofang.ruanmei.com/",
-        "regex": "class=\"down\".*href=\"(.*?)\".*class=\"down_btn\"",
+        "regex": "href=\"(http[s]?://d.ruanmei.com/pcmaster/.*?)\"",
         "group": 1
       }
     ]

diff --git a/src/MalwarePatch/Certificates/donfang toutiao 2020.1.cer b/src/MalwarePatch/Certificates/donfang toutiao 2020.1.cer
diff --git a/src/MalwarePatch/Certificates/donfang toutiao 256.2020.1.cer b/src/MalwarePatch/Certificates/donfang toutiao 256.2020.1.cer
diff --git a/src/MalwarePatch/Certificates/thunder 2020.1.cer b/src/MalwarePatch/Certificates/thunder 2020.1.cer
diff --git a/src/MalwarePatch/Certificates/thunder 256.2020.1.cer b/src/MalwarePatch/Certificates/thunder 256.2020.1.cer
diff --git a/src/MalwarePatch/Certificates/yy 2020.1.cer b/src/MalwarePatch/Certificates/yy 2020.1.cer
diff --git a/src/MalwarePatch/Certificates/yy 256.2020.1.cer b/src/MalwarePatch/Certificates/yy 256.2020.1.cer
diff --git 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 = 10;
+        internal const int UpdateMonth = 1;
         internal static string UpdateTime
         {
             get

diff --git a/src/MalwarePatch/MalwarePatch.csproj b/src/MalwarePatch/MalwarePatch.csproj
@@ -185,125 +185,8 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <Resource Include="Certificates\2345 256.cer" />
-    <Resource Include="Certificates\2345.cer" />
-    <Resource Include="Certificates\360 256.cer" />
-    <Resource Include="Certificates\360.cer" />
-    <Resource Include="Certificates\baidu.cer" />
-    <Resource Include="Certificates\baofeng 256.cer" />
-    <Resource Include="Certificates\baofeng.cer" />
-    <Resource Include="Certificates\driveTheLife 256.cer" />
-    <Resource Include="Certificates\driveTheLife.cer" />
-    <Resource Include="Certificates\grid verse %28format factory%29 256.cer" />
-    <Resource Include="Certificates\grid verse %28format factory%29.cer" />
-    <Resource Include="Certificates\kingsoft 256.cer" />
-    <Resource Include="Certificates\kingsoft.cer" />
-    <Resource Include="Certificates\kugou.cer" />
-    <Resource Include="Certificates\kuwo.cer" />
-    <Resource Include="Certificates\leshi 256.cer" />
-    <Resource Include="Certificates\leshi.cer" />
-    <Resource Include="Certificates\pptv 256.cer" />
-    <Resource Include="Certificates\pptv.cer" />
-    <Resource Include="Certificates\qiyi 256.cer" />
-    <Resource Include="Certificates\qiyi.cer" />
-    <Resource Include="Certificates\rising 256.cer" />
-    <Resource Include="Certificates\rising.cer" />
-    <Resource Include="Certificates\riyue %28at%29 256.cer" />
-    <Resource Include="Certificates\riyue %28at%29.cer" />
-    <Resource Include="Certificates\ruanmei 256.cer" />
-    <Resource Include="Certificates\ruanmei.cer" />
-    <Resource Include="Certificates\sogou 256.cer" />
-    <Resource Include="Certificates\sogou.cer" />
-    <Resource Include="Certificates\sohu.cer" />
-    <Resource Include="Certificates\tencent 256.cer" />
-    <Resource Include="Certificates\tencent.cer" />
-    <Resource Include="Certificates\thunder 256.cer" />
-    <Resource Include="Certificates\thunder.cer" />
-    <Resource Include="Certificates\youku 256.cer" />
-    <Resource Include="Certificates\youku.cer" />
-    <Resource Include="Certificates\yy 256.cer" />
-    <Resource Include="Certificates\yy.cer" />
-    <Resource Include="Certificates\baidusp.cer" />
-    <Resource Include="Certificates\taobao 256.cer" />
-    <Resource Include="Certificates\taobao.cer" />
-    <Resource Include="Certificates\2345 browser 256.cer" />
-    <Resource Include="Certificates\2345 browser.cer" />
-    <Resource Include="Certificates\360 sd.cer" />
-    <Resource Include="Certificates\baidu browser.cer" />
-    <Resource Include="Certificates\thunder player 256.cer" />
-    <Resource Include="Certificates\thunder player.cer" />
-    <Resource Include="Certificates\donfang toutiao 256.cer" />
-    <Resource Include="Certificates\donfang toutiao.cer" />
-    <Resource Include="Certificates\baidu download.cer" />
-    <Resource Include="Certificates\kingsoft ws.cer" />
-    <Resource Include="Certificates\netease 256.cer" />
-    <Resource Include="Certificates\netease.cer" />
-    <Resource Include="Certificates\thunder game 256.cer" />
-    <Resource Include="Certificates\thunder game.cer" />
-    <Resource Include="Certificates\netease youdao.cer" />
-    <Resource Include="Certificates\kingsoft browser 256.cer" />
-    <Resource Include="Certificates\kingsoft browser.cer" />
-    <Resource Include="Certificates\pplive 256.cer" />
-    <Resource Include="Certificates\pplive.cer" />
-    <Resource Include="Certificates\yy browser.cer" />
-    <Resource Include="Certificates\funshion.cer" />
-    <Resource Include="Certificates\kuaizip 256.cer" />
-    <Resource Include="Certificates\kuaizip.cer" />
-    <Resource Include="Assets\certificate-map.json" />
-    <Resource Include="Assets\display-names.json" />
-    <Resource Include="Certificates\baidu browser 256.2018.7.8.cer" />
-    <Resource Include="Certificates\baidu browser.2018.7.8.cer" />
-    <Resource Include="Certificates\kingsoft wps 256.cer" />
-    <Resource Include="Certificates\kingsoft wps.cer" />
-    <Resource Include="Certificates\thunder game 256.2018.7.8.cer" />
-    <Resource Include="Certificates\thunder game.2018.7.8.cer" />
-    <Resource Include="Certificates\xingcheng %28at%29 256.cer" />
-    <Resource Include="Certificates\xingcheng %28at%29.cer" />
-    <Resource Include="Assets\malware-remote-info.json" />
-    <Resource Include="Certificates\aliwangwang 2018.8.cer" />
-    <Resource Include="Certificates\aliwangwang 256.2018.8.cer" />
-    <Resource Include="Certificates\baidu netdisk 256.cer" />
-    <Resource Include="Certificates\baidu netdisk.cer" />
-    <Resource Include="Certificates\youku 2018.8.cer" />
-    <Resource Include="Certificates\youku 256.2018.8.cer" />
-    <Resource Include="Certificates\thunder 2018.9.cer" />
-    <Resource Include="Certificates\thunder 256.2018.9.cer" />
-    <Resource Include="Certificates\rising 2018.9.cer" />
-    <Resource Include="Certificates\rising 256.2018.9.cer" />
-    <Resource Include="Certificates\thunder accel 256.cer" />
-    <Resource Include="Certificates\thunder accel.cer" />
-    <Resource Include="Certificates\6789 256.cer" />
-    <Resource Include="Certificates\6789.cer" />
-    <Resource Include="Certificates\360 browser 2018.11.cer" />
-    <Resource Include="Certificates\360 browser 256.2018.11.cer" />
-    <Resource Include="Certificates\tencent 2018.11.cer" />
-    <Resource Include="Certificates\tencent 256.2018.11.cer" />
-    <Resource Include="Certificates\grid verse %28format factory%29 2018.12.cer" />
-    <Resource Include="Certificates\sohu 2018.12.cer" />
-    <Resource Include="Certificates\thunder player 256.2018.12.cer" />
-    <Resource Include="Certificates\thunder player 2018.12.cer" />
-    <Resource Include="Certificates\yy 256.2018.12.cer" />
-    <Resource Include="Certificates\yy 2018.12.cer" />
-    <Resource Include="Certificates\pptv 2019.1.cer" />
-    <Resource Include="Certificates\pptv 256.2019.1.cer" />
-    <Resource Include="Certificates\ruanmei 256.2019.1.cer" />
-    <Resource Include="Certificates\6789 256.2019.4.cer" />
-    <Resource Include="Certificates\7654 note 256.cer" />
-    <Resource Include="Certificates\7654 note.cer" />
-    <Resource Include="Certificates\2345 2019.6.cer" />
-    <Resource Include="Certificates\2345 256.2019.6.cer" />
-    <Resource Include="Certificates\driveTheLife 2019.6.cer" />
-    <Resource Include="Certificates\driveTheLife 256.2019.6.cer" />
-    <Resource Include="Certificates\kingsoft 2019.6.cer" />
-    <Resource Include="Certificates\kingsoft 256.2019.6.cer" />
-    <Resource Include="Certificates\rising 2019.8.cer" />
-    <Resource Include="Certificates\rising 256.2019.8.cer" />
-    <Resource Include="Certificates\sogou 2019.8.cer" />
-    <Resource Include="Certificates\sogou 256.2019.8.cer" />
-    <Resource Include="Certificates\7654 note 2019.10.cer" />
-    <Resource Include="Certificates\7654 note 256.2019.10.cer" />
-    <Resource Include="Certificates\sogou 2019.10.cer" />
-    <Resource Include="Certificates\sogou 256.2019.10.cer" />
+    <Resource Include="Certificates\*.cer" />
+    <Resource Include="Assets\*.json" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>

diff --git a/src/MalwarePatch/Properties/AssemblyInfo.cs b/src/MalwarePatch/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Ace Studio")]
 [assembly: AssemblyProduct("Malware Patch")]
-[assembly: AssemblyCopyright("Copyright © Ace Studio 2019")]
+[assembly: AssemblyCopyright("Copyright © Ace Studio 2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +51,5 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.9.0.0")]
-[assembly: AssemblyFileVersion("2.9.0.0")]
+[assembly: AssemblyVersion("2.9.1.0")]
+[assembly: AssemblyFileVersion("2.9.1.0")]