替换mysql驱动

NoneDay · Mar 12, 2024 · 188dd1f · 188dd1f
1 parent b522670
commit 188dd1f
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 13 deletions.
diff --git a/end/CellReport.dll b/end/CellReport.dll
diff --git a/end/reportWeb/DataProtection/key-f9147c03-3828-4803-9f71-1383ac5e774d.xml b/end/reportWeb/DataProtection/key-f9147c03-3828-4803-9f71-1383ac5e774d.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<key id="f9147c03-3828-4803-9f71-1383ac5e774d" version="1">
+  <creationDate>2024-03-12T09:10:31.4312729Z</creationDate>
+  <activationDate>2024-03-14T02:49:33.0991008Z</activationDate>
+  <expirationDate>2024-06-10T09:10:31.3615379Z</expirationDate>
+  <descriptor deserializerType="Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
+    <descriptor>
+      <encryption algorithm="AES_256_CBC" />
+      <validation algorithm="HMACSHA256" />
+      <masterKey p4:requiresEncryption="true" xmlns:p4="http://schemas.asp.net/2015/03/dataProtection">
+        <!-- Warning: the key below is in an unencrypted form. -->
+        <value>Ak7diT5vp7Kp4yWcz3ysA4np8VxB68q/6ATOBffGat+sEX0OD34d1vYVBtoTnrWF3mol3WHf1QsRwKlwcXk27Q==</value>
+      </masterKey>
+    </descriptor>
+  </descriptor>
+</key>
diff --git a/end/reportWeb/appsettings.Development.json b/end/reportWeb/appsettings.Development.json
@@ -42,20 +42,20 @@
       "dllName": "Microsoft.Data.SqlClient",
       "FactoryClass": "Microsoft.Data.SqlClient.SqlClientFactory",
       "InstanceName": "Instance"
+    },
+
+    {
+      "name": "MySql",
+      "dllName": "MySqlConnector",
+      "FactoryClass": "MySqlConnector.MySqlConnectorFactory",
+      "InstanceName": "Instance"
     } /*,
         {
             "name": "Npgsql",
             "dllName": "Npgsql",
             "FactoryClass": "Npgsql.NpgsqlFactory",
             "InstanceName": "Instance"
-        },
-
-        {
-            "name": "MySql",
-            "dllName": "MySql.Data",
-            "FactoryClass": "MySql.Data.MySqlClient.MySqlClientFactory",
-            "InstanceName": "Instance"
-        },
+        }
         {
             "name": "odbc",
             "dllName": "System.Data.Odbc",

diff --git a/end/reportWeb/appsettings.json b/end/reportWeb/appsettings.json
@@ -64,8 +64,8 @@
 
     {
       "name": "MySql",
-      "dllName": "MySql.Data",
-      "FactoryClass": "MySql.Data.MySqlClient.MySqlClientFactory",
+      "dllName": "MySqlConnector",
+      "FactoryClass": "MySqlConnector.MySqlConnectorFactory",
       "InstanceName": "Instance",
       "link_str": "Database=dbname;Data Source=x.x.x.x;Port=3306;User Id=xxx;Password=****;Charset=utf8;TreatTinyAsBoolean=false;"
     },

diff --git a/end/reportWeb/reportWeb.csproj b/end/reportWeb/reportWeb.csproj
@@ -36,9 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
-    <PackageReference Include="MySql.Data" Version="8.0.30">
-      <TreatAsUsed>true</TreatAsUsed>
-    </PackageReference>
+    <PackageReference Include="MySqlConnector" Version="2.3.5" />
     <PackageReference Include="Npgsql" Version="6.0.0">
       <TreatAsUsed>true</TreatAsUsed>
     </PackageReference>

diff --git a/end/reportWeb/template.xml b/end/reportWeb/template.xml
@@ -32,6 +32,10 @@
 	<sql_max_rows>500000</sql_max_rows>
 	<before_exec_script>
 		<![CDATA[
+		var db22=kata({
+          db_link:"Data Source=10.20.154.39;Initial Catalog=clic_hn_portal;Persist Security Info=True;User ID=lzm;Password=lhbwyt;Min Pool Size=1;Max Pool Size=100;Connect Timeout=15000;Application Name=报表连接",	
+          ds_type:"SqlClient"
+        });
 function download_img(url){
     try{
         var result= web_request({'url':url,'raw':true}) ;