diff --git a/end/CellReport.dll b/end/CellReport.dll index d9b6fca..6e58b18 100644 Binary files a/end/CellReport.dll and b/end/CellReport.dll differ diff --git a/end/reportWeb/DataProtection/key-f9147c03-3828-4803-9f71-1383ac5e774d.xml b/end/reportWeb/DataProtection/key-f9147c03-3828-4803-9f71-1383ac5e774d.xml new file mode 100644 index 0000000..03bca7c --- /dev/null +++ b/end/reportWeb/DataProtection/key-f9147c03-3828-4803-9f71-1383ac5e774d.xml @@ -0,0 +1,16 @@ + + + 2024-03-12T09:10:31.4312729Z + 2024-03-14T02:49:33.0991008Z + 2024-06-10T09:10:31.3615379Z + + + + + + + Ak7diT5vp7Kp4yWcz3ysA4np8VxB68q/6ATOBffGat+sEX0OD34d1vYVBtoTnrWF3mol3WHf1QsRwKlwcXk27Q== + + + + \ No newline at end of file diff --git a/end/reportWeb/appsettings.Development.json b/end/reportWeb/appsettings.Development.json index 5f6f77c..2a6ffe2 100644 --- 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 index 5c7ab8a..1fd79fb 100644 --- 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 index da83836..a258c81 100644 --- a/end/reportWeb/reportWeb.csproj +++ b/end/reportWeb/reportWeb.csproj @@ -36,9 +36,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - true - + true diff --git a/end/reportWeb/template.xml b/end/reportWeb/template.xml index 2a7d5ae..11b204d 100644 --- a/end/reportWeb/template.xml +++ b/end/reportWeb/template.xml @@ -32,6 +32,10 @@ 500000