From 483056c686940a52591a120b93b9789472df1aeb Mon Sep 17 00:00:00 2001 From: zqlovejyc <943620963@qq.com> Date: Wed, 14 Apr 2021 10:22:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=832.1.1=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SQLBuilder/Diagnostics/DiagnosticsMessage.cs | 11 +++++++++++ SQLBuilder/Properties/AssemblyInfo.cs | 4 ++-- SQLBuilder/Repositories/BaseRepository.cs | 3 ++- SQLBuilder/SQLBuilder.csproj | 4 ++-- SQLBuilder/app.config | 2 +- SQLBuilder/packages.config | 4 ++-- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/SQLBuilder/Diagnostics/DiagnosticsMessage.cs b/SQLBuilder/Diagnostics/DiagnosticsMessage.cs index c2bbbea..28c666b 100644 --- a/SQLBuilder/Diagnostics/DiagnosticsMessage.cs +++ b/SQLBuilder/Diagnostics/DiagnosticsMessage.cs @@ -16,6 +16,7 @@ */ #endregion +using SQLBuilder.Enums; using System; namespace SQLBuilder.Diagnostics @@ -35,6 +36,11 @@ public class DiagnosticsMessage /// public string Operation { get; set; } + /// + /// 操作id + /// + public string OperationId { get; set; } = Guid.NewGuid().ToString(); + /// /// sql语句 /// @@ -45,6 +51,11 @@ public class DiagnosticsMessage /// public object Parameters { get; set; } + /// + /// 数据库类型 + /// + public DatabaseType DatabaseType { get; set; } + /// /// 数据库数据源 /// diff --git a/SQLBuilder/Properties/AssemblyInfo.cs b/SQLBuilder/Properties/AssemblyInfo.cs index 9328e53..97c0c1c 100644 --- a/SQLBuilder/Properties/AssemblyInfo.cs +++ b/SQLBuilder/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 //通过使用 "*",如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.0.0")] -[assembly: AssemblyFileVersion("2.1.0.0")] +[assembly: AssemblyVersion("2.1.1.0")] +[assembly: AssemblyFileVersion("2.1.1.0")] diff --git a/SQLBuilder/Repositories/BaseRepository.cs b/SQLBuilder/Repositories/BaseRepository.cs index e853404..e874dd9 100644 --- a/SQLBuilder/Repositories/BaseRepository.cs +++ b/SQLBuilder/Repositories/BaseRepository.cs @@ -3652,7 +3652,8 @@ public DiagnosticsMessage ExecuteBefore(string sql, object parameter, string dat Parameters = parameter, DataSource = dataSource, Timestamp = (long)(DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalMilliseconds, - Operation = DiagnosticStrings.BeforeExecute + Operation = DiagnosticStrings.BeforeExecute, + DatabaseType = DatabaseType }; _diagnosticListener.Write(DiagnosticStrings.BeforeExecute, message); diff --git a/SQLBuilder/SQLBuilder.csproj b/SQLBuilder/SQLBuilder.csproj index a4785a5..e7d6785 100644 --- a/SQLBuilder/SQLBuilder.csproj +++ b/SQLBuilder/SQLBuilder.csproj @@ -44,13 +44,13 @@ ..\packages\Dapper.1.50.2\lib\net45\Dapper.dll - ..\packages\MySqlConnector.1.3.0\lib\net45\MySqlConnector.dll + ..\packages\MySqlConnector.1.3.3\lib\net45\MySqlConnector.dll ..\packages\Npgsql.4.0.11\lib\net45\Npgsql.dll - ..\packages\Oracle.ManagedDataAccess.19.10.1\lib\net40\Oracle.ManagedDataAccess.dll + ..\packages\Oracle.ManagedDataAccess.19.11.0\lib\net40\Oracle.ManagedDataAccess.dll diff --git a/SQLBuilder/app.config b/SQLBuilder/app.config index b9823cc..5d71e8f 100644 --- a/SQLBuilder/app.config +++ b/SQLBuilder/app.config @@ -2,7 +2,7 @@
- + diff --git a/SQLBuilder/packages.config b/SQLBuilder/packages.config index 1c2204d..a1b2d41 100644 --- a/SQLBuilder/packages.config +++ b/SQLBuilder/packages.config @@ -1,9 +1,9 @@  - + - +