From 579d2b489f9565f6e506ddbef634d65aa20dc27e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 12 六月 2025 14:03:28 +0800
Subject: [PATCH] 解决合并冲突
---
WebAPI/Web.config | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 02e03fe..a1c3845 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -32,10 +32,10 @@
<!--<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://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://192.168.0.113/WEBS-WMS/Webservice1.asmx" />涓夊崌鏈湴閰嶇疆-->
@@ -107,13 +107,13 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://192.168.0.113/WEBS-WMS/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://192.168.0.113/WEBS-WMS/Webservice1.asmx</value>
+ <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
--
Gitblit v1.9.1