From e496c6d1d7d86b14613a2da56405831bfec57b5a Mon Sep 17 00:00:00 2001 From: "guoshun.du" Date: Tue, 14 Jan 2025 10:44:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?GetReaderByToken=20=E4=BC=A0=E5=85=A5=20can?= =?UTF-8?q?cellationToken=EF=BC=8C=E6=94=AF=E6=8C=81=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E4=BF=A1=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SqlBuilderProvider/SqlBuilderProvider.cs | 2 +- .../Properties/PublishProfiles/FolderProfile.pubxml | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 Src/Asp.NetCore2/SqlSugar/Properties/PublishProfiles/FolderProfile.pubxml diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs index 96b007d8e..02a2ceee4 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs @@ -35,7 +35,7 @@ namespace SqlSugar public virtual Task GetReaderByToken(IDataReader dataReader, CancellationToken cancellationToken) { - return ((DbDataReader)dataReader).ReadAsync(); + return ((DbDataReader)dataReader).ReadAsync(cancellationToken); } public virtual void ChangeJsonType(SugarParameter paramter) { diff --git a/Src/Asp.NetCore2/SqlSugar/Properties/PublishProfiles/FolderProfile.pubxml b/Src/Asp.NetCore2/SqlSugar/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 000000000..fa8f678a0 --- /dev/null +++ b/Src/Asp.NetCore2/SqlSugar/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,13 @@ + + + + + Release + Any CPU + C:\Users\Administrator\Desktop\编译打包 + FileSystem + <_TargetId>Folder + + \ No newline at end of file -- Gitee From afaaca21d7d264d32f039f19e32e55bd390c070c Mon Sep 17 00:00:00 2001 From: "guoshun.du" Date: Tue, 14 Jan 2025 15:12:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?GetReaderByToken=20=E4=BC=A0=E5=85=A5=20can?= =?UTF-8?q?cellationToken=EF=BC=8C=E6=94=AF=E6=8C=81=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E4=BF=A1=E5=8F=B7,SupportReadToken=E8=AE=BE=E7=BD=AE=E4=B8=BAT?= =?UTF-8?q?rue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs index 02a2ceee4..779877e99 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs @@ -31,7 +31,7 @@ namespace SqlSugar #region abstract Methods - public virtual bool SupportReadToken { get; set; } + public virtual bool SupportReadToken { get; set; } = true; public virtual Task GetReaderByToken(IDataReader dataReader, CancellationToken cancellationToken) { -- Gitee