Merge branch 'master' of http://gitlab.oytour.com/liudong1993/huatu_api

REBORN.HuaTuQuartClient/App.config

@@ -53,7 +53,7 @@
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-8.0.14.0" newVersion="8.0.14.0" />
+				<bindingRedirect oldVersion="0.0.0.0-6.9.12.0" newVersion="6.9.12.0" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -109,4 +109,9 @@
 			</providers>
 		</roleManager>
 	</system.web>
-</configuration>
\ No newline at end of file
+<system.data>
+    <DbProviderFactories>
+      <remove invariant="MySql.Data.MySqlClient" />
+      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
+    </DbProviderFactories>
+  </system.data></configuration>
\ No newline at end of file

REBORN.HuaTuQuartClient/REBORN.HuaTuQuartClient.csproj

@@ -36,6 +36,9 @@
     <Reference Include="log4net, Version=2.0.9.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.10\lib\net45\log4net.dll</HintPath>
     </Reference>
+    <Reference Include="MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.6.9.12\lib\net45\MySql.Data.dll</HintPath>
+    </Reference>
     <Reference Include="SuperSocket.Common, Version=1.6.6.1, Culture=neutral, PublicKeyToken=6c80000676988ebb, processorArchitecture=MSIL">
       <HintPath>..\packages\SuperSocket.1.6.6.1\lib\net45\SuperSocket.Common.dll</HintPath>
     </Reference>

REBORN.HuaTuQuartClient/packages.config

 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="2.0.10" targetFramework="net461" />
+  <package id="MySql.Data" version="6.9.12" targetFramework="net461" />
   <package id="SuperSocket" version="1.6.6.1" targetFramework="net461" />
   <package id="SuperSocket.Engine" version="1.6.6.1" targetFramework="net461" />
 </packages>
\ No newline at end of file