From 3e707d56a647c29055e1e64800a9300e9c1aa091 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期六, 12 十一月 2022 14:41:35 +0800 Subject: [PATCH] 1 --- ExportMap/cs/ExportUtil.cs | 19 .gitignore | 1 ExportMap/Controllers/ExportController.cs | 9 ExportMap/Properties/PublishProfiles/Release.pubxml.user | 214 ++++++++++++++++ ExportMap/Properties/AssemblyInfo.cs | 8 ExportMap/Web.config | 217 ++++++++-------- /dev/null | 97 ------- ExportMap/cs/LogOut.cs | 128 +++++++++ ExportMap/ExportMap.csproj | 24 + ExportMap/Test.html | 6 ExportMap/DLL/log4net4.dll | 0 ExportMap/Sources/Log.config | 37 ++ ExportMap/Properties/PublishProfiles/Release.pubxml | 17 + 13 files changed, 552 insertions(+), 225 deletions(-) diff --git a/.gitignore b/.gitignore index 6f2cefe..e8f1946 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /ExportMap/Sources/.vs /ExportMap/Sources/data /ExportMap/Sources/.idea +/ExportMap/Sources/log.txt diff --git a/ExportMap/Controllers/ExportController.cs b/ExportMap/Controllers/ExportController.cs index beeaf36..43dd131 100644 --- a/ExportMap/Controllers/ExportController.cs +++ b/ExportMap/Controllers/ExportController.cs @@ -1,4 +1,5 @@ -锘縰sing LFServer.cs; +锘縰sing ExportMap.cs; +using LFServer.cs; using LFServer.Models; using System; using System.Collections.Generic; @@ -29,16 +30,18 @@ return ResponseMsg<string>.fail("浠ょ墝鏃犳晥"); } - string imgPath = ExportUtil.Generate(args); + string err = null; + string imgPath = ExportUtil.Generate(args, ref err); if (string.IsNullOrEmpty(imgPath)) { - return ResponseMsg<string>.fail("澶辫触"); + return ResponseMsg<string>.fail(err); } return ResponseMsg<string>.success("鎴愬姛", imgPath); } catch (Exception ex) { + LogOut.Error(ex.StackTrace); return ResponseMsg<string>.fail(ex.Message); } } diff --git a/ExportMap/DLL/log4net4.dll b/ExportMap/DLL/log4net4.dll new file mode 100644 index 0000000..bffd524 --- /dev/null +++ b/ExportMap/DLL/log4net4.dll Binary files differ diff --git a/ExportMap/ExportMap.csproj b/ExportMap/ExportMap.csproj index dc76b09..0a685a6 100644 --- a/ExportMap/ExportMap.csproj +++ b/ExportMap/ExportMap.csproj @@ -11,8 +11,8 @@ <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>LFServer</RootNamespace> - <AssemblyName>LFServer</AssemblyName> + <RootNamespace>ExportMap</RootNamespace> + <AssemblyName>ExportMap</AssemblyName> <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion> <UseIISExpress>false</UseIISExpress> <IISExpressSSLPort /> @@ -21,6 +21,7 @@ <IISExpressUseClassicPipelineMode /> <Use64BitIISExpress /> <UseGlobalApplicationHostFile /> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -30,6 +31,7 @@ <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -38,6 +40,7 @@ <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <ItemGroup> <Reference Include="DotNetZip"> @@ -45,6 +48,10 @@ </Reference> <Reference Include="ICSharpCode.SharpZipLib"> <HintPath>..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath> + </Reference> + <Reference Include="log4net4, Version=1.2.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>DLL\log4net4.dll</HintPath> </Reference> <Reference Include="Microsoft.CSharp" /> <Reference Include="MultipartDataMediaFormatter, Version=2.1.1.0, Culture=neutral, PublicKeyToken=67148dd0761d95a0, processorArchitecture=MSIL"> @@ -61,6 +68,7 @@ <SpecificVersion>False</SpecificVersion> <HintPath>DLL\NPOI.dll</HintPath> </Reference> + <Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.SQLite, Version=1.0.94.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>DLL\System.Data.SQLite.dll</HintPath> @@ -76,16 +84,14 @@ <Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System" /> <Reference Include="System.Data" /> - <Reference Include="System.Core" /> - <Reference Include="System.Data.DataSetExtensions" /> - <Reference Include="System.Web.Extensions" /> - <Reference Include="System.Xml.Linq" /> <Reference Include="System.Drawing" /> <Reference Include="System.Web" /> + <Reference Include="System.Web.Extensions" /> <Reference Include="System.Xml" /> <Reference Include="System.Configuration" /> <Reference Include="System.Web.Services" /> <Reference Include="System.EnterpriseServices" /> + <Reference Include="System.Xml.Linq" /> </ItemGroup> <ItemGroup> <Reference Include="System.Web.Http"> @@ -96,6 +102,7 @@ </Reference> </ItemGroup> <ItemGroup> + <Content Include="DLL\log4net4.dll" /> <Content Include="DLL\Mono.Security.dll" /> <Content Include="DLL\Npgsql.dll" /> <Content Include="DLL\NPOI.dll" /> @@ -121,6 +128,7 @@ <Compile Include="cs\CacheUtil.cs" /> <Compile Include="cs\CustomMultipartFormDataStreamProvider.cs" /> <Compile Include="cs\ExportUtil.cs" /> + <Compile Include="cs\LogOut.cs" /> <Compile Include="cs\NoBufferPolicySelector.cs" /> <Compile Include="cs\Tool.cs" /> <Compile Include="db\ModelHandler.cs" /> @@ -177,6 +185,10 @@ <ItemGroup> <Content Include="Sources\Template.qpt" /> </ItemGroup> + <ItemGroup> + <None Include="Properties\PublishProfiles\Release.pubxml" /> + <Content Include="Sources\Log.config" /> + </ItemGroup> <PropertyGroup> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> diff --git a/ExportMap/Properties/AssemblyInfo.cs b/ExportMap/Properties/AssemblyInfo.cs index f6f666b..19bc4ca 100644 --- a/ExportMap/Properties/AssemblyInfo.cs +++ b/ExportMap/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("LFServer")] +[assembly: AssemblyTitle("ExportMap")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("HP Inc.")] -[assembly: AssemblyProduct("LFServer")] -[assembly: AssemblyCopyright("Copyright 漏 HP Inc. 2022")] +[assembly: AssemblyCompany("Terra Inc.")] +[assembly: AssemblyProduct("ExportMap")] +[assembly: AssemblyCopyright("Copyright 漏 Terra Inc. 2022")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/ExportMap/Properties/PublishProfiles/FolderProfile.pubxml b/ExportMap/Properties/PublishProfiles/FolderProfile.pubxml deleted file mode 100644 index c3f2bf0..0000000 --- a/ExportMap/Properties/PublishProfiles/FolderProfile.pubxml +++ /dev/null @@ -1,16 +0,0 @@ -锘�<?xml version="1.0" encoding="utf-8"?> -<!-- -https://go.microsoft.com/fwlink/?LinkID=208121. ---> -<Project> - <PropertyGroup> - <DeleteExistingFiles>False</DeleteExistingFiles> - <ExcludeApp_Data>False</ExcludeApp_Data> - <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish> - <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration> - <LastUsedPlatform>Any CPU</LastUsedPlatform> - <PublishProvider>FileSystem</PublishProvider> - <PublishUrl>E:\Release\LFServer</PublishUrl> - <WebPublishMethod>FileSystem</WebPublishMethod> - </PropertyGroup> -</Project> \ No newline at end of file diff --git a/ExportMap/Properties/PublishProfiles/FolderProfile.pubxml.user b/ExportMap/Properties/PublishProfiles/FolderProfile.pubxml.user deleted file mode 100644 index 076cbb8..0000000 --- a/ExportMap/Properties/PublishProfiles/FolderProfile.pubxml.user +++ /dev/null @@ -1,97 +0,0 @@ -锘�<?xml version="1.0" encoding="utf-8"?> -<!-- -https://go.microsoft.com/fwlink/?LinkID=208121. ---> -<Project> - <PropertyGroup> - <_PublishTargetUrl>E:\Release\LFServer</_PublishTargetUrl> - <History>True|2022-08-26T07:23:36.8360058Z;True|2022-08-26T15:17:39.6707233+08:00;True|2022-08-26T15:02:13.2790285+08:00;True|2022-08-23T12:27:11.1684233+08:00;True|2022-08-12T09:21:42.0457521+08:00;True|2022-08-05T14:01:05.4328825+08:00;True|2022-08-05T09:41:21.0217232+08:00;True|2022-08-03T18:29:34.3763287+08:00;True|2022-08-02T18:29:42.6917763+08:00;True|2022-08-02T18:16:53.0665663+08:00;</History> - <LastFailureDetails /> - </PropertyGroup> - <ItemGroup> - <File Include="bin/DotNetZip.dll"> - <publishTime>11/16/2021 16:49:10</publishTime> - </File> - <File Include="bin/DotNetZip.pdb"> - <publishTime>11/16/2021 16:49:10</publishTime> - </File> - <File Include="bin/ICSharpCode.SharpZipLib.dll"> - <publishTime>09/19/2021 17:20:28</publishTime> - </File> - <File Include="bin/ICSharpCode.SharpZipLib.pdb"> - <publishTime>09/19/2021 17:20:28</publishTime> - </File> - <File Include="bin/LFServer.dll"> - <publishTime>08/26/2022 15:23:36</publishTime> - </File> - <File Include="bin/LFServer.pdb"> - <publishTime>08/26/2022 15:23:36</publishTime> - </File> - <File Include="bin/Mono.Security.dll"> - <publishTime>08/01/2022 15:31:14</publishTime> - </File> - <File Include="bin/MultipartDataMediaFormatter.dll"> - <publishTime>04/24/2021 23:49:26</publishTime> - </File> - <File Include="bin/Newtonsoft.Json.dll"> - <publishTime>08/04/2014 04:33:56</publishTime> - </File> - <File Include="bin/Npgsql.dll"> - <publishTime>08/01/2022 15:31:14</publishTime> - </File> - <File Include="bin/NPOI.dll"> - <publishTime>08/25/2022 14:28:54</publishTime> - </File> - <File Include="bin/System.Data.SQLite.dll"> - <publishTime>08/06/2022 11:24:07</publishTime> - </File> - <File Include="bin/System.Net.Http.Formatting.dll"> - <publishTime>11/28/2018 21:00:36</publishTime> - </File> - <File Include="bin/System.Web.Http.dll"> - <publishTime>08/01/2022 10:42:17</publishTime> - </File> - <File Include="bin/System.Web.Http.WebHost.dll"> - <publishTime>08/01/2022 10:42:17</publishTime> - </File> - <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll"> - <publishTime>11/29/2018 21:26:02</publishTime> - </File> - <File Include="bin/zh-Hans/System.Web.Http.resources.dll"> - <publishTime>10/02/2013 04:55:08</publishTime> - </File> - <File Include="bin/zh-Hans/System.Web.Http.WebHost.resources.dll"> - <publishTime>10/02/2013 04:55:10</publishTime> - </File> - <File Include="DLL/Mono.Security.dll"> - <publishTime>08/01/2022 15:31:14</publishTime> - </File> - <File Include="DLL/Npgsql.dll"> - <publishTime>08/01/2022 15:31:14</publishTime> - </File> - <File Include="DLL/NPOI.dll"> - <publishTime>08/25/2022 14:28:54</publishTime> - </File> - <File Include="DLL/System.Data.SQLite.dll"> - <publishTime>08/06/2022 11:24:07</publishTime> - </File> - <File Include="Global.asax"> - <publishTime>08/01/2022 10:42:16</publishTime> - </File> - <File Include="index.html"> - <publishTime>08/09/2022 16:33:44</publishTime> - </File> - <File Include="js/jquery.1.12.4.js"> - <publishTime>08/02/2022 09:25:25</publishTime> - </File> - <File Include="packages.config"> - <publishTime>08/04/2022 15:59:36</publishTime> - </File> - <File Include="Test.html"> - <publishTime>08/03/2022 14:42:13</publishTime> - </File> - <File Include="Web.config"> - <publishTime>08/26/2022 14:54:56</publishTime> - </File> - </ItemGroup> -</Project> \ No newline at end of file diff --git a/ExportMap/Properties/PublishProfiles/Release.pubxml b/ExportMap/Properties/PublishProfiles/Release.pubxml new file mode 100644 index 0000000..47f9a18 --- /dev/null +++ b/ExportMap/Properties/PublishProfiles/Release.pubxml @@ -0,0 +1,17 @@ +锘�<?xml version="1.0" encoding="utf-8"?> +<!-- +鎮� Web 椤圭洰鐨勫彂甯�/鎵撳寘杩涚▼灏嗕娇鐢ㄦ鏂囦欢銆傛偍鍙互閫氳繃缂栬緫姝� MSBuild 鏂囦欢 +鏉ヨ嚜瀹氫箟璇ヨ繘绋嬬殑琛屼负銆傝嫢瑕佷簡瑙d笌姝ょ浉鍏崇殑璇︾粏淇℃伅锛岃璁块棶 http://go.microsoft.com/fwlink/?LinkID=208121銆� +--> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <WebPublishMethod>FileSystem</WebPublishMethod> + <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration> + <LastUsedPlatform>Any CPU</LastUsedPlatform> + <SiteUrlToLaunchAfterPublish /> + <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish> + <ExcludeApp_Data>False</ExcludeApp_Data> + <publishUrl>E:\Release\ExportMap</publishUrl> + <DeleteExistingFiles>False</DeleteExistingFiles> + </PropertyGroup> +</Project> \ No newline at end of file diff --git a/ExportMap/Properties/PublishProfiles/Release.pubxml.user b/ExportMap/Properties/PublishProfiles/Release.pubxml.user new file mode 100644 index 0000000..84a16b7 --- /dev/null +++ b/ExportMap/Properties/PublishProfiles/Release.pubxml.user @@ -0,0 +1,214 @@ +锘�<?xml version="1.0" encoding="utf-8"?> +<!-- +鎮� Web 椤圭洰鐨勫彂甯�/鎵撳寘杩涚▼灏嗕娇鐢ㄦ鏂囦欢銆傛偍鍙互閫氳繃缂栬緫姝� MSBuild 鏂囦欢 +鏉ヨ嚜瀹氫箟璇ヨ繘绋嬬殑琛屼负銆傝嫢瑕佷簡瑙d笌姝ょ浉鍏崇殑璇︾粏淇℃伅锛岃璁块棶 http://go.microsoft.com/fwlink/?LinkID=208121銆� +--> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <TimeStampOfAssociatedLegacyPublishXmlFile /> + <_PublishTargetUrl>E:\Release\ExportMap</_PublishTargetUrl> + </PropertyGroup> + <ItemGroup> + <File Include="bin/DotNetZip.dll"> + <publishTime>11/08/2022 14:22:49</publishTime> + </File> + <File Include="bin/DotNetZip.pdb"> + <publishTime>11/08/2022 14:22:49</publishTime> + </File> + <File Include="bin/ExportMap.dll"> + <publishTime>11/12/2022 14:30:38</publishTime> + </File> + <File Include="bin/ExportMap.pdb"> + <publishTime>11/12/2022 14:30:38</publishTime> + </File> + <File Include="bin/ICSharpCode.SharpZipLib.dll"> + <publishTime>11/08/2022 14:22:59</publishTime> + </File> + <File Include="bin/ICSharpCode.SharpZipLib.pdb"> + <publishTime>11/08/2022 14:22:59</publishTime> + </File> + <File Include="bin/LFServer.dll"> + <publishTime>11/11/2022 15:50:21</publishTime> + </File> + <File Include="bin/LFServer.pdb"> + <publishTime>11/11/2022 15:50:21</publishTime> + </File> + <File Include="bin/log4net4.dll"> + <publishTime>11/12/2022 14:25:46</publishTime> + </File> + <File Include="bin/Mono.Security.dll"> + <publishTime>08/01/2022 15:31:14</publishTime> + </File> + <File Include="bin/MultipartDataMediaFormatter.dll"> + <publishTime>11/08/2022 14:22:56</publishTime> + </File> + <File Include="bin/Newtonsoft.Json.dll"> + <publishTime>11/08/2022 14:22:59</publishTime> + </File> + <File Include="bin/Npgsql.dll"> + <publishTime>08/01/2022 15:31:14</publishTime> + </File> + <File Include="bin/NPOI.dll"> + <publishTime>08/25/2022 14:28:54</publishTime> + </File> + <File Include="bin/System.Data.SQLite.dll"> + <publishTime>08/06/2022 11:24:07</publishTime> + </File> + <File Include="bin/System.Net.Http.Formatting.dll"> + <publishTime>11/08/2022 14:22:49</publishTime> + </File> + <File Include="bin/System.Web.Http.dll"> + <publishTime>11/08/2022 14:22:52</publishTime> + </File> + <File Include="bin/System.Web.Http.WebHost.dll"> + <publishTime>11/08/2022 14:22:53</publishTime> + </File> + <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll"> + <publishTime>11/08/2022 14:22:52</publishTime> + </File> + <File Include="bin/zh-Hans/System.Web.Http.resources.dll"> + <publishTime>11/08/2022 14:22:52</publishTime> + </File> + <File Include="bin/zh-Hans/System.Web.Http.WebHost.resources.dll"> + <publishTime>11/08/2022 14:22:53</publishTime> + </File> + <File Include="DLL/log4net4.dll"> + <publishTime>11/12/2022 14:25:46</publishTime> + </File> + <File Include="DLL/Mono.Security.dll"> + <publishTime>08/01/2022 15:31:14</publishTime> + </File> + <File Include="DLL/Npgsql.dll"> + <publishTime>08/01/2022 15:31:14</publishTime> + </File> + <File Include="DLL/NPOI.dll"> + <publishTime>08/25/2022 14:28:54</publishTime> + </File> + <File Include="DLL/System.Data.SQLite.dll"> + <publishTime>08/06/2022 11:24:07</publishTime> + </File> + <File Include="Global.asax"> + <publishTime>11/08/2022 14:24:30</publishTime> + </File> + <File Include="js/jquery.1.12.4.js"> + <publishTime>08/02/2022 09:25:25</publishTime> + </File> + <File Include="js/rollups.js"> + <publishTime>10/21/2022 16:17:48</publishTime> + </File> + <File Include="js/rsa.min.js"> + <publishTime>10/15/2022 08:42:06</publishTime> + </File> + <File Include="packages.config"> + <publishTime>11/12/2022 14:26:23</publishTime> + </File> + <File Include="Sources/Log.config"> + <publishTime>11/12/2022 14:25:33</publishTime> + </File> + <File Include="Sources/logo.png"> + <publishTime>01/11/2022 10:47:07</publishTime> + </File> + <File Include="Sources/render.py"> + <publishTime>11/10/2022 15:45:42</publishTime> + </File> + <File Include="Sources/shps/SITEPOINT.cpg"> + <publishTime>03/09/2022 16:54:50</publishTime> + </File> + <File Include="Sources/shps/SITEPOINT.dbf"> + <publishTime>03/09/2022 17:43:15</publishTime> + </File> + <File Include="Sources/shps/SITEPOINT.prj"> + <publishTime>03/09/2022 16:54:50</publishTime> + </File> + <File Include="Sources/shps/SITEPOINT.qix"> + <publishTime>07/13/2022 16:42:06</publishTime> + </File> + <File Include="Sources/shps/SITEPOINT.sbn"> + <publishTime>03/09/2022 17:03:47</publishTime> + </File> + <File Include="Sources/shps/SITEPOINT.sbx"> + <publishTime>03/09/2022 17:03:47</publishTime> + </File> + <File Include="Sources/shps/SITEPOINT.shi"> + <publishTime>03/09/2022 17:16:41</publishTime> + </File> + <File Include="Sources/shps/SITEPOINT.shp"> + <publishTime>03/09/2022 17:03:47</publishTime> + </File> + <File Include="Sources/shps/SITEPOINT.shp.xml"> + <publishTime>03/09/2022 16:54:50</publishTime> + </File> + <File Include="Sources/shps/SITEPOINT.shx"> + <publishTime>03/09/2022 17:03:47</publishTime> + </File> + <File Include="Sources/shps/STATIONSERIES.cpg"> + <publishTime>03/09/2022 17:59:44</publishTime> + </File> + <File Include="Sources/shps/STATIONSERIES.dbf"> + <publishTime>03/09/2022 17:59:44</publishTime> + </File> + <File Include="Sources/shps/STATIONSERIES.prj"> + <publishTime>03/09/2022 17:59:43</publishTime> + </File> + <File Include="Sources/shps/STATIONSERIES.qix"> + <publishTime>07/13/2022 16:42:06</publishTime> + </File> + <File Include="Sources/shps/STATIONSERIES.shi"> + <publishTime>03/10/2022 10:32:01</publishTime> + </File> + <File Include="Sources/shps/STATIONSERIES.shp"> + <publishTime>03/09/2022 17:59:44</publishTime> + </File> + <File Include="Sources/shps/STATIONSERIES.shp.xml"> + <publishTime>03/09/2022 17:59:43</publishTime> + </File> + <File Include="Sources/shps/STATIONSERIES.shx"> + <publishTime>03/09/2022 17:59:44</publishTime> + </File> + <File Include="Sources/shps/VALVEHOUSEPOINT.cpg"> + <publishTime>03/09/2022 16:54:51</publishTime> + </File> + <File Include="Sources/shps/VALVEHOUSEPOINT.dbf"> + <publishTime>03/09/2022 17:46:08</publishTime> + </File> + <File Include="Sources/shps/VALVEHOUSEPOINT.prj"> + <publishTime>03/09/2022 16:54:51</publishTime> + </File> + <File Include="Sources/shps/VALVEHOUSEPOINT.qix"> + <publishTime>07/13/2022 16:42:06</publishTime> + </File> + <File Include="Sources/shps/VALVEHOUSEPOINT.sbn"> + <publishTime>03/09/2022 17:03:21</publishTime> + </File> + <File Include="Sources/shps/VALVEHOUSEPOINT.sbx"> + <publishTime>03/09/2022 17:03:21</publishTime> + </File> + <File Include="Sources/shps/VALVEHOUSEPOINT.shi"> + <publishTime>03/09/2022 17:17:13</publishTime> + </File> + <File Include="Sources/shps/VALVEHOUSEPOINT.shp"> + <publishTime>03/09/2022 17:03:21</publishTime> + </File> + <File Include="Sources/shps/VALVEHOUSEPOINT.shp.xml"> + <publishTime>03/09/2022 16:54:51</publishTime> + </File> + <File Include="Sources/shps/VALVEHOUSEPOINT.shx"> + <publishTime>03/09/2022 17:03:21</publishTime> + </File> + <File Include="Sources/Template.qpt"> + <publishTime>11/10/2022 19:09:14</publishTime> + </File> + <File Include="Sources/Test.qgz"> + <publishTime>11/10/2022 10:27:07</publishTime> + </File> + <File Include="Sources/Test.qpt"> + <publishTime>11/10/2022 19:22:46</publishTime> + </File> + <File Include="Test.html"> + <publishTime>11/12/2022 13:00:18</publishTime> + </File> + <File Include="Web.config"> + <publishTime>11/12/2022 14:26:22</publishTime> + </File> + </ItemGroup> +</Project> \ No newline at end of file diff --git a/ExportMap/Sources/Log.config b/ExportMap/Sources/Log.config new file mode 100644 index 0000000..66d3fcd --- /dev/null +++ b/ExportMap/Sources/Log.config @@ -0,0 +1,37 @@ +锘�<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <!--鏃ュ織閰嶇疆閮ㄥ垎--> + <configSections> + <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net"/> + </configSections> + <!--绔欑偣鏃ュ織閰嶇疆閮ㄥ垎--> + <log4net> + <root> + <!-- 鏃ュ織绛夌骇锛欰LL|DEBUG|INFO|WARN|ERROR|FATAL|OFF --> + <priority value="Info"/> + <appender-ref ref="RollingFileAppender"/> + </root> + <appender name="TraceAppender" type="log4net.Appender.TraceAppender"> + <layout type="log4net.Layout.PatternLayout"> + <conversionPattern value="%date%newline%message"/> + </layout> + </appender> + <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender"> + <layout type="log4net.Layout.PatternLayout"> + <conversionPattern value="%date%newline%message"/> + </layout> + </appender> + <appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender"> + <file value="Sources\\log.txt"/> + <appendToFile value="true"/> + <maxSizeRollBackups value="10"/> + <maximumFileSize value="2048KB"/> + <rollingStyle value="Size"/> + <staticLogFileName value="true"/> + <lockingModel type="log4net.Appender.FileAppender+MinimalLock"/> + <layout type="log4net.Layout.PatternLayout"> + <conversionPattern value="%date%newline%message"/> + </layout> + </appender> + </log4net> +</configuration> \ No newline at end of file diff --git a/ExportMap/Test.html b/ExportMap/Test.html index 573c06e..e502fbe 100644 --- a/ExportMap/Test.html +++ b/ExportMap/Test.html @@ -5,7 +5,7 @@ <title></title> <script src="js/jquery.1.12.4.js"></script> <script> - var token = "75e9b5a3-b9bd-4374-9c5b-6ae5b38d5132"; + var token = "a5cca7ad-bfe6-43bd-aa62-e19f2ffac6bd"; function ajax(url, type, data, dataType, contentType, fn) { $.ajax({ @@ -43,7 +43,7 @@ }; ajax("Export/Start", "POST", JSON.stringify(data), null, null, function (rs) { - alert("code = " + rs.code + ", result = " + rs.result); + alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result); console.log(rs); }); } @@ -67,7 +67,7 @@ }; ajax("Export/Start", "POST", JSON.stringify(data), null, null, function (rs) { - alert("code = " + rs.code + ", result = " + rs.result); + alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result); console.log(rs); }); } diff --git a/ExportMap/Web.config b/ExportMap/Web.config index 527f819..1e4ce57 100644 --- a/ExportMap/Web.config +++ b/ExportMap/Web.config @@ -1,115 +1,124 @@ -锘�<?xml version="1.0" encoding="utf-8"?> +锘�<?xml version="1.0"?> <configuration> - <appSettings> + <appSettings> <!-- 192.168.20.39,127.0.0.1 --> - <add key="lfServer" value="http://127.0.0.1:12316"/> + <add key="lfServer" value="http://127.0.0.1:12316"/> <add key="downloadFolder" value="D:\LF\download"/> - <add key="pgConn" value="Server=127.0.0.1;Port=5432;Database=langfang;User Id=postgres;Password=postgres;" /> - <add key="webpages:Version" value="3.0.0.0" /> - <add key="webpages:Enabled" value="false" /> - <add key="ClientValidationEnabled" value="true" /> - <add key="UnobtrusiveJavaScriptEnabled" value="true" /> - </appSettings> - <connectionStrings></connectionStrings> - <system.web> - <compilation debug="true" targetFramework="4.5.2" /> - <httpRuntime targetFramework="4.5.2" maxRequestLength="2147483647" /> - </system.web> - <system.webServer> - <security> - <requestFiltering> - <requestLimits maxAllowedContentLength="2147483647"></requestLimits> - </requestFiltering> - </security> - <handlers> - <remove name="ExtensionlessUrlHandler-Integrated-4.0" /> - <remove name="OPTIONSVerbHandler" /> - <remove name="TRACEVerbHandler" /> - <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" /> - </handlers> - <staticContent> - <remove fileExtension=".wsv" /> - <mimeMap fileExtension=".wsv" mimeType="application/octet-stream" /> - <remove fileExtension=".czml" /> - <mimeMap fileExtension=".czml" mimeType="application/json" /> - <remove fileExtension=".glsl" /> - <mimeMap fileExtension=".glsl" mimeType="text/plain" /> - <remove fileExtension=".b3dm" /> - <mimeMap fileExtension=".b3dm" mimeType="application/octet-stream" /> - <remove fileExtension=".pnts" /> - <mimeMap fileExtension=".pnts" mimeType="application/octet-stream" /> - <remove fileExtension=".i3dm" /> - <mimeMap fileExtension=".i3dm" mimeType="application/octet-stream" /> - <remove fileExtension=".cmpt" /> - <mimeMap fileExtension=".cmpt" mimeType="application/octet-stream" /> - <remove fileExtension=".gltf" /> - <mimeMap fileExtension=".gltf" mimeType="model/gltf+json" /> - <remove fileExtension=".bgltf" /> - <mimeMap fileExtension=".bgltf" mimeType="model/gltf-binary" /> - <remove fileExtension=".glb" /> - <mimeMap fileExtension=".glb" mimeType="model/gltf-binary" /> - <remove fileExtension=".json" /> - <mimeMap fileExtension=".json" mimeType="application/json" /> - <remove fileExtension=".geojson" /> - <mimeMap fileExtension=".geojson" mimeType="application/json" /> - <remove fileExtension=".topojson" /> - <mimeMap fileExtension=".topojson" mimeType="application/json" /> - <remove fileExtension=".wasm" /> - <mimeMap fileExtension=".wasm" mimeType="application/wasm" /> - <remove fileExtension=".woff" /> - <mimeMap fileExtension=".woff" mimeType="application/font-woff" /> - <remove fileExtension=".woff2" /> - <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" /> - <remove fileExtension=".kml" /> - <mimeMap fileExtension=".kml" mimeType="application/vnd.google-earth.kml+xml" /> - <remove fileExtension=".kmz" /> - <mimeMap fileExtension=".kmz" mimeType="application/vnd.google-earth.kmz" /> - <remove fileExtension=".svg" /> - <mimeMap fileExtension=".svg" mimeType="image/svg+xml" /> - <remove fileExtension=".terrain" /> - <mimeMap fileExtension=".terrain" mimeType="application/vnd.quantized-mesh" /> - <remove fileExtension=".ktx" /> - <mimeMap fileExtension=".ktx" mimeType="image/ktx" /> - <remove fileExtension=".crn" /> - <mimeMap fileExtension=".crn" mimeType="image/crn" /> - <remove fileExtension=".ktx2" /> - <mimeMap fileExtension=".ktx2" mimeType="image/ktx2" /> - <remove fileExtension=".eot" /> - <mimeMap fileExtension=".eot" mimeType="application/vnd.ms-fontobject" /> - <remove fileExtension=".ttf" /> - <mimeMap fileExtension=".ttf" mimeType="application/octet-stream" /> - <remove fileExtension=".csv" /> - <mimeMap fileExtension=".csv" mimeType="application/octet-stream" /> - <remove fileExtension=".fly" /> - <mimeMap fileExtension=".fly" mimeType="application/octet-stream" /> - <remove fileExtension=".emp" /> - <mimeMap fileExtension=".emp" mimeType="application/octet-stream" /> - <remove fileExtension=".edp" /> - <mimeMap fileExtension=".edp" mimeType="application/octet-stream" /> - <remove fileExtension=".flv" /> - <mimeMap fileExtension=".flv" mimeType="flv-application/octet-stream" /> - <remove fileExtension=".mp4" /> - <mimeMap fileExtension=".mp4" mimeType="video/mp4" /> - <remove fileExtension=".wmv" /> - <mimeMap fileExtension=".wmv" mimeType="audio/x-ms-wmv" /> - <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="1.00:00:00" /> - </staticContent> - <httpProtocol> - <customHeaders> - <add name="Access-Control-Allow-Headers" value="*,X-Requested-With" /> - <add name="Access-Control-Allow-Origin" value="*" /> - </customHeaders> - </httpProtocol> - </system.webServer> + <add key="pgConn" value="Server=127.0.0.1;Port=5432;Database=langfang;User Id=postgres;Password=postgres;"/> + <add key="webpages:Version" value="3.0.0.0"/> + <add key="webpages:Enabled" value="false"/> + <add key="ClientValidationEnabled" value="true"/> + <add key="UnobtrusiveJavaScriptEnabled" value="true"/> + </appSettings> + <connectionStrings/> + <!-- + 鏈夊叧 .NET 4.5 鐨� web.config 鏇存敼鐨勮鏄庯紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkId=235367銆� + + 鍙湪 <httpRuntime> 鏍囪涓婅缃互涓嬬壒鎬с�� + <system.Web> + <httpRuntime targetFramework="4.5" /> + </system.Web> + --> + <system.web> + <compilation debug="true" targetFramework="4.5.2"/> + <httpRuntime maxRequestLength="2147483647"/> + <pages controlRenderingCompatibilityVersion="4.0"/> + </system.web> + <system.webServer> + <security> + <requestFiltering> + <requestLimits maxAllowedContentLength="2147483647"/> + </requestFiltering> + </security> + <handlers> + <remove name="ExtensionlessUrlHandler-Integrated-4.0"/> + <remove name="OPTIONSVerbHandler"/> + <remove name="TRACEVerbHandler"/> + <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/> + </handlers> + <staticContent> + <remove fileExtension=".wsv"/> + <mimeMap fileExtension=".wsv" mimeType="application/octet-stream"/> + <remove fileExtension=".czml"/> + <mimeMap fileExtension=".czml" mimeType="application/json"/> + <remove fileExtension=".glsl"/> + <mimeMap fileExtension=".glsl" mimeType="text/plain"/> + <remove fileExtension=".b3dm"/> + <mimeMap fileExtension=".b3dm" mimeType="application/octet-stream"/> + <remove fileExtension=".pnts"/> + <mimeMap fileExtension=".pnts" mimeType="application/octet-stream"/> + <remove fileExtension=".i3dm"/> + <mimeMap fileExtension=".i3dm" mimeType="application/octet-stream"/> + <remove fileExtension=".cmpt"/> + <mimeMap fileExtension=".cmpt" mimeType="application/octet-stream"/> + <remove fileExtension=".gltf"/> + <mimeMap fileExtension=".gltf" mimeType="model/gltf+json"/> + <remove fileExtension=".bgltf"/> + <mimeMap fileExtension=".bgltf" mimeType="model/gltf-binary"/> + <remove fileExtension=".glb"/> + <mimeMap fileExtension=".glb" mimeType="model/gltf-binary"/> + <remove fileExtension=".json"/> + <mimeMap fileExtension=".json" mimeType="application/json"/> + <remove fileExtension=".geojson"/> + <mimeMap fileExtension=".geojson" mimeType="application/json"/> + <remove fileExtension=".topojson"/> + <mimeMap fileExtension=".topojson" mimeType="application/json"/> + <remove fileExtension=".wasm"/> + <mimeMap fileExtension=".wasm" mimeType="application/wasm"/> + <remove fileExtension=".woff"/> + <mimeMap fileExtension=".woff" mimeType="application/font-woff"/> + <remove fileExtension=".woff2"/> + <mimeMap fileExtension=".woff2" mimeType="application/font-woff2"/> + <remove fileExtension=".kml"/> + <mimeMap fileExtension=".kml" mimeType="application/vnd.google-earth.kml+xml"/> + <remove fileExtension=".kmz"/> + <mimeMap fileExtension=".kmz" mimeType="application/vnd.google-earth.kmz"/> + <remove fileExtension=".svg"/> + <mimeMap fileExtension=".svg" mimeType="image/svg+xml"/> + <remove fileExtension=".terrain"/> + <mimeMap fileExtension=".terrain" mimeType="application/vnd.quantized-mesh"/> + <remove fileExtension=".ktx"/> + <mimeMap fileExtension=".ktx" mimeType="image/ktx"/> + <remove fileExtension=".crn"/> + <mimeMap fileExtension=".crn" mimeType="image/crn"/> + <remove fileExtension=".ktx2"/> + <mimeMap fileExtension=".ktx2" mimeType="image/ktx2"/> + <remove fileExtension=".eot"/> + <mimeMap fileExtension=".eot" mimeType="application/vnd.ms-fontobject"/> + <remove fileExtension=".ttf"/> + <mimeMap fileExtension=".ttf" mimeType="application/octet-stream"/> + <remove fileExtension=".csv"/> + <mimeMap fileExtension=".csv" mimeType="application/octet-stream"/> + <remove fileExtension=".fly"/> + <mimeMap fileExtension=".fly" mimeType="application/octet-stream"/> + <remove fileExtension=".emp"/> + <mimeMap fileExtension=".emp" mimeType="application/octet-stream"/> + <remove fileExtension=".edp"/> + <mimeMap fileExtension=".edp" mimeType="application/octet-stream"/> + <remove fileExtension=".flv"/> + <mimeMap fileExtension=".flv" mimeType="flv-application/octet-stream"/> + <remove fileExtension=".mp4"/> + <mimeMap fileExtension=".mp4" mimeType="video/mp4"/> + <remove fileExtension=".wmv"/> + <mimeMap fileExtension=".wmv" mimeType="audio/x-ms-wmv"/> + <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="1.00:00:00"/> + </staticContent> + <httpProtocol> + <customHeaders> + <add name="Access-Control-Allow-Headers" value="*,X-Requested-With"/> + <add name="Access-Control-Allow-Origin" value="*"/> + </customHeaders> + </httpProtocol> + </system.webServer> <runtime> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> - <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> + <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/> </dependentAssembly> <dependentAssembly> - <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> + <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/> </dependentAssembly> </assemblyBinding> </runtime> diff --git a/ExportMap/cs/ExportUtil.cs b/ExportMap/cs/ExportUtil.cs index 87df402..e7752b8 100644 --- a/ExportMap/cs/ExportUtil.cs +++ b/ExportMap/cs/ExportUtil.cs @@ -1,4 +1,5 @@ -锘縰sing LFServer.Models; +锘縰sing ExportMap.cs; +using LFServer.Models; using Newtonsoft.Json; using System; using System.Collections.Generic; @@ -140,6 +141,7 @@ try { string cmdText = string.Format("python {0} -qgz {1} -qpt {2}", py, qgz, qpt); + LogOut.Info(cmdText); Process p = new Process(); p.StartInfo.FileName = "cmd.exe"; @@ -160,10 +162,9 @@ string info = so.ReadToEnd(); str = se.ReadToEnd(); - if (p.HasExited == false) - { - p.Kill(); - } + + if (!string.IsNullOrEmpty(str)) LogOut.Error(str); + if (p.HasExited == false) p.Kill(); si.Close(); so.Close(); @@ -172,6 +173,7 @@ } catch (Exception ex) { + LogOut.Error(ex.StackTrace); str = ex.Message; } @@ -182,8 +184,9 @@ /// 鐢熸垚 /// </summary> /// <param name="args">鍑哄浘鍙傛暟</param> + /// <param name="err">閿欒淇℃伅</param> /// <returns>鍥剧墖璺緞</returns> - public static string Generate(ExportArgs args) + public static string Generate(ExportArgs args, ref string err) { string date = DateStr; string sub = GetExportSubFolder(); @@ -194,7 +197,7 @@ args.SetDefault(); CreateTemplate(args); - string info = ExecPython(PyFile, qgz, args.qpt); + err = ExecPython(PyFile, qgz, args.qpt); string qptFile = Path.Combine(SourcesPath, args.qpt); if (File.Exists(qptFile)) @@ -262,7 +265,7 @@ return rm != null && rm.code == 200 && rm.result; } - catch (Exception ex) + catch { return false; } diff --git a/ExportMap/cs/LogOut.cs b/ExportMap/cs/LogOut.cs new file mode 100644 index 0000000..cecd398 --- /dev/null +++ b/ExportMap/cs/LogOut.cs @@ -0,0 +1,128 @@ +锘縰sing System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Web; + +namespace ExportMap.cs +{ + /// <summary> + /// 鏃ュ織杈撳嚭绫� + /// </summary> + public class LogOut + { + /// <summary> + /// 鏃ュ織 + /// </summary> + protected static readonly log4net.ILog _log; + + /// <summary> + /// 闈欐�佹瀯閫犲嚱鏁� + /// </summary> + static LogOut() + { + try + { + _log = log4net.LogManager.GetLogger("log4net"); + + //HttpContext.Current.Request.PhysicalApplicationPath + string fileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Sources\\Log.config"); + + log4net.Config.XmlConfigurator.Configure(new FileInfo(fileName)); + } + catch + { + } + } + + /// <summary> + /// 璋冭瘯 + /// </summary> + /// <param name="message">鏃ュ織</param> + public static void Debug(string message) + { + try + { + if (_log.IsDebugEnabled) + { + _log.Debug("璋冭瘯锛�" + message + "\r\n\r\n"); + } + } + catch + { + } + } + + /// <summary> + /// 淇℃伅 + /// </summary> + /// <param name="message">鏃ュ織</param> + public static void Info(string message) + { + try + { + if (_log.IsInfoEnabled) + { + _log.Info("淇℃伅锛�" + message + "\r\n\r\n"); + } + } + catch + { + } + } + + /// <summary> + /// 璀﹀憡 + /// </summary> + /// <param name="message">鏃ュ織</param> + public static void Warn(string message) + { + try + { + if (_log.IsWarnEnabled) + { + _log.Warn("璀﹀憡锛�" + message + "\r\n\r\n"); + } + } + catch + { + } + } + + /// <summary> + /// 閿欒 + /// </summary> + /// <param name="message">鏃ュ織</param> + public static void Error(string message) + { + try + { + if (_log.IsErrorEnabled) + { + _log.Error("閿欒锛�" + message + "\r\n\r\n"); + } + } + catch + { + } + } + + /// <summary> + /// 鑷村懡 + /// </summary> + /// <param name="message">鏃ュ織</param> + public static void Fatal(string message) + { + try + { + if (_log.IsFatalEnabled) + { + _log.Fatal("鑷村懡锛�" + message + "\r\n\r\n"); + } + } + catch + { + } + } + } +} \ No newline at end of file -- Gitblit v1.9.3