shecs
/
Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: shecs:a4dad26dae725567c2b2c4d56337b7225bc65b83
Branches Tags
shecs:master
shecs:Feature_20240510
..
compare: shecs:27a4aa993e71571ed0172f2051d9b33e92088dbb
Branches Tags
shecs:master
shecs:Feature_20240510

No commits in common. "a4dad26dae725567c2b2c4d56337b7225bc65b83" and "27a4aa993e71571ed0172f2051d9b33e92088dbb" have entirely different histories.
a4dad26dae ... 27a4aa993e

16 changed files with 99 additions and 96 deletions
Show Stats Expand all files Collapse all files

7
.gitignore vendored
View File

@ -4743,7 +4743,6 @@
备份/HJGL/WebApi/fonts/glyphicons-halflings-regular.ttf 备份/HJGL/WebApi/fonts/glyphicons-halflings-regular.ttf
备份/HJGL/WebApi/fonts/glyphicons-halflings-regular.woff 备份/HJGL/WebApi/fonts/glyphicons-halflings-regular.woff
备份/HJGL/WebApi/fonts/glyphicons-halflings-regular.woff2 备份/HJGL/WebApi/fonts/glyphicons-halflings-regular.woff2
HJGL/.vs/
HJGL/BLL/bin/Debug/BLL.dll HJGL/BLL/bin/Debug/BLL.dll
HJGL/BLL/bin/Debug/BLL.dll.config HJGL/BLL/bin/Debug/BLL.dll.config
HJGL/BLL/bin/Debug/BLL.pdb HJGL/BLL/bin/Debug/BLL.pdb
@ -5680,7 +5679,6 @@ HJGL/WebApi/obj/Debug/WebApi.csproj.FileListAbsolute.txt
HJGL/WebApi/obj/Debug/WebApi.csprojAssemblyReference.cache HJGL/WebApi/obj/Debug/WebApi.csprojAssemblyReference.cache
HJGL/WebApi/obj/Debug/WebApi.dll HJGL/WebApi/obj/Debug/WebApi.dll
HJGL/WebApi/obj/Debug/WebApi.pdb HJGL/WebApi/obj/Debug/WebApi.pdb
HJGL/WebApi/obj/Release/
HJGL/WebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache HJGL/WebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
HJGL/WebApi/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs HJGL/WebApi/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
HJGL/WebApi/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs HJGL/WebApi/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
@ -5716,8 +5714,3 @@ HJGLPackFile/版本日志/HJGLDB_2024.05.02.sql
/HJGL/FineUIPro.Web/bin /HJGL/FineUIPro.Web/bin
/HJGL/FineUIPro.Web/obj/Release /HJGL/FineUIPro.Web/obj/Release
/HJGL/BLL/obj/Release /HJGL/BLL/obj/Release
/HJGL/BLL/bin
/HJGL/BLL/obj/Debug
/HJGL/FineUIPro.Web/obj/Debug
/HJGL/Model/obj/Debug
/HJGL/WebApi/obj/Debug

BIN
HJGL/.vs/HJGL/FileContentIndex/e7463c9d-6670-4ca1-a944-a1d5ccf7fc5f.vsidx Normal file
View File

Binary file not shown.

BIN
HJGL/.vs/HJGL/FileContentIndex/ea929dce-5253-47ed-a0e6-661769fbbd35.vsidx Normal file
View File

Binary file not shown.

BIN
HJGL/.vs/HJGL/v17/.suo
View File

Binary file not shown.

2
HJGL/BLL/APIService/APIUserService.cs
View File

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

2
HJGL/BLL/APIService/APIWelderService.cs
View File

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

2
HJGL/BLL/BLL.csproj
View File

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

BIN
HJGL/FineUIPro.Web/File/Excel/20240508023919/out.xlsx
View File

Binary file not shown.

17
HJGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

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

2
HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

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

