更新ikvm；更新pdfbox

1、更新了https://github.com/tianlian0/ikvm 种最新编译的ikvm二进制文件。由于替换为了编译好的二进制，因此代码库所占空间变大，初次下载速度较慢为正常现象； 2、pdfbox更新至3.0.0-alpha2； 3、解决vs编译后指令有时不执行导致key文件丢失的问题； 4、UI修改。
tianlian0 · Oct 20, 2021 · bc0d154 · bc0d154
1 parent a864660
commit bc0d154
Show file tree

Hide file tree

Showing 37 changed files with 337 additions and 33 deletions.
diff --git a/paper_checking/IKVM.AWT.WinForms.dll b/paper_checking/IKVM.AWT.WinForms.dll
diff --git a/paper_checking/IKVM.OpenJDK.Beans.dll b/paper_checking/IKVM.OpenJDK.Beans.dll
diff --git a/paper_checking/IKVM.OpenJDK.Charsets.dll b/paper_checking/IKVM.OpenJDK.Charsets.dll
diff --git a/paper_checking/IKVM.OpenJDK.Cldrdata.dll b/paper_checking/IKVM.OpenJDK.Cldrdata.dll
diff --git a/paper_checking/IKVM.OpenJDK.Corba.dll b/paper_checking/IKVM.OpenJDK.Corba.dll
diff --git a/paper_checking/IKVM.OpenJDK.Core.dll b/paper_checking/IKVM.OpenJDK.Core.dll
diff --git a/paper_checking/IKVM.OpenJDK.Jdbc.dll b/paper_checking/IKVM.OpenJDK.Jdbc.dll
diff --git a/paper_checking/IKVM.OpenJDK.Localedata.dll b/paper_checking/IKVM.OpenJDK.Localedata.dll
diff --git a/paper_checking/IKVM.OpenJDK.Management.dll b/paper_checking/IKVM.OpenJDK.Management.dll
diff --git a/paper_checking/IKVM.OpenJDK.Media.dll b/paper_checking/IKVM.OpenJDK.Media.dll
diff --git a/paper_checking/IKVM.OpenJDK.Misc.dll b/paper_checking/IKVM.OpenJDK.Misc.dll
diff --git a/paper_checking/IKVM.OpenJDK.Naming.dll b/paper_checking/IKVM.OpenJDK.Naming.dll
diff --git a/paper_checking/IKVM.OpenJDK.Nashorn.dll b/paper_checking/IKVM.OpenJDK.Nashorn.dll
diff --git a/paper_checking/IKVM.OpenJDK.Remoting.dll b/paper_checking/IKVM.OpenJDK.Remoting.dll
diff --git a/paper_checking/IKVM.OpenJDK.Security.dll b/paper_checking/IKVM.OpenJDK.Security.dll
diff --git a/paper_checking/IKVM.OpenJDK.SwingAWT.dll b/paper_checking/IKVM.OpenJDK.SwingAWT.dll
diff --git a/paper_checking/IKVM.OpenJDK.Text.dll b/paper_checking/IKVM.OpenJDK.Text.dll
diff --git a/paper_checking/IKVM.OpenJDK.Tools.dll b/paper_checking/IKVM.OpenJDK.Tools.dll
diff --git a/paper_checking/IKVM.OpenJDK.Util.dll b/paper_checking/IKVM.OpenJDK.Util.dll
diff --git a/paper_checking/IKVM.OpenJDK.XML.API.dll b/paper_checking/IKVM.OpenJDK.XML.API.dll
diff --git a/paper_checking/IKVM.OpenJDK.XML.Bind.dll b/paper_checking/IKVM.OpenJDK.XML.Bind.dll
diff --git a/paper_checking/IKVM.OpenJDK.XML.Crypto.dll b/paper_checking/IKVM.OpenJDK.XML.Crypto.dll
diff --git a/paper_checking/IKVM.OpenJDK.XML.Parse.dll b/paper_checking/IKVM.OpenJDK.XML.Parse.dll
diff --git a/paper_checking/IKVM.OpenJDK.XML.Transform.dll b/paper_checking/IKVM.OpenJDK.XML.Transform.dll
diff --git a/paper_checking/IKVM.OpenJDK.XML.WebServices.dll b/paper_checking/IKVM.OpenJDK.XML.WebServices.dll
diff --git a/paper_checking/IKVM.OpenJDK.XML.XPath.dll b/paper_checking/IKVM.OpenJDK.XML.XPath.dll
diff --git a/paper_checking/IKVM.Reflection.dll b/paper_checking/IKVM.Reflection.dll
diff --git a/paper_checking/IKVM.Runtime.JNI.dll b/paper_checking/IKVM.Runtime.JNI.dll
diff --git a/paper_checking/IKVM.Runtime.dll b/paper_checking/IKVM.Runtime.dll
diff --git a/paper_checking/Licence.resx b/paper_checking/Licence.resx
diff --git a/paper_checking/MainForm.resx b/paper_checking/MainForm.resx
@@ -136,6 +136,6 @@
 5、如需要查看或删除已添加到比对库中的论文，请在安装目录的“txtPaperSource”文件夹下手工查看、删除。
 6、将一些可能影响重复率的关键词添加到关键词过滤功能中，在查重时会将待查文本中出现的关键词全部删除，以避免它们对重复率的影响。这类关键词通常可能为学校名、机构名等。
 
