A2:连接字符串统一收敛(6份+导入报价裸串→数据库连接.串/串无池,调系数/甲方报表/导入报价由裸串升级WAL+超时); A1:OCR/PDF基础设施链接共享(pdfbt链接主项目扒图源11文件,删10个旧副本,pdfbt获得ocr.cls方向纠正等修复); 双项目编译零警告通过,扒图护栏PASS

This commit is contained in:
dqb-dev
2026-10-01 23:12:48 +08:00
parent 1e65792b09
commit 22fed025bb
25 changed files with 95 additions and 2723 deletions
+39 -14
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<PropertyGroup>
<ProjectGuid>{7C2A9D4E-1F58-4B6A-9E77-3A5B10D9C8F1}</ProjectGuid>
@@ -113,16 +113,43 @@
<Compile Include="Program.cs" />
<Compile Include="SelfTest.cs" />
<Compile Include="PdfBridge.cs" />
<Compile Include="PdfiumNative.cs" />
<Compile Include="PdfDocument.cs" />
<Compile Include="OcrClient.cs" />
<Compile Include="GlmOcrClient.cs" />
<Compile Include="QianfanOcrClient.cs" />
<Compile Include="UapisOcrClient.cs" />
<Compile Include="UmiOcrClient.cs" />
<Compile Include="UmiOcrHost.cs" />
<Compile Include="OcrSettingsForm.cs" />
<Compile Include="OcrSettingsForm.Designer.cs" />
<!-- ★ A1(2026-10-01):OCR/PDF 基础设施与主项目共享同一份源码(链接编译,不再各留副本)——
权威源 成套报价软件\扒图\(主项目版为演进版,含 OcrPaths 旧布局回退/ocr.cls 方向纠正/
UmiOcr 启停拆分等修复);此前 pdfbt 侧 10 个本地副本是旧快照,已删除(git 基线可找回) -->
<Compile Include="..\成套报价软件\扒图\PdfiumNative.cs">
<Link>共享扒图\PdfiumNative.cs</Link>
</Compile>
<Compile Include="..\成套报价软件\扒图\PdfDocument.cs">
<Link>共享扒图\PdfDocument.cs</Link>
</Compile>
<Compile Include="..\成套报价软件\扒图\OcrClient.cs">
<Link>共享扒图\OcrClient.cs</Link>
</Compile>
<Compile Include="..\成套报价软件\扒图\GlmOcrClient.cs">
<Link>共享扒图\GlmOcrClient.cs</Link>
</Compile>
<Compile Include="..\成套报价软件\扒图\QianfanOcrClient.cs">
<Link>共享扒图\QianfanOcrClient.cs</Link>
</Compile>
<Compile Include="..\成套报价软件\扒图\UapisOcrClient.cs">
<Link>共享扒图\UapisOcrClient.cs</Link>
</Compile>
<Compile Include="..\成套报价软件\扒图\UmiOcrClient.cs">
<Link>共享扒图\UmiOcrClient.cs</Link>
</Compile>
<Compile Include="..\成套报价软件\扒图\UmiOcrHost.cs">
<Link>共享扒图\UmiOcrHost.cs</Link>
</Compile>
<Compile Include="..\成套报价软件\扒图\UmiOcrLauncher.cs">
<Link>共享扒图\UmiOcrLauncher.cs</Link>
</Compile>
<Compile Include="..\成套报价软件\扒图\OcrSettingsForm.cs">
<Link>共享扒图\OcrSettingsForm.cs</Link>
</Compile>
<Compile Include="..\成套报价软件\扒图\OcrSettingsForm.Designer.cs">
<Link>共享扒图\OcrSettingsForm.Designer.cs</Link>
<DependentUpon>OcrSettingsForm.cs</DependentUpon>
</Compile>
<Compile Include="PdfViewerWindow.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Plugin\Form3.cs" />
@@ -155,9 +182,7 @@
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="OcrSettingsForm.resx">
<DependentUpon>OcrSettingsForm.Designer.cs</DependentUpon>
</EmbeddedResource>
<!-- OcrSettingsForm.resx 删除:表单已链接共享主项目源码(A1),本地空壳 resx 与链接 Designer 不再匹配 -->
<EmbeddedResource Include="Plugin\Form3.resx">
<DependentUpon>Form3.cs</DependentUpon>
</EmbeddedResource>