91
HJGL/FineUIPro.Web/Web.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
有关如何配置 ASP.NET 应用程序的详细消息，请访问 有关如何配置 ASP.NET 应用程序的详细消息，请访问
@ -6,24 +6,24 @@
--> -->
<configuration> <configuration>
<configSections> <configSections>
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/> <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false" />
</configSections> </configSections>
<connectionStrings> <connectionStrings>
<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/> <add name="HJGLDBConnectionString" connectionString="Data Source=.\SQL2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;" />
<!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True" <!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
providerName="System.Data.SqlClient" />--> providerName="System.Data.SqlClient" />-->
</connectionStrings> </connectionStrings>
<FineUIPro DebugMode="false" CustomTheme="Metro_Dark_Blue" EnableAnimation="true" JSLibrary="All"/> <FineUIPro DebugMode="false" CustomTheme="Metro_Dark_Blue" EnableAnimation="true" JSLibrary="All" />
<appSettings> <appSettings>
<!--连接字符串--> <!--连接字符串-->
<!--<add key="ConnectionString" value="Server=.;Database=HJGLDB;Integrated Security=False; User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>--> <!--<add key="ConnectionString" value="Server=.;Database=HJGLDB;Integrated Security=False; User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>-->
<!--系统名称--> <!--系统名称-->
<add key="SystemName" value="管道焊接信息管理系统"/> <add key="SystemName" value="管道焊接信息管理系统" />
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/> <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;" />
<add key="aspnet:MaxHttpCollectionKeys" value="50000"/> <add key="aspnet:MaxHttpCollectionKeys" value="50000" />
<add key="APPUrl" value="https://www.pgyer.com/pWSd111"/> <add key="APPUrl" value="https://www.pgyer.com/pWSd111"/>
<add key="Https" value="false"/> <add key="Https" value="false" />
<add key="UsingUnit" value="TCC11"/> <add key="UsingUnit" value="TCC11" />
</appSettings> </appSettings>
<!-- <!--
有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。 有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
@ -35,64 +35,65 @@
--> -->
<system.web> <system.web>
<!-- 会话状态设置 默认情况下，ASP.NET 使用 Cookie 来标识哪些请求属于特定的会话。如果 Cookie 不可用，则可以通过将会话标识符添加到 URL 来跟踪会话。若要禁用 Cookie，请设置 sessionState cookieless="true" --> <!-- 会话状态设置 默认情况下，ASP.NET 使用 Cookie 来标识哪些请求属于特定的会话。如果 Cookie 不可用，则可以通过将会话标识符添加到 URL 来跟踪会话。若要禁用 Cookie，请设置 sessionState cookieless="true" -->
<sessionState mode="InProc" cookieless="UseCookies" timeout="1200"/> <sessionState mode="InProc" cookieless="UseCookies" timeout="1200" />
<!--<processModel enable="true" requestQueueLimit="100000"/>--> <!--<processModel enable="true" requestQueueLimit="100000"/>-->
<pages controlRenderingCompatibilityVersion="4.0" clientIDMode="AutoID" viewStateEncryptionMode="Always"> <pages controlRenderingCompatibilityVersion="4.0" clientIDMode="AutoID" viewStateEncryptionMode="Always">
<controls> <controls>
<add tagPrefix="f" namespace="FineUIPro" assembly="FineUIPro"/> <add tagPrefix="f" namespace="FineUIPro" assembly="FineUIPro" />
<add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> <add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
</controls> </controls>
</pages> </pages>
<httpModules> <httpModules>
<add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/> <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro" />
</httpModules> </httpModules>
<httpHandlers> <httpHandlers>
<add path="res.axd" verb="GET" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/> <add path="res.axd" verb="GET" type="FineUIPro.ResourceHandler, FineUIPro" validate="false" />
<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="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"/> <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> </httpHandlers>
<compilation debug="true" targetFramework="4.6.1"> <compilation debug="false" targetFramework="4.6.1">
<assemblies> <assemblies>
<!--<add assembly="Microsoft.Build.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />--> <!--<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"/> <add assembly="System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
</assemblies> </assemblies>
</compilation> </compilation>
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/> <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000" />
<authentication mode="Forms"> <authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/> <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/" />
</authentication> </authentication>
<membership> <membership>
<providers> <providers>
<clear/> <clear />
<add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/"/> <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" />
</providers> </providers>
</membership> </membership>
<profile> <profile>
<providers> <providers>
<clear/> <clear />
<add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/"/> <add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/" />
</providers> </providers>
</profile> </profile>
<roleManager enabled="false"> <roleManager enabled="false">
<providers> <providers>
<clear/> <clear />
<add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/"/> <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/" />
<add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/"/> <add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/" />
</providers> </providers>
</roleManager> </roleManager>
<customErrors defaultRedirect="LogOff.aspx" mode="RemoteOnly"> <customErrors defaultRedirect="LogOff.aspx" mode="RemoteOnly">
<error redirect="https://localhost/hjgl/OperationError.aspx" statusCode="404"/> <error redirect="https://localhost/hjgl/OperationError.aspx" statusCode="404" />
</customErrors> </customErrors>
<!--Unencrypted __VIEWSTATE parameter，viewstate 保存没有加密，解决方法--> <!--Unencrypted __VIEWSTATE parameter，viewstate 保存没有加密，解决方法-->
<machineKey validation="3DES"/> <machineKey validation="3DES" />
<!--Body Parameters Accepted in Query:https才能访问--> <!--Body Parameters Accepted in Query:https才能访问-->
<!--<httpCookies httpOnlyCookies="true" requireSSL="true"/>--> <!--<httpCookies httpOnlyCookies="true" requireSSL="true"/>-->
</system.web> </system.web>
<location path="res.axd"/> <location path="res.axd" />
<system.webServer> <system.webServer>
<staticContent> <staticContent>
<mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File"/> <mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File" />
<mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File"/> <mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File" />
</staticContent> </staticContent>
<httpProtocol> <httpProtocol>
<customHeaders> <customHeaders>
@ -105,33 +106,33 @@
<add name="Strict-Transport-Security" value="max-age=31536000" />--> <add name="Strict-Transport-Security" value="max-age=31536000" />-->
</customHeaders> </customHeaders>
</httpProtocol> </httpProtocol>
<validation validateIntegratedModeConfiguration="false"/> <validation validateIntegratedModeConfiguration="false" />
<modules runAllManagedModulesForAllRequests="true"> <modules runAllManagedModulesForAllRequests="true">
<add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/> <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro" />
<remove name="ScriptModule"/> <remove name="ScriptModule" />
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
</modules> </modules>
<handlers> <handlers>
<remove name="ChartImageHandler"/> <remove name="ChartImageHandler" />
<add name="FineUIProResourceHandler" verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro"/> <add name="FineUIProResourceHandler" verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" />
<add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> <add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<add name="ReportViewerWebControlHandler" verb="*" path="Reserved.ReportViewerWebControl.axd" preCondition="integratedMode" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91"/> <add name="ReportViewerWebControlHandler" verb="*" path="Reserved.ReportViewerWebControl.axd" preCondition="integratedMode" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" />
</handlers> </handlers>
<defaultDocument> <defaultDocument>
<files> <files>
<add value="Login.aspx"/> <add value="Login.aspx" />
</files> </files>
</defaultDocument> </defaultDocument>
<httpErrors> <httpErrors>
<remove statusCode="403" subStatusCode="-1"/> <remove statusCode="403" subStatusCode="-1" />
<error statusCode="403" prefixLanguageFilePath="https://localhost/hjgl/" path="OperationError.aspx" responseMode="File"/> <error statusCode="403" prefixLanguageFilePath="https://localhost/hjgl/" path="OperationError.aspx" responseMode="File" />
</httpErrors> </httpErrors>
</system.webServer> </system.webServer>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/> <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>