-声明：本查重报告上的所有内容仅供参考。商业合作、技术咨询及BUG反馈可联系QQ/微信：654062779。</value>
+声明：本查重报告上的所有内容仅供参考。商业合作、技术咨询及BUG反馈可联系微信：di18810760681，或QQ：1253332375</value>
   </data>
 </root>
diff --git a/paper_checking/PaperCheck/Convert/PdfConverter.cs b/paper_checking/PaperCheck/Convert/PdfConverter.cs
@@ -6,13 +6,35 @@ namespace paper_checking.PaperCheck.Convert
 {
     class PdfConverter : ConvertCore
     {
+        public PdfConverter()
+        {
+            try
+            {
+                org.apache.pdfbox.pdmodel.font.FontMapper fontMapper = org.apache.pdfbox.pdmodel.font.FontMappers.instance();
+                java.lang.Class clazz = java.lang.Class.forName("org.apache.pdfbox.pdmodel.font.FontMapperImpl");
+                java.lang.reflect.Method method = clazz.getMethod("addSubstitute", java.lang.Class.forName("java.lang.String.class"), java.lang.Class.forName("java.lang.String.class"));
+                method.setAccessible(true);
+                method.invoke(fontMapper, "STSong-Light", "STFangsong");
+                method.invoke(fontMapper, "SimSun", "STFangsong");
+                method.invoke(fontMapper, "AdobeKaitiStd-Regular", "STFangsong");
+                method.invoke(fontMapper, "ArialMT", "Arial");
+                method.invoke(fontMapper, "cid0ct", "STFangsong");
+                method.invoke(fontMapper, "CMEX", "STFangsong");
+                method.invoke(fontMapper, "TCBLZV", "STFangsong");
+                method.invoke(fontMapper, "LCIRCLE10", "STFangsong");
+            }
+            catch (System.Exception)
+            {
+            }
+        }
+
         public override string ConvertToString(string path, string blockText)
         {
             PDDocument pdffile = null;
             string text = null;
             try
             {
-                pdffile = PDDocument.load(new java.io.File(path));
+                pdffile = org.apache.pdfbox.Loader.loadPDF(new java.io.File(path));
                 PDFTextStripper pdfStripper = new PDFTextStripper();
                 text = pdfStripper.getText(pdffile);
                 text = Regex.Replace(text, @"[^\u4e00-\u9fa5\《\》\（\）\——\；\，\。\“\”\！]", "");

diff --git a/paper_checking/PaperCheck/Utils.cs b/paper_checking/PaperCheck/Utils.cs
@@ -286,7 +286,8 @@ public static List<FileInfo> GetFileInfoRecursion(DirectoryInfo directory)
 
         static public void AdsMessage()
         {
-            MessageBox.Show("本系统是将文件和本地比对库中的文件进行比对查重，因此不添加比对库将导致纵向查重结果为0，请知悉。本项目可以提供c#版、java版相关技术支持和系统定制开发，商业合作请联系微信/QQ：654062779。\r\n本提示您可自行修改源代码去除", "提示");
+            MessageBox.Show("本系统是将文件和本地比对库中的文件进行比对查重，因此不添加比对库将导致纵向查重结果为0，请知悉。本项目可以提供c#版、java版相关技术支持和系统定制开发，商业合作请联系微信：di18810760681，或QQ：1253332375。\r\n本提示您可自行修改源代码去除", "提示");
+            System.Diagnostics.Process.Start("https://xincheck.com/?id=28");
         }
 
     }

diff --git a/paper_checking/Properties/AssemblyInfo.cs b/paper_checking/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.0.10")]
-[assembly: AssemblyFileVersion("0.9.0.10")]
+[assembly: AssemblyVersion("0.9.0.11")]
+[assembly: AssemblyFileVersion("0.9.0.11")]
 [assembly: NeutralResourcesLanguage("zh-Hans")]
diff --git a/paper_checking/ReportDetailForm.cs b/paper_checking/ReportDetailForm.cs
@@ -67,7 +67,7 @@ private void FormLoad()
             startWords += titletemp.Length - 9;
             //startWords = sourceFile2.IndexOf("#####\r\n") + "#####\r\n".Length;
             int i = 0;
-            richTextBox1.Text = titletemp + sourceFile2.ToString() + "声明：本查重报告上的所有内容仅供参考。商业合作、技术咨询及BUG反馈可联系QQ/微信：654062779";
+            richTextBox1.Text = titletemp + sourceFile2.ToString() + "声明：开源版查重报告较为简易，查重报告中所有内容仅供参考。商业合作、技术咨询及BUG反馈可联系微信：di18810760681，或QQ：1253332375\r\n商用版为您提供更丰富功能、更全面详尽的查重报告和更高的软件稳定性，商用试用版下载链接：https://xincheck.com/?id=28";
             //richTextBox1.Text = sourceFile2 + sourceFile;
             //int i = sourceFile2.Replace("\r\n"," ").Length;
 

diff --git a/paper_checking/paper_checking.csproj b/paper_checking/paper_checking.csproj
@@ -96,6 +96,9 @@
   <PropertyGroup>
     <ManifestKeyFile>user.pfx</ManifestKeyFile>
   </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.SharpZipLib">
       <HintPath>.\ICSharpCode.SharpZipLib.dll</HintPath>

diff --git a/paper_checking/pdfbox-app.dll b/paper_checking/pdfbox-app.dll