Merge branch 'master' of http://s.dev01.dkiboss.com:9001/DK-MES-2.0/HEGII.ss.mes.dashboard

wwwroot/Web.config

@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   有关如何配置 ASP.NET 应用程序的详细信息，请访问
   https://go.microsoft.com/fwlink/?LinkId=169433
@@ -6,20 +6,20 @@
 <configuration>
   <connectionStrings>
     <!--三水测试服务器-->
-    <add name="ConnectionString" connectionString="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=172.18.32.112)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=dkmes)));User Id=hgiboss;Password=dongke" providerName="Oracle.ManagedDataAccess.Client"/>
+    <add name="ConnectionString" connectionString="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=172.18.32.116)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=dkmes)));User Id=hgiboss;Password=dongke" providerName="Oracle.ManagedDataAccess.Client" />
     <!--东科服务器-->
     <!--<add name="ConnectionString" connectionString="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=hegii.dongkesoft.cn)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=hegiimes)));User Id=hegiimes;Password=dongke" providerName="Oracle.ManagedDataAccess.Client"/>-->
   </connectionStrings>
   <appSettings>
-    <add key="ProductCheckServer" value="http://172.18.32.32:5678"/>
+    <add key="ProductCheckServer" value="http://172.18.32.32:5678" />
 	  <!--乾润服务器-->
-	  <add key="QianRunServer" value="http://172.18.30.70:8080"/>
+	  <add key="QianRunServer" value="http://172.18.30.70:8080" />
   </appSettings>
   <system.web>
-    <customErrors mode="Off"/>
-    <compilation targetFramework="4.0" debug="true"/>
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" validateRequest="false"/>
-    <httpRuntime/>
+    <customErrors mode="Off" />
+    <compilation targetFramework="4.0" debug="true" />
+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" validateRequest="false" />
+    <httpRuntime />
     <!--<sessionState mode="StateServer" stateConnectionString="tcpip=127.0.0.1:42424" cookieless="false" timeout="20"/>-->
   </system.web>
   <system.data>
@@ -29,14 +29,19 @@
     </DbProviderFactories>
     -->
     <DbProviderFactories>
-      <remove invariant="Oracle.ManagedDataAccess.Client"/>
-      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+      <remove invariant="Oracle.ManagedDataAccess.Client" />
+      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
     </DbProviderFactories>
   </system.data>
   <system.webServer>
     <staticContent>
-      <mimeMap fileExtension=".apk" mimeType="application/vnd.android.package-archive"/>
+      <mimeMap fileExtension=".apk" mimeType="application/vnd.android.package-archive" />
       <!--<mimeMap fileExtension=".mp4" mimeType="application/mp4" />-->
     </staticContent>
+        <httpProtocol>
+            <customHeaders>
+                <add name="Access-Control-Allow-Origin" value="*" />
+            </customHeaders>
+        </httpProtocol>
   </system.webServer>
 </configuration>