Merge remote-tracking branch 'origin/HHJ' into WGJ

3 days ago · 1037daccd1
parent 4dba31e433 96f6e43fee
commit 1037daccd1
186 changed files with 2431 additions and 6 deletions
--- a/.gitignore
+++ b/.gitignore
@ -429,9 +429,4 @@ NuGet.Config
 /Kingo.DataDTBJK
 /Kingo.Plugins/单图斑建库
 /Kingo.Plugins/影像纠正软件
-/打包环境_单图斑建库
-/在线建库
-/举证包验签
-/Onlinedatabase
-/Kingo.Plugins/在线建库
-/Lib
+/Lib/Cef
--- a/Lib/ArcShapeFileNetDLL.dll
+++ b/Lib/ArcShapeFileNetDLL.dll
--- a/Lib/Aspose.Cells.dll
+++ b/Lib/Aspose.Cells.dll
--- a/Lib/AxInterop.esriControls.dll
+++ b/Lib/AxInterop.esriControls.dll
--- a/Lib/DEV17.1/DevExpress.BonusSkins.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.BonusSkins.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Charts.v17.1.Core.dll
+++ b/Lib/DEV17.1/DevExpress.Charts.v17.1.Core.dll
--- a/Lib/DEV17.1/DevExpress.CodeParser.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.CodeParser.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Data.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Data.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Docs.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Docs.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Images.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Images.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Mvvm.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Mvvm.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Office.v17.1.Core.dll
+++ b/Lib/DEV17.1/DevExpress.Office.v17.1.Core.dll
--- a/Lib/DEV17.1/DevExpress.Pdf.v17.1.Core.dll
+++ b/Lib/DEV17.1/DevExpress.Pdf.v17.1.Core.dll
--- a/Lib/DEV17.1/DevExpress.Pdf.v17.1.Drawing.dll
+++ b/Lib/DEV17.1/DevExpress.Pdf.v17.1.Drawing.dll
--- a/Lib/DEV17.1/DevExpress.PivotGrid.v17.1.Core.dll
+++ b/Lib/DEV17.1/DevExpress.PivotGrid.v17.1.Core.dll
--- a/Lib/DEV17.1/DevExpress.Printing.v17.1.Core.dll
+++ b/Lib/DEV17.1/DevExpress.Printing.v17.1.Core.dll
--- a/Lib/DEV17.1/DevExpress.Spreadsheet.v17.1.Core.dll
+++ b/Lib/DEV17.1/DevExpress.Spreadsheet.v17.1.Core.dll
--- a/Lib/DEV17.1/DevExpress.Utils.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Utils.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Charts.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Charts.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Controls.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Controls.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Core.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Core.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Docking.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Docking.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.DocumentViewer.v17.1.Core.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.DocumentViewer.v17.1.Core.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Grid.v17.1.Core.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Grid.v17.1.Core.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Grid.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Grid.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Layout.v17.1.Core.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Layout.v17.1.Core.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.LayoutControl.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.LayoutControl.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.NavBar.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.NavBar.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.PdfViewer.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.PdfViewer.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.PivotGrid.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.PivotGrid.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Printing.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Printing.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Ribbon.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Ribbon.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2007Blue.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2007Blue.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2010Blue.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2010Blue.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2013LightGray.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2013LightGray.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2016Black.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2016Black.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2016Colorful.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2016Colorful.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2016ColorfulSE.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2016ColorfulSE.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2016DarkGraySE.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2016DarkGraySE.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2016White.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2016White.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2016WhiteSE.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpf.Themes.Office2016WhiteSE.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.Xpo.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.Xpo.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.XtraBars.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.XtraBars.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.XtraCharts.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.XtraCharts.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.XtraEditors.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.XtraEditors.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.XtraGrid.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.XtraGrid.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.XtraLayout.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.XtraLayout.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.XtraNavBar.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.XtraNavBar.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.XtraPivotGrid.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.XtraPivotGrid.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.XtraPrinting.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.XtraPrinting.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.XtraReports.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.XtraReports.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.XtraScheduler.v17.1.Core.dll
+++ b/Lib/DEV17.1/DevExpress.XtraScheduler.v17.1.Core.dll
--- a/Lib/DEV17.1/DevExpress.XtraScheduler.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.XtraScheduler.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.XtraTreeList.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.XtraTreeList.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.XtraVerticalGrid.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.XtraVerticalGrid.v17.1.dll
--- a/Lib/DEV17.1/DevExpress.XtraWizard.v17.1.dll
+++ b/Lib/DEV17.1/DevExpress.XtraWizard.v17.1.dll
--- a/Lib/DTBJKDLL/BouncyCastle.Crypto.dll
+++ b/Lib/DTBJKDLL/BouncyCastle.Crypto.dll
--- a/Lib/DTBJKDLL/GaussCalculateLibrary.dll
+++ b/Lib/DTBJKDLL/GaussCalculateLibrary.dll
--- a/Lib/DTBJKDLL/KGIS.USBDogHelper.dll
+++ b/Lib/DTBJKDLL/KGIS.USBDogHelper.dll
--- a/Lib/DTBJKDLL/Kingo.Crypto.dll
+++ b/Lib/DTBJKDLL/Kingo.Crypto.dll
--- a/Lib/DTBJKDLL/Kingo.KMapSDK.dll
+++ b/Lib/DTBJKDLL/Kingo.KMapSDK.dll
--- a/Lib/DTBJKDLL/Kingo.RuleCheck.dll
+++ b/Lib/DTBJKDLL/Kingo.RuleCheck.dll
--- a/Lib/Dapper.StrongName.dll
+++ b/Lib/Dapper.StrongName.dll
--- a/Lib/Dapper.dll
+++ b/Lib/Dapper.dll
--- a/Lib/ESRI/ESRI.ArcGIS.3DAnalyst.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.3DAnalyst.dll
--- a/Lib/ESRI/ESRI.ArcGIS.ADF.Connection.Local.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.ADF.Connection.Local.dll
--- a/Lib/ESRI/ESRI.ArcGIS.ADF.Connection.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.ADF.Connection.dll
--- a/Lib/ESRI/ESRI.ArcGIS.ADF.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.ADF.dll
--- a/Lib/ESRI/ESRI.ArcGIS.AnalysisTools.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.AnalysisTools.dll
--- a/Lib/ESRI/ESRI.ArcGIS.Animation.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.Animation.dll
--- a/Lib/ESRI/ESRI.ArcGIS.ArcCatalogUI.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.ArcCatalogUI.dll
--- a/Lib/ESRI/ESRI.ArcGIS.ArcMapUI.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.ArcMapUI.dll
--- a/Lib/ESRI/ESRI.ArcGIS.AxControls.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.AxControls.dll
--- a/Lib/ESRI/ESRI.ArcGIS.Carto.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.Carto.dll
--- a/Lib/ESRI/ESRI.ArcGIS.CartoUI.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.CartoUI.dll
--- a/Lib/ESRI/ESRI.ArcGIS.Catalog.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.Catalog.dll
--- a/Lib/ESRI/ESRI.ArcGIS.CatalogUI.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.CatalogUI.dll
--- a/Lib/ESRI/ESRI.ArcGIS.Client.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.Client.dll
--- a/Lib/ESRI/ESRI.ArcGIS.Controls.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.Controls.dll
--- a/Lib/ESRI/ESRI.ArcGIS.ConversionTools.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.ConversionTools.dll
--- a/Lib/ESRI/ESRI.ArcGIS.DataInteroperabilityTools.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.DataInteroperabilityTools.dll
--- a/Lib/ESRI/ESRI.ArcGIS.DataManagementTools.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.DataManagementTools.dll
--- a/Lib/ESRI/ESRI.ArcGIS.DataSourcesFile.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.DataSourcesFile.dll
--- a/Lib/ESRI/ESRI.ArcGIS.DataSourcesGDB.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.DataSourcesGDB.dll
--- a/Lib/ESRI/ESRI.ArcGIS.DataSourcesOleDB.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.DataSourcesOleDB.dll
--- a/Lib/ESRI/ESRI.ArcGIS.DataSourcesRaster.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.DataSourcesRaster.dll
--- a/Lib/ESRI/ESRI.ArcGIS.Display.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.Display.dll
--- a/Lib/ESRI/ESRI.ArcGIS.DisplayUI.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.DisplayUI.dll
--- a/Lib/ESRI/ESRI.ArcGIS.Editor.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.Editor.dll
--- a/Lib/ESRI/ESRI.ArcGIS.EditorExt.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.EditorExt.dll
--- a/Lib/ESRI/ESRI.ArcGIS.Framework.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.Framework.dll
--- a/Lib/ESRI/ESRI.ArcGIS.GISClient.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.GISClient.dll
--- a/Lib/ESRI/ESRI.ArcGIS.GeoAnalyst.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.GeoAnalyst.dll
--- a/Lib/ESRI/ESRI.ArcGIS.Geodatabase.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.Geodatabase.dll
--- a/Lib/ESRI/ESRI.ArcGIS.Geometry.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.Geometry.dll
--- a/Lib/ESRI/ESRI.ArcGIS.Geoprocessing.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.Geoprocessing.dll
--- a/Lib/ESRI/ESRI.ArcGIS.Geoprocessor.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.Geoprocessor.dll
--- a/Lib/ESRI/ESRI.ArcGIS.GlobeCore.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.GlobeCore.dll
--- a/Lib/ESRI/ESRI.ArcGIS.Output.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.Output.dll
--- a/Lib/ESRI/ESRI.ArcGIS.Server.dll
+++ b/Lib/ESRI/ESRI.ArcGIS.Server.dll
--- a/Show More
+++ b/Show More