211223

.gitignore

@@ -4743,6 +4743,7 @@
 备份/HJGL/WebApi/fonts/glyphicons-halflings-regular.ttf
 备份/HJGL/WebApi/fonts/glyphicons-halflings-regular.woff
 备份/HJGL/WebApi/fonts/glyphicons-halflings-regular.woff2
+HJGL/.vs/
 HJGL/BLL/bin/Debug/BLL.dll
 HJGL/BLL/bin/Debug/BLL.dll.config
 HJGL/BLL/bin/Debug/BLL.pdb
@@ -5679,6 +5680,7 @@ HJGL/WebApi/obj/Debug/WebApi.csproj.FileListAbsolute.txt
 HJGL/WebApi/obj/Debug/WebApi.csprojAssemblyReference.cache
 HJGL/WebApi/obj/Debug/WebApi.dll
 HJGL/WebApi/obj/Debug/WebApi.pdb
+HJGL/WebApi/obj/Release/
 HJGL/WebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
 HJGL/WebApi/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
 HJGL/WebApi/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs

HJGL/BLL/APIService/APIUserService.cs

@@ -1,4 +1,4 @@
-using EmitMapper;
+
 using System;
 using System.Collections.Generic;
 using System.Linq;

HJGL/BLL/APIService/APIWelderService.cs

@@ -1,4 +1,4 @@
-using EmitMapper;
+
 using System;
 using System.Collections.Generic;
 using System.Linq;

HJGL/BLL/BLL.csproj

@@ -49,7 +49,7 @@
       <HintPath>..\FineUIPro.Web\bin\EmitMapper.dll</HintPath>
     </Reference>
     <Reference Include="FineUIPro">
-      <HintPath>..\FineUIPro\FineUIPro.dll</HintPath>
+      <HintPath>bin\FineUIPro.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>

HJGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -250,7 +250,6 @@
     <Content Include="Doc\ReportViewer安装.txt" />
     <Content Include="Downloads\index.aspx" />
     <Content Include="Encrypt.aspx" />
-    <Content Include="FileUpload\index.aspx" />
     <Content Include="File\index.aspx" />
     <Content Include="HotProcessHard\HardFeedback.aspx" />
     <Content Include="HotProcessHard\HardReport.aspx" />
@@ -395,7 +394,6 @@
     <Content Include="Report\ReportPrint.aspx" />
     <Content Include="Scripts\index.aspx" />
     <Content Include="Styles\index.aspx" />
-    <Content Include="upload\index.aspx" />
     <Content Include="WeldingProcess\CheckManage\CheckManage.aspx" />
     <Content Include="WeldingProcess\CheckManage\CheckManageEdit.aspx" />
     <Content Include="WeldingProcess\CheckManage\CheckManageIn.aspx" />
@@ -3497,13 +3495,6 @@
     <Compile Include="Encrypt.aspx.designer.cs">
       <DependentUpon>Encrypt.aspx</DependentUpon>
     </Compile>
-    <Compile Include="FileUpload\index.aspx.cs">
-      <DependentUpon>index.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="FileUpload\index.aspx.designer.cs">
-      <DependentUpon>index.aspx</DependentUpon>
-    </Compile>
     <Compile Include="File\index.aspx.cs">
       <DependentUpon>index.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -4447,13 +4438,6 @@
     <Compile Include="Styles\index.aspx.designer.cs">
       <DependentUpon>index.aspx</DependentUpon>
     </Compile>
-    <Compile Include="upload\index.aspx.cs">
-      <DependentUpon>index.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="upload\index.aspx.designer.cs">
-      <DependentUpon>index.aspx</DependentUpon>
-    </Compile>
     <Compile Include="WeldingProcess\CheckManage\CheckManage.aspx.cs">
       <DependentUpon>CheckManage.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -4919,6 +4903,7 @@
   <ItemGroup>
     <Folder Include="App_Themes\Default\Images\" />
     <Folder Include="res\js\" />
+    <Folder Include="upload\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BLL\BLL.csproj">

HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectView>ProjectFiles</ProjectView>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

HJGL/FineUIPro.Web/Web.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <!--
   有关如何配置 ASP.NET 应用程序的详细消息，请访问
 
@@ -9,7 +9,7 @@
     <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
   </configSections>
   <connectionStrings>
-    <add name="HJGLDBConnectionString" connectionString="Data Source=.\SQL2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;" />
+    <add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
     <!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
       providerName="System.Data.SqlClient" />-->
   </connectionStrings>
@@ -51,12 +51,11 @@
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
       <add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" validate="false"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1">
+    <compilation debug="true" targetFramework="4.6.1">
       <assemblies>
         <!--<add assembly="Microsoft.Build.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />-->
         <add assembly="System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
       </assemblies>
-    
     </compilation>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">

HJGL/WebApi/Web.config

@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   有关如何配置 ASP.NET 应用程序的详细信息，请访问
   https://go.microsoft.com/fwlink/?LinkId=301879

HJGL/WebApi/WebApi.csproj

@@ -106,6 +106,11 @@
       <Private>True</Private>
       <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
+    <Reference Include="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.Linq.3.5.21022.801\lib\net20\System.Xml.Linq.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="WebGrease">
       <Private>True</Private>
       <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>

HJGL/WebApi/WebApi.csproj.user

@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
   </PropertyGroup>
   <ProjectExtensions>

HJGL/WebApi/packages.config

@@ -23,5 +23,6 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
   <package id="Modernizr" version="2.8.3" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="11.0.1" targetFramework="net461" />
+  <package id="System.Xml.Linq" version="3.5.21022.801" targetFramework="net48" />
   <package id="WebGrease" version="1.6.0" targetFramework="net461" />
 </packages>