From 4853fbcb5234c448c2df71713a9105d799e4a551 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 18 十一月 2022 17:32:47 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Web.config | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 06a4d3d..96a0b9a 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -6,9 +6,11 @@
<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>
+
+
+ <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" />
@@ -20,10 +22,14 @@
<!--<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://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://47.96.97.237:8018/Web_WJ/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"/> 鍗氭棩绉戞妧-->
+ <!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/> 鐟炰笌绁�-->
+ <!--<add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx"/> 妫シ-->
+ <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> 鍏徃浜戞湇鍔″櫒-->
+ <add key="sUrl" value="http://192.168.80.90:9090/WEBS/WebService1.asmx" />
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
@@ -83,11 +89,24 @@
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
</handlers>
</system.webServer>
- <applicationSettings>
- <WebAPI.Properties.Settings>
- <setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://localhost:8098/WebService1.asmx</value>
- </setting>
- </WebAPI.Properties.Settings>
- </applicationSettings>
+ <system.serviceModel>
+ <bindings>
+ <basicHttpBinding>
+ <binding name="WebService1Soap" />
+ </basicHttpBinding>
+ </bindings>
+ <client>
+ <endpoint address="http://192.168.63.195/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.63.195/WEBS-WMS/WebService1.asmx</value>
+ </setting>
+ </WebAPI.Properties.Settings>
+ </applicationSettings>
</configuration>
\ No newline at end of file
--
Gitblit v1.9.1