62
HJGL/WebApi/Web.config
View File

@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0"?>
<!-- <!--
有关如何配置 ASP.NET 应用程序的详细信息，请访问 有关如何配置 ASP.NET 应用程序的详细信息，请访问
https://go.microsoft.com/fwlink/?LinkId=301879 https://go.microsoft.com/fwlink/?LinkId=301879
--> -->
<configuration> <configuration>
<appSettings> <appSettings>
<add key="webpages:Version" value="3.0.0.0" /> <add key="webpages:Version" value="3.0.0.0"/>
<add key="webpages:Enabled" value="false" /> <add key="webpages:Enabled" value="false"/>
<add key="ClientValidationEnabled" value="true" /> <add key="ClientValidationEnabled" value="true"/>
<add key="UnobtrusiveJavaScriptEnabled" value="true" /> <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
<!--连接字符串--> <!--连接字符串-->
<add key="ConnectionString" value="Server=.;Database=whhjdb;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200" /> <add key="ConnectionString" value="Server=.;Database=whhjdb;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<!--版本号--> <!--版本号-->
<add key="SystemVersion" value="WebApi_V2019-09-20-001" /> <add key="SystemVersion" value="WebApi_V2019-09-20-001"/>
<!--附件上传物理路径--> <!--附件上传物理路径-->
<add key="localRoot" value="D:\DepCode\WanHua\HJGL\HJGL\FineUIPro.Web\" /> <add key="localRoot" value="D:\DepCode\WanHua\HJGL\HJGL\FineUIPro.Web\"/>
<!--每页数量--> <!--每页数量-->
<add key="PageSize" value="15" /> <add key="PageSize" value="15"/>
</appSettings> </appSettings>
<!-- <!--
有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。 有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
@ -27,53 +27,53 @@
</system.Web> </system.Web>
--> -->
<system.web> <system.web>
<compilation debug="false" targetFramework="4.8" /> <compilation debug="false" targetFramework="4.8"/>
<httpRuntime targetFramework="4.6.1" /> <httpRuntime targetFramework="4.6.1"/>
</system.web> </system.web>
<system.webServer> <system.webServer>
<handlers> <handlers>
<remove name="ExtensionlessUrlHandler-Integrated-4.0" /> <remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
<remove name="OPTIONSVerbHandler" /> <remove name="OPTIONSVerbHandler"/>
<remove name="TRACEVerbHandler" /> <remove name="TRACEVerbHandler"/>
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" /> <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
</handlers> </handlers>
</system.webServer> </system.webServer>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" /> <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f"/>
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" /> <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" /> <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed"/>
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" /> <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" /> <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-5.2.4.0" newVersion="5.2.4.0" /> <bindingRedirect oldVersion="1.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>
<compilers> <compilers>
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" /> <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701"/>
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" /> <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
</compilers> </compilers>
</system.codedom> </system.codedom>
</configuration> </configuration>

5
HJGL/WebApi/WebApi.csproj
View File

@ -106,11 +106,6 @@
<Private>True</Private> <Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Razor.dll</HintPath> <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
</Reference> </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"> <Reference Include="WebGrease">
<Private>True</Private> <Private>True</Private>
<HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath> <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>

2
HJGL/WebApi/WebApi.csproj.user
View File

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

BIN
HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache
View File

Binary file not shown.

1
HJGL/WebApi/packages.config
View File

@ -23,6 +23,5 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" /> <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
<package id="Modernizr" version="2.8.3" targetFramework="net461" /> <package id="Modernizr" version="2.8.3" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.1" 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" /> <package id="WebGrease" version="1.6.0" targetFramework="net461" />
</packages> </packages>