Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

wtt

昨天 2fd658134344c18e9f2a2eb2c2099d0b0edf205a

 WebAPI/Web.config

@@ -35,12 +35,12 @@
      <!--<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-WMS/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"/>--><!--斯莫尔-->
      <!--<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://47.96.97.237/WEBS-WMS/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" />
@@ -109,6 +109,10 @@
            <assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
            <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
         </dependentAssembly>
         <dependentAssembly>
            <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
            <bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
         </dependentAssembly>
      </assemblyBinding>
   </runtime>
   <system.webServer>
@@ -126,13 +130,13 @@
         </basicHttpBinding>
      </bindings>
      <client>
         <endpoint address="http://localhost/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://localhost/WEBS-WMS/webservice1.asmx</value>
    <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
   </setting>
  </WebAPI.Properties.Settings>
 </applicationSettings>