From c81eef52f7c2099ba0bbf8e6f32d0dcfc87c91a4 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期四, 06 一月 2022 08:38:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Web.config | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 9febd30..87afe64 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -5,17 +5,23 @@
-->
<configuration>
<configSections>
- <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+
+ <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_Test;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />-->
- <add name="YqnConn" connectionString="Data Source=.;Initial Catalog=HX_LimsSys_Test;Integrated Security=True" />
+ <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://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
@@ -67,13 +73,6 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
- <applicationSettings>
- <WebAPI.Properties.Settings>
- <setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://124.70.129.242/WEBS-WMS/WebService1.asmx</value>
- </setting>
- </WebAPI.Properties.Settings>
- </applicationSettings>
<system.webServer>
<handlers>
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
@@ -81,4 +80,12 @@
<remove name="TRACEVerbHandler" />
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
</handlers>
- </system.webServer></configuration>
\ No newline at end of file
+ </system.webServer>
+ <applicationSettings>
+ <WebAPI.Properties.Settings>
+ <setting name="WebAPI_WebS_WebService1" serializeAs="String">
+ <value>http://localhost/WEBS-WMSTest/WebService1.asmx</value>
+ </setting>
+ </WebAPI.Properties.Settings>
+ </applicationSettings>
+</configuration>
\ No newline at end of file
--
Gitblit v1.9.1