From 869c96c5ee8ec6678695298c133054b5f01c434b Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 25 六月 2024 09:57:39 +0800
Subject: [PATCH] 1
---
WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user | 40 ++++++------
WebAPI/Web.config | 48 ++++++++-------
WebAPI/packages.config | 15 ----
WebAPI/WebAPI.csproj | 31 ---------
4 files changed, 48 insertions(+), 86 deletions(-)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user
index deb670b..38ea632 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-06-24T15:05:20.8658324Z;True|2024-06-24T22:59:59.2842726+08:00;True|2024-06-24T16:29:08.9135923+08:00;True|2024-06-24T15:44:19.8100242+08:00;True|2024-06-18T16:08:52.3066991+08:00;True|2024-06-18T14:08:42.6969999+08:00;True|2024-06-17T13:22:25.8401219+08:00;True|2024-06-17T11:27:09.9223091+08:00;True|2024-06-17T11:23:37.5133763+08:00;True|2024-06-17T10:58:43.2727797+08:00;True|2024-06-14T13:32:57.5800980+08:00;False|2024-06-13T10:45:10.1375417+08:00;False|2024-06-13T10:43:52.8804222+08:00;</History>
+ <History>True|2024-06-25T01:53:35.8089888Z;True|2024-06-25T09:50:45.0788666+08:00;True|2024-06-25T09:46:08.5825317+08:00;True|2024-06-25T09:44:17.5984285+08:00;True|2024-06-25T09:40:23.4977167+08:00;True|2024-06-25T09:37:55.3516214+08:00;True|2024-06-25T09:34:57.0498926+08:00;True|2024-06-24T23:22:12.1756387+08:00;True|2024-06-24T23:15:13.9995277+08:00;True|2024-06-24T23:05:20.8658324+08:00;True|2024-06-24T22:59:59.2842726+08:00;True|2024-06-24T16:29:08.9135923+08:00;True|2024-06-24T15:44:19.8100242+08:00;True|2024-06-18T16:08:52.3066991+08:00;True|2024-06-18T14:08:42.6969999+08:00;True|2024-06-17T13:22:25.8401219+08:00;True|2024-06-17T11:27:09.9223091+08:00;True|2024-06-17T11:23:37.5133763+08:00;True|2024-06-17T10:58:43.2727797+08:00;True|2024-06-14T13:32:57.5800980+08:00;False|2024-06-13T10:45:10.1375417+08:00;False|2024-06-13T10:43:52.8804222+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>06/24/2024 23:05:01</publishTime>
+ <publishTime>06/25/2024 09:53:25</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>06/24/2024 23:05:01</publishTime>
+ <publishTime>06/25/2024 09:53:25</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>06/24/2024 23:05:00</publishTime>
+ <publishTime>06/25/2024 09:53:24</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>06/24/2024 23:05:00</publishTime>
+ <publishTime>06/25/2024 09:53:24</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>06/24/2024 23:04:57</publishTime>
+ <publishTime>06/25/2024 09:53:21</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>06/24/2024 23:04:57</publishTime>
+ <publishTime>06/25/2024 09:53:21</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,16 +111,16 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>06/24/2024 23:04:57</publishTime>
+ <publishTime>06/25/2024 09:53:22</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>06/24/2024 23:04:57</publishTime>
+ <publishTime>06/25/2024 09:53:22</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
- <publishTime>03/08/2023 15:09:56</publishTime>
+ <publishTime>09/07/2014 18:39:38</publishTime>
</File>
<File Include="bin/NPOI.dll">
<publishTime>10/23/2021 09:07:54</publishTime>
@@ -147,25 +147,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>06/24/2024 23:04:54</publishTime>
+ <publishTime>06/25/2024 09:53:20</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>06/24/2024 23:04:54</publishTime>
+ <publishTime>06/25/2024 09:53:20</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>06/24/2024 23:04:55</publishTime>
+ <publishTime>06/25/2024 09:53:21</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>06/24/2024 23:04:55</publishTime>
+ <publishTime>06/25/2024 09:53:21</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>06/24/2024 23:04:56</publishTime>
+ <publishTime>06/25/2024 09:53:21</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>06/24/2024 23:04:56</publishTime>
+ <publishTime>06/25/2024 09:53:21</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -282,10 +282,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/24/2024 23:05:09</publishTime>
+ <publishTime>06/25/2024 09:53:30</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/24/2024 23:05:09</publishTime>
+ <publishTime>06/25/2024 09:53:30</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -372,7 +372,7 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="packages.config">
- <publishTime>06/20/2024 15:27:38</publishTime>
+ <publishTime>06/25/2024 09:50:21</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
<publishTime>05/25/2024 09:46:41</publishTime>
@@ -480,7 +480,7 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/24/2024 23:05:19</publishTime>
+ <publishTime>06/25/2024 09:53:35</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 467285a..6ef8bf3 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -8,10 +8,10 @@
- <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
- </sectionGroup>
- </configSections>
+ <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+ </sectionGroup>
+ </configSections>
<connectionStrings>
<add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />
@@ -22,7 +22,7 @@
<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
<!--<add key="FileIP" value="http://localhost:8080/" />-->
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
- <add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/> <!--棰滃彴寮忔満-->
+ <!--<add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
@@ -32,13 +32,17 @@
<!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS/WebService1.asmx"/> 瀹夌憺鏈嶅姟鍣�-->
<!--<add key="sUrl" value="http://122.227.133.186:8090/WEBS/WebService1.asmx"/> -->
<!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS-WMS/WebService1.asmx"/> 瀹夌憺鏈嶅姟鍣�-->
- <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--娴嬭瘯鏈嶅姟鍣�-->
+ <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> -->
+ <!--娴嬭瘯鏈嶅姟鍣�-->
<!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> 鏈湴-->
- <!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
- <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>--> <!--缈佹稕娑涙湰鍦伴厤缃�-->
+ <!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>-->
+ <!--闄堥洴闈欐湰鍦伴厤缃�-->
+ <add key="surl" value="http://localhost/webs-web/webservice1.asmx" />
+ <!--缈佹稕娑涙湰鍦伴厤缃�-->
<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
- <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�-->
-
+ <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>-->
+ <!--鏂帿灏�-->
+
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
@@ -67,7 +71,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+ <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -88,8 +92,8 @@
<dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
- </dependentAssembly>
- </assemblyBinding>
+ </dependentAssembly>
+ </assemblyBinding>
</runtime>
<system.webServer>
<handlers>
@@ -106,17 +110,15 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://192.168.0.81/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
- bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
- name="WebService1Soap" />
+ <endpoint address="http://192.168.0.81/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
</client>
</system.serviceModel>
- <applicationSettings>
- <WebAPI.Properties.Settings>
- <setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://192.168.0.81/WEBS-WMS/WebService1.asmx</value>
- </setting>
- </WebAPI.Properties.Settings>
- </applicationSettings>
+ <applicationSettings>
+ <WebAPI.Properties.Settings>
+ <setting name="WebAPI_WebS_WebService1" serializeAs="String">
+ <value>http://192.168.0.81/WEBS-WMS/WebService1.asmx</value>
+ </setting>
+ </WebAPI.Properties.Settings>
+ </applicationSettings>
</configuration>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index db40d1b..252ace7 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -46,30 +46,6 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="AlibabaCloud.EndpointUtil, Version=0.1.1.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\AlibabaCloud.EndpointUtil.0.1.1\lib\net45\AlibabaCloud.EndpointUtil.dll</HintPath>
- </Reference>
- <Reference Include="AlibabaCloud.GatewayDingTalk, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\AlibabaCloud.GatewayDingTalk.1.0.2\lib\net45\AlibabaCloud.GatewayDingTalk.dll</HintPath>
- </Reference>
- <Reference Include="AlibabaCloud.GatewaySpi, Version=0.0.1.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\AlibabaCloud.GatewaySpi.0.0.2\lib\net45\AlibabaCloud.GatewaySpi.dll</HintPath>
- </Reference>
- <Reference Include="AlibabaCloud.OpenApiClient, Version=0.1.8.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\AlibabaCloud.OpenApiClient.0.1.9\lib\net45\AlibabaCloud.OpenApiClient.dll</HintPath>
- </Reference>
- <Reference Include="AlibabaCloud.OpenApiUtil, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\AlibabaCloud.OpenApiUtil.1.1.1\lib\net45\AlibabaCloud.OpenApiUtil.dll</HintPath>
- </Reference>
- <Reference Include="AlibabaCloud.SDK.Dingtalk, Version=0.0.1.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\AlibabaCloud.SDK.Dingtalk.2.1.24\lib\net45\AlibabaCloud.SDK.Dingtalk.dll</HintPath>
- </Reference>
- <Reference Include="AlibabaCloud.TeaUtil, Version=0.1.14.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\AlibabaCloud.TeaUtil.0.1.18\lib\net45\AlibabaCloud.TeaUtil.dll</HintPath>
- </Reference>
- <Reference Include="AlibabaCloud.TeaXML, Version=0.0.5.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\AlibabaCloud.TeaXML.0.0.5\lib\net45\AlibabaCloud.TeaXML.dll</HintPath>
- </Reference>
<Reference Include="Aliyun.Credentials, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Aliyun.Credentials.1.3.2\lib\net45\Aliyun.Credentials.dll</HintPath>
</Reference>
@@ -107,8 +83,8 @@
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.dll</HintPath>
@@ -246,9 +222,6 @@
</Reference>
<Reference Include="System.Xml.Linq">
<Private>True</Private>
- </Reference>
- <Reference Include="Tea, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Tea.1.1.2\lib\net45\Tea.dll</HintPath>
</Reference>
<Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
<HintPath>..\packages\WebActivatorEx.2.0.6\lib\net40\WebActivatorEx.dll</HintPath>
diff --git a/WebAPI/packages.config b/WebAPI/packages.config
index c8f6613..c07c445 100644
--- a/WebAPI/packages.config
+++ b/WebAPI/packages.config
@@ -1,14 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="AlibabaCloud.EndpointUtil" version="0.1.1" targetFramework="net45" />
- <package id="AlibabaCloud.GatewayDingTalk" version="1.0.2" targetFramework="net45" />
- <package id="AlibabaCloud.GatewaySpi" version="0.0.2" targetFramework="net45" />
- <package id="AlibabaCloud.OpenApiClient" version="0.1.9" targetFramework="net45" />
- <package id="AlibabaCloud.OpenApiUtil" version="1.1.1" targetFramework="net45" />
- <package id="AlibabaCloud.SDK.Dingtalk" version="2.1.24" targetFramework="net45" />
- <package id="AlibabaCloud.TeaUtil" version="0.1.18" targetFramework="net45" />
- <package id="AlibabaCloud.TeaXML" version="0.0.5" targetFramework="net45" />
- <package id="Aliyun.Credentials" version="1.3.2" targetFramework="net45" />
<package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
<package id="bootstrap" version="3.0.0" targetFramework="net45" />
<package id="Dapper" version="1.50.2" targetFramework="net45" />
@@ -30,13 +21,10 @@
<package id="Microsoft.AspNet.WebApi.WebHost.zh-Hans" version="5.2.3" targetFramework="net45" />
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
<package id="Microsoft.Azure.AppService.ApiApps.Service" version="0.9.16" targetFramework="net45" />
- <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
- <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.3" targetFramework="net45" />
- <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Modernizr" version="2.6.2" targetFramework="net45" />
- <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="NPOI" version="2.5.5" targetFramework="net45" />
<package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net45" />
<package id="RestSharp" version="104.0" targetFramework="net45" />
@@ -47,7 +35,6 @@
<package id="System.IdentityModel.Tokens.Jwt" version="4.0.0" targetFramework="net45" />
<package id="System.Memory" version="4.5.3" targetFramework="net45" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net45" />
- <package id="Tea" version="1.1.2" targetFramework="net45" />
<package id="WebActivatorEx" version="2.0.6" targetFramework="net45" />
<package id="WebGrease" version="1.5.2" targetFramework="net45" />
</packages>
\ No newline at end of file
--
Gitblit v1.9.1