From 291fdb29daf239a13fcfb3f5e08a2f5bf9167534 Mon Sep 17 00:00:00 2001
From: chenhaozhe <gaozhechen26@gmail.com>
Date: 星期六, 07 三月 2026 17:37:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
NETERPNoWin/bin/x86/Debug/WebAPI.dll.config | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/NETERPNoWin/bin/x86/Debug/WebAPI.dll.config b/NETERPNoWin/bin/x86/Debug/WebAPI.dll.config
index 965144f..00d4d78 100644
--- a/NETERPNoWin/bin/x86/Debug/WebAPI.dll.config
+++ b/NETERPNoWin/bin/x86/Debug/WebAPI.dll.config
@@ -30,11 +30,11 @@
<!--<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://localhost:8082/webs/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://localhost/WEBS-WMS/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"/>-->
@@ -42,11 +42,13 @@
<!--<add key="surl" value="http://192.168.0.113/WEBS-WMS/Webservice1.asmx" />涓夊崌鏈湴閰嶇疆-->
<!--<add key="surl" value="http://36.134.2.30:200/WEBS-WMS/WebService1.asmx" />-->
<!--閲戝竻-->
- <add key="sUrl" value="http://localhost:8082/WEBS/WebService1.asmx" />
+ <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" />
<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" />
+ <add key="owin:AutomaticAppStartup" value="false" />
+ <add key="owin:appStartup" value="" />
</appSettings>
<!--
鏈夊叧 web.config 鏇存敼鐨勮鏄庯紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkId=235367銆�
@@ -100,6 +102,14 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
<system.webServer>
@@ -117,13 +127,13 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://localhost:8082/WEBS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
+ <endpoint address="http://47.96.97.237/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://localhost:8082/WEBS/WebService1.asmx</value>
+ <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
--
Gitblit v1.9.1