From 1cf37e52dcefd6bbf567818b50e16f36c7fae84c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 30 六月 2022 08:42:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Web.config | 53 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 04bdfa1..825d970 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -5,11 +5,27 @@
-->
<configuration>
<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" />
+
+ </connectionStrings>
+
<appSettings>
+ <!--鏈嶅姟鍣ㄦ枃浠禝P鍦板潃-->
+ <!--<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.63.195/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満-->
+ <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
+ <add key="sUrl" value="http://192.168.10.66/WEBS-WMS/WebService1.asmx" />
+ <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
+ <!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/> 鐟炰笌绁�-->
+ <!--<add key="sUrl" value="http://192.168.10.66/WEBS-WMS/WebService1.asmx"/> 妫シ-->
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
@@ -28,27 +44,20 @@
<httpRuntime />
<pages controlRenderingCompatibilityVersion="4.0" />
</system.web>
- <system.webServer>
- <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>
- </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.0.0.0" newVersion="5.0.0.0" />
+ <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-4.5.0.0" newVersion="4.5.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" />
- <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
@@ -68,10 +77,30 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
+<system.webServer>
+ <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>
+ </system.webServer>
+ <system.serviceModel>
+ <bindings>
+ <basicHttpBinding>
+ <binding name="WebService1Soap" />
+ </basicHttpBinding>
+ </bindings>
+ <client>
+ <endpoint address="http://localhost:8098/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://124.70.129.242/WEBS-WMS/WebService1.asmx</value>
+ <value>http://192.168.10.66/WEBS-WMS/WebService1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
--
Gitblit v1.9.1