From 5241094f1d03bb92ed106273175500ee76eec47a Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@users.noreply.github.com>
Date: Sat, 14 Sep 2024 09:13:14 +0800
Subject: [PATCH 01/16] Update sharding.md

---
 docs/guide/sharding.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/guide/sharding.md b/docs/guide/sharding.md
index 981b5b3fb..5cf78b36a 100644
--- a/docs/guide/sharding.md
+++ b/docs/guide/sharding.md
@@ -202,9 +202,11 @@ fsql.Delete<T>();
 
 ```csharp
 fsql.Change(DbEnum.db2).Select<T>();
+//仅支持 net461+、netcore
 //同一线程，或异步await 后续 fsql.Select/Insert/Update/Delete 操作是 db2
 
 fsql.Use(DbEnum.db2).Select<T>();
+//支持 net40
 //单次有效
 
 using (fsql.Change(DbEnum.db2)) {

From 4d756f54a0d161ca000b56e4cee810e4c7c2bf76 Mon Sep 17 00:00:00 2001
From: nsnail <taokeu@gmail.com>
Date: Fri, 20 Sep 2024 13:54:11 +0800
Subject: [PATCH 02/16] Update awesome-freesql.md

---
 docs/reference/awesome-freesql.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/reference/awesome-freesql.md b/docs/reference/awesome-freesql.md
index 8d6d8c431..75e8eea47 100644
--- a/docs/reference/awesome-freesql.md
+++ b/docs/reference/awesome-freesql.md
@@ -4,6 +4,18 @@
 
 <div class="flex">
 
+<VPBanner
+    title="NetAdmin"
+    content="通用后台权限管理系统、快速开发框架（基于C#12/.NET9、Vue3/Vite、Element Plus等现代技术构建，具有十分整洁、优雅的编码规范）"
+    :actions='[
+        {
+            text: "仓库",
+            link:"https://github.com/nsnail/NetAdmin",
+            type: "primary",
+        },
+    ]'
+/>
+
 <VPBanner
     title="中台Admin"
     content="Admin后端，前后端分离的权限管理系统。支持多租户、动态Api、任务调度、滑块拼图验证、国内外主流数据库自由切换和动态高级查询。基于.Net跨平台开发的WebApi。集成统一认证授权、数据验证、缓存、Ip限流、全Api鉴权、集成测试、性能分析、接口文档等。"

From d6a6a6e3f8ff7c6e1937627fa28b267320419c71 Mon Sep 17 00:00:00 2001
From: nsnail <taokeu@gmail.com>
Date: Fri, 20 Sep 2024 16:32:49 +0800
Subject: [PATCH 03/16] Update awesome-freesql.md

---
 docs/reference/awesome-freesql.md | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/docs/reference/awesome-freesql.md b/docs/reference/awesome-freesql.md
index 75e8eea47..435ad75cb 100644
--- a/docs/reference/awesome-freesql.md
+++ b/docs/reference/awesome-freesql.md
@@ -4,18 +4,6 @@
 
 <div class="flex">
 
-<VPBanner
-    title="NetAdmin"
-    content="通用后台权限管理系统、快速开发框架（基于C#12/.NET9、Vue3/Vite、Element Plus等现代技术构建，具有十分整洁、优雅的编码规范）"
-    :actions='[
-        {
-            text: "仓库",
-            link:"https://github.com/nsnail/NetAdmin",
-            type: "primary",
-        },
-    ]'
-/>
-
 <VPBanner
     title="中台Admin"
     content="Admin后端，前后端分离的权限管理系统。支持多租户、动态Api、任务调度、滑块拼图验证、国内外主流数据库自由切换和动态高级查询。基于.Net跨平台开发的WebApi。集成统一认证授权、数据验证、缓存、Ip限流、全Api鉴权、集成测试、性能分析、接口文档等。"
@@ -141,7 +129,17 @@
     ]'
 />
 
-
+<VPBanner
+    title="NetAdmin"
+    content="通用后台权限管理系统、快速开发框架（基于C#12/.NET9、Vue3/Vite、Element Plus等现代技术构建，具有十分整洁、优雅的编码规范）"
+    :actions='[
+        {
+            text: "仓库",
+            link:"https://github.com/nsnail/NetAdmin",
+            type: "primary",
+        },
+    ]'
+/>
 </div>
 
 <style>

From 4dd920426733c8bcf4e3afcb8edb060ddef4714b Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@users.noreply.github.com>
Date: Tue, 24 Sep 2024 22:02:47 +0800
Subject: [PATCH 04/16] Update type-mapping.md

---
 docs/guide/type-mapping.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/guide/type-mapping.md b/docs/guide/type-mapping.md
index ec9369c43..5c3533872 100644
--- a/docs/guide/type-mapping.md
+++ b/docs/guide/type-mapping.md
@@ -108,19 +108,19 @@ class JsonPocoTypeHandler : TypeHandler<JsonPoco>
 {
     public override object Serialize(JsonPoco value) => JsonConvert.SerializeObject(value);
     public override JsonPoco Deserialize(object value) => JsonConvert.DeserializeObject<JsonPoco>((string)value);
-    public override void FluentApi(FluentColumn col) => col.MapType(typeof(string)).StringLength(-1);
+    public override void FluentApi(ColumnFluent col) => col.MapType(typeof(string)).StringLength(-1);
 }
 class DateOnlyTypeHandler : TypeHandler<DateOnly>
 {
     public override object Serialize(DateOnly value) => value.ToString("yyyy-MM-dd");
     public override DateOnly Deserialize(object value) => DateOnly.TryParse(string.Concat(value), out var trydo) ? trydo : DateOnly.MinValue;
-    public override void FluentApi(FluentColumn col) => col.MapType(typeof(string)).StringLength(12);
+    public override void FluentApi(ColumnFluent col) => col.MapType(typeof(string)).StringLength(12);
 }
 class DateTimeOffsetTypeHandler : TypeHandler<DateTimeOffset>
 {
     public override object Serialize(DateTimeOffset value) => value.ToUniversalTime().ToString("yyyy-MM-dd HH:mm:ss");
     public override DateTimeOffset Deserialize(object value) => DateTimeOffset.TryParse((string)value, out var dts) ? dts : DateTimeOffset.MinValue;
-    public override void FluentApi(FluentColumn col) => col.MapType(typeof(string)).DbType("datetime");
+    public override void FluentApi(ColumnFluent col) => col.MapType(typeof(string)).DbType("datetime");
 }
 ```
 

From 1c40771fe064d241f31453559b3d5ce0c0fc0239 Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@users.noreply.github.com>
Date: Tue, 24 Sep 2024 22:04:40 +0800
Subject: [PATCH 05/16] Update entity-attribute.md

---
 docs/guide/entity-attribute.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/guide/entity-attribute.md b/docs/guide/entity-attribute.md
index 565559be2..6abed741a 100644
--- a/docs/guide/entity-attribute.md
+++ b/docs/guide/entity-attribute.md
@@ -234,19 +234,19 @@ class JsonPocoTypeHandler : TypeHandler<JsonPoco>
 {
     public override object Serialize(JsonPoco value) => JsonConvert.SerializeObject(value);
     public override JsonPoco Deserialize(object value) => JsonConvert.DeserializeObject<JsonPoco>((string)value);
-    public override void FluentApi(FluentColumn col) => col.MapType(typeof(string)).StringLength(-1);
+    public override void FluentApi(ColumnFluent col) => col.MapType(typeof(string)).StringLength(-1);
 }
 class DateOnlyTypeHandler : TypeHandler<DateOnly>
 {
     public override object Serialize(DateOnly value) => value.ToString("yyyy-MM-dd");
     public override DateOnly Deserialize(object value) => DateOnly.TryParse(string.Concat(value), out var trydo) ? trydo : DateOnly.MinValue;
-    public override void FluentApi(FluentColumn col) => col.MapType(typeof(string)).StringLength(12);
+    public override void FluentApi(ColumnFluent col) => col.MapType(typeof(string)).StringLength(12);
 }
 class DateTimeOffsetTypeHandler : TypeHandler<DateTimeOffset>
 {
     public override object Serialize(DateTimeOffset value) => value.ToUniversalTime().ToString("yyyy-MM-dd HH:mm:ss");
     public override DateTimeOffset Deserialize(object value) => DateTimeOffset.TryParse((string)value, out var dts) ? dts : DateTimeOffset.MinValue;
-    public override void FluentApi(FluentColumn col) => col.MapType(typeof(string)).DbType("datetime");
+    public override void FluentApi(ColumnFluent col) => col.MapType(typeof(string)).DbType("datetime");
 }
 ```
 

From 25229cc4b79b3935b40f935da0f65d1201783e37 Mon Sep 17 00:00:00 2001
From: fc200 <75766479+fc200@users.noreply.github.com>
Date: Wed, 9 Oct 2024 17:12:08 +0800
Subject: [PATCH 06/16] Update sharding.md

---
 docs/guide/sharding.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/sharding.md b/docs/guide/sharding.md
index 5cf78b36a..3fee25666 100644
--- a/docs/guide/sharding.md
+++ b/docs/guide/sharding.md
@@ -2,7 +2,7 @@
 
 ## 理论知识
 
-分表 - 从表面意思上看呢，就是把一张表分成 N 多个小表，每一个小表都是完整的一张表。分表后数据都是存放在分表里，总表只是一个外壳，存取数据发生在一个一个的分表里面。分表后单表的并发能力提高了，磁盘 I/O 性能也提高了。并发能力为什么提高了呢，因为查寻一次所花的时间变短了，如果出现高并发的话，总表可以根据不同 的查询，将并发压力分到不同的小表里面。
+分表 - 从表面意思上看呢，就是把一张表分成 N 多个小表，每一个小表都是完整的一张表。分表后数据都是存放在分表里，总表只是一个外壳，存取数据发生在一个一个的分表里面。分表后单表的并发能力提高了，磁盘 I/O 性能也提高了。并发能力为什么提高了呢，因为查询一次所花的时间变短了，如果出现高并发的话，总表可以根据不同 的查询，将并发压力分到不同的小表里面。
 
 分库 - 把原本存储于一个库的数据分块存储到多个库上，把原本存储于一个表的数据分块存储到多个表上。数据库中的数据量不一定是可控的，在未进行分表分库的情况下，随着时间和业务的发展，库中的表会越来越多，表中的数据量也会越来越大，相应地，数据操作，增删改查的开销也会越来越大；另外，一台服务器的资源（CPU、磁盘、内存、IO 等）是有限的，最终数据库所能承载的数据量、数据处理能力都将遭遇瓶颈。
 

From f6163e0e4d8b2fcd8d126935acdea43bc3f92799 Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@users.noreply.github.com>
Date: Mon, 14 Oct 2024 08:52:28 +0800
Subject: [PATCH 07/16] Update entity-attribute.md

---
 docs/guide/entity-attribute.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/entity-attribute.md b/docs/guide/entity-attribute.md
index 6abed741a..9ebca8a75 100644
--- a/docs/guide/entity-attribute.md
+++ b/docs/guide/entity-attribute.md
@@ -278,7 +278,7 @@ fsql.Select<Table>().Where(a => a.Options.Value1 == 100 && a.Options.Value2 == "
 
 适用场景：当实体类继承时，CodeFirst 创建表的字段顺序可能不是想要的，通过该特性可以设置顺序。
 
-创建表时指定字段位置，如：[Column(Position = 1]，可为负数即反方向位置；
+创建表时指定字段位置，如：[Column(Position = 1)]，可为负数即反方向位置；
 
 ## 可插入(CanInsert)、可更新(CanUpdate)
 

From 35f0462c6767fca3a1ef06836425e8228d9e4642 Mon Sep 17 00:00:00 2001
From: IGeekFan <luoyunchong@foxmail.com>
Date: Thu, 17 Oct 2024 13:14:23 +0800
Subject: [PATCH 08/16] Update freescheduler.md

---
 docs/guide/freescheduler.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/guide/freescheduler.md b/docs/guide/freescheduler.md
index 3eb004223..312710e4d 100644
--- a/docs/guide/freescheduler.md
+++ b/docs/guide/freescheduler.md
@@ -14,6 +14,7 @@ FreeScheduler 是利用 IdleBus 实现的轻量化定时任务调度，支持集
 
 ```csharp
 static Scheduler scheduler = new FreeSchedulerBuilder()
+    .UseTimeZone(TimeSpan.FromHours(8)) //默认为UTC时间，国内可指定时区+8，任务将按本地时间执行
     .OnExecuting(task =>
     {
         Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss.fff")}] {task.Topic} 被执行");

From c07298deeb6254a66b20a22721f24f94dc399ecd Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@users.noreply.github.com>
Date: Mon, 21 Oct 2024 17:19:54 +0800
Subject: [PATCH 09/16] Update freeredis.md

---
 docs/guide/freeredis.md | 91 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 89 insertions(+), 2 deletions(-)

diff --git a/docs/guide/freeredis.md b/docs/guide/freeredis.md
index bb9d04cd8..ee61ee9a3 100644
--- a/docs/guide/freeredis.md
+++ b/docs/guide/freeredis.md
@@ -12,8 +12,7 @@
 - 🎣 支持主从分离（Master-Slave）
 - 📡 支持发布订阅（Pub-Sub）
 - 📃 支持 Redis Lua 脚本
-- 💻 支持管道（Pipeline）
-- 📰 支持事务
+- 💻 支持管道（Pipeline）、支持事务、延迟队列、RediSearch
 - 🌴 支持 GEO 命令（服务端要求 3.2 及以上版本）
 - 🌲 支持 STREAM 类型命令（服务端要求 5.0 及以上版本）
 - ⚡ 支持本地缓存（Client-side-cahing，服务端要求 6.0 及以上版本）
@@ -167,6 +166,94 @@ using (var db = cli.GetDatabase(10))
 }
 ```
 
+### 🔍 Scan (扫描)
+
+> 支持集群模式
+
+```csharp
+foreach (var keys in cli.Scan("*", 10, null))
+{
+    Console.WriteLine(string.Join(", ", keys));
+}
+```
+
+### 🍡DelayQueue (延时队列)
+
+```c#
+var delayQueue = cli.DelayQueue("TestDelayQueue");
+
+//添加队列
+delayQueue.Enqueue($"Execute in 5 seconds.", TimeSpan.FromSeconds(5));
+delayQueue.Enqueue($"Execute in 10 seconds.", DateTime.Now.AddSeconds(10));
+delayQueue.Enqueue($"Execute in 15 seconds.", DateTime.Now.AddSeconds(15));
+delayQueue.Enqueue($"Execute in 20 seconds.", TimeSpan.FromSeconds(20));
+delayQueue.Enqueue($"Execute in 25 seconds.", DateTime.Now.AddSeconds(25));
+delayQueue.Enqueue($"Execute in 2024-07-02 14:30:15", DateTime.Parse("2024-07-02 14:30:15"));
+
+//消费延时队列
+await delayQueue.DequeueAsync(s =>
+{
+    output.WriteLine($"{DateTime.Now}：{s}");
+
+    return Task.CompletedTask;
+});
+```
+
+### 🐆 RediSearch
+
+```csharp
+cli.FtCreate(...).Execute();
+cli.FtSearch(...).Execute();
+cli.FtAggregate(...).Execute();
+//... or ...
+
+[FtDocument("index_post", Prefix = "blog:post:")]
+class TestDoc
+{
+    [FtKey]
+    public int Id { get; set; }
+
+    [FtTextField("title", Weight = 5.0)]
+    public string Title { get; set; }
+
+    [FtTextField("category")]
+    public string Category { get; set; }
+
+    [FtTextField("content", Weight = 1.0, NoIndex = true)]
+    public string Content { get; set; }
+
+    [FtTagField("tags")]
+    public string Tags { get; set; }
+
+    [FtNumericField("views")]
+    public int Views { get; set; }
+}
+
+var repo = cli.FtDocumentRepository<TestDoc>();
+repo.CreateIndex();
+
+repo.Save(new TestDoc { Id = 1, Title = "test title1 word", Category = "class 1", Content = "test content 1 suffix", Tags = "user1,user2", Views = 101 });
+repo.Save(new TestDoc { Id = 2, Title = "prefix test title2", Category = "class 2", Content = "test infix content 2", Tags = "user2,user3", Views = 201 });
+repo.Save(new TestDoc { Id = 3, Title = "test title3 word", Category = "class 1", Content = "test word content 3", Tags = "user2,user5", Views = 301 });
+
+repo.Delete(1, 2, 3);
+
+repo.Save(new[]
+{
+    new TestDoc { Id = 1, Title = "test title1 word", Category = "class 1", Content = "test content 1 suffix", Tags = "user1,user2", Views = 101 },
+    new TestDoc { Id = 2, Title = "prefix test title2", Category = "class 2", Content = "test infix content 2", Tags = "user2,user3", Views = 201 },
+    new TestDoc { Id = 3, Title = "test title3 word", Category = "class 1", Content = "test word content 3", Tags = "user2,user5", Views = 301 }
+});
+
+var list = repo.Search("*").InFields(a => new { a.Title }).ToList();
+list = repo.Search("*").Return(a => new { a.Title, a.Tags }).ToList();
+list = repo.Search("*").Return(a => new { tit1 = a.Title, tgs1 = a.Tags, a.Title, a.Tags }).ToList();
+
+list = repo.Search(a => a.Title == "word").Filter(a => a.Views, 1, 1000).ToList();
+list = repo.Search("word").ToList();
+list = repo.Search("@title:word").ToList();
+```
+
 ## 🔍 Scan (扫描)
 
 > 支持集群模式

From 9d767080b3c0f20b1703740621b2c8c61619a724 Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@users.noreply.github.com>
Date: Mon, 21 Oct 2024 17:22:18 +0800
Subject: [PATCH 10/16] Update freeredis.md

---
 docs/guide/freeredis.md | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/docs/guide/freeredis.md b/docs/guide/freeredis.md
index ee61ee9a3..c320ca993 100644
--- a/docs/guide/freeredis.md
+++ b/docs/guide/freeredis.md
@@ -166,7 +166,7 @@ using (var db = cli.GetDatabase(10))
 }
 ```
 
-### 🔍 Scan (扫描)
+## 🔍 Scan (扫描)
 
 > 支持集群模式
 
@@ -177,7 +177,7 @@ foreach (var keys in cli.Scan("*", 10, null))
 }
 ```
 
-### 🍡DelayQueue (延时队列)
+## 🍡DelayQueue (延时队列)
 
 ```c#
 var delayQueue = cli.DelayQueue("TestDelayQueue");
@@ -199,7 +199,7 @@ await delayQueue.DequeueAsync(s =>
 });
 ```
 
-### 🐆 RediSearch
+## 🐆 RediSearch
 
 ```csharp
 cli.FtCreate(...).Execute();
@@ -253,14 +253,3 @@ list = repo.Search(a => a.Title == "word").Filter(a => a.Views, 1, 1000).ToList(
 list = repo.Search("word").ToList();
 list = repo.Search("@title:word").ToList();
 ```
-
-## 🔍 Scan (扫描)
-
-> 支持集群模式
-
-```csharp
-foreach (var keys in cli.Scan("*", 10, null))
-{
-    Console.WriteLine(string.Join(", ", keys));
-}
-```

From 46186c7aa1896b2b24a4710a7c29b37a810590dd Mon Sep 17 00:00:00 2001
From: 0x574859 <Hex574859@outlook.com>
Date: Wed, 23 Oct 2024 09:07:44 +0800
Subject: [PATCH 11/16] fix typo in withsql.md

---
 docs/guide/withsql.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/withsql.md b/docs/guide/withsql.md
index 9df0e4f60..2ee57fd0d 100644
--- a/docs/guide/withsql.md
+++ b/docs/guide/withsql.md
@@ -69,7 +69,7 @@ FROM ( select * from TestClass ) a
 WHERE ...
 ```
 
-### 4.返回`List<Tuplue>` 即`List<(string,string)>` 元组
+### 4.返回`List<Tuple>` 即`List<(string,string)>` 元组
 
 ```csharp
 List<(string,string)> list1 = _fsql

From 683c12e311492c451fc5a9e1e5549ae44a41b970 Mon Sep 17 00:00:00 2001
From: d4ilys <963922242@com>
Date: Fri, 25 Oct 2024 14:14:17 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Repository-Update?=
 =?UTF-8?q?=E5=92=8CServerTime=E5=86=B2=E7=AA=81=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/guide/repository.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/guide/repository.md b/docs/guide/repository.md
index 24d8ed5bd..35010d869 100644
--- a/docs/guide/repository.md
+++ b/docs/guide/repository.md
@@ -115,6 +115,29 @@ repo.CompareState(item) 可获取 item 的状态变化信息
 Dictionary<string, object[]> CompareState(TEntity newdata);
 ```
 
+需要注意在使用Repository更新时，不应在ColumnAttribute中指定ServerTime
+
+~~~csharp
+var repo = fsql.GetRepository<Dictionaries>();
+var item = await repo.Where(a => a.DictId == "1").FirstAsync();
+
+//如果Column特性中存在ServerTime属性可能导致无法修改的情况
+item.UpdateTime =  DateTime.Now;
+await repo.UpdateAsync(item);
+
+public class Dictionaries
+{
+    [Column(Name = "id", IsPrimary = true)]
+    public string Id { get; set; }
+
+    [Column(Name = "name")]
+    public string Name { get; set; }
+
+    [Column(Name = "update_time", ServerTime = DateTimeKind.Local)]
+    public DateTime? UpdateTime { get; set; }
+}
+~~~
+
 ## 登陆信息（依赖注入）
 
 repo.DbContextOptions.AuditValue 适合与 AddScoped（依赖注入） 信息结合，统一设置登陆信息。

From f90d7504eb696df19acbbf7d406ec60b9538a75f Mon Sep 17 00:00:00 2001
From: d4ilys <963922242@com>
Date: Fri, 25 Oct 2024 14:14:33 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Repository-Update?=
 =?UTF-8?q?=E5=92=8CServerTime=E5=86=B2=E7=AA=81=E8=AF=B4=E6=98=8E=20-=20e?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/en/guide/repository.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/en/guide/repository.md b/docs/en/guide/repository.md
index ef98cd450..e959fae9a 100644
--- a/docs/en/guide/repository.md
+++ b/docs/en/guide/repository.md
@@ -115,6 +115,29 @@ repo.Update(item); // Compare changes from snapshot
 Dictionary<string, object[]> CompareState(TEntity newdata);
 ```
 
+It should be noted that when using Repository updates, `ServerTime` should not be specified in ColumnAttribute.
+
+~~~csharp
+var repo = fsql.GetRepository<Dictionaries>();
+var item = await repo.Where(a => a.DictId == "1").FirstAsync();
+
+//If the ServerTime property exists in the Column attribute, it may result in the inability to modify it
+item.UpdateTime =  DateTime.Now;
+await repo.UpdateAsync(item);
+
+public class Dictionaries
+{
+    [Column(Name = "id", IsPrimary = true)]
+    public string Id { get; set; }
+
+    [Column(Name = "name")]
+    public string Name { get; set; }
+
+    [Column(Name = "update_time", ServerTime = DateTimeKind.Local)]
+    public DateTime? UpdateTime { get; set; }
+}
+~~~
+
 ## Login Information (Dependency Injection)
 
 `repo.DbContextOptions.AuditValue` is suitable for integration with AddScoped (Dependency Injection) to uniformly set login information.

From b8fd54df3a48fec1e70339fb8ac0b6e2fccf28ce Mon Sep 17 00:00:00 2001
From: luozq <igeekfan@foxmail.com>
Date: Mon, 4 Nov 2024 14:08:21 +0800
Subject: [PATCH 14/16] Add UnitOfWorkManager to SongService and implement
 Test3 for nested transactions

---
 docs/guide/transaction.md | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/docs/guide/transaction.md b/docs/guide/transaction.md
index 1a48ed3d8..635a651c4 100644
--- a/docs/guide/transaction.md
+++ b/docs/guide/transaction.md
@@ -77,15 +77,21 @@ public class SongService
 {
     readonly IBaseRepository<Song> _songRepository;
     readonly IBaseRepository<Detail> _detailRepository;
+    readonly UnitOfWorkManager _unitOfWorkManager;
 
-    public SongService(IBaseRepository<Song> songRepository, IBaseRepository<Detail> detailRepository)
+    public SongService(
+      IBaseRepository<Song> songRepository, 
+      IBaseRepository<Detail> detailRepository,
+      UnitOfWorkManager unitOfWorkManager
+    )
     {
         _songRepository = songRepository;
         _detailRepository = detailRepository;
+        _unitOfWorkManager = unitOfWorkManager;
     }
 
     [Transactional]
-    async public Task Test1()
+    public async Task Test1()
     {
         //所有注入的仓储对象，都是一个事务
         await _songRepository.InsertAsync(xxx1);
@@ -97,6 +103,16 @@ public class SongService
     public void Test2() //嵌套事务
     {
     }
+
+    public async Task Test3() 
+    {
+      using (var uow = _unitOfWorkManager.Begin())
+      {
+          await _songRepository.InsertAsync(xxx1);
+          await _detailRepository.DeleteAsync(xxx2);
+          uow.Commit();
+      }
+    }
 }
 ```
 

From ddddb47757cbbb644e30730df16757d388ce8d11 Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@users.noreply.github.com>
Date: Sat, 9 Nov 2024 11:09:55 +0800
Subject: [PATCH 15/16] Update withtempquery.md

---
 docs/guide/withtempquery.md | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/docs/guide/withtempquery.md b/docs/guide/withtempquery.md
index 4757fbe6a..52a4a1d12 100644
--- a/docs/guide/withtempquery.md
+++ b/docs/guide/withtempquery.md
@@ -240,6 +240,42 @@ INNER JOIN [Unit] c ON a.[UnitId] = c.[UnitId]
 WHERE (b.[RN] < 2)
 ```
 
+## 场景7：报表（每日）
+
+1. 从内存创建连续的日期 List
+2. 使用 FromQuery 与多个 ISelect 横向 LeftJoin
+
+```csharp
+var startDate = DateTime.Parse("2024-11-1");
+var endDate = DateTime.Parse("2024-12-1");
+fsql.Select<object>()
+    .WithMemory(
+        Enumerable.Range(0, (int)endDate.Subtract(startDate).TotalDays)
+            .Select(a => new { Date = startDate.AddDays(a).ToString("yyyy-MM-dd") })
+            .ToList()
+    )
+    .FromQuery(
+        fsql.Select<T1, T2>().InnerJoin((a,b) => ...)
+            .WHere((a,b) => a.CreateDate.BetweenEnd(startDate, endDate)
+            .GroupBy((a,b) => a.CreateDate.Date.ToString("yyyy-MM-dd"))
+            .WithTempQuery(g => new { Date = g.Key, Type1Total = g.Sum(g.Value.Item2.Qty1) }),
+        fsql.Select<T3>()
+            .WHere(a => a.CreateDate.BetweenEnd(startDate, endDate)
+            .GroupBy(a => a.CreateDate.Date.ToString("yyyy-MM-dd"))
+            .WithTempQuery(g => new { Date = g.Key, Type2Total = g.Sum(g.Value.Qty2) }),
+        //... 最多支持 16 个 ISelect 合并
+    )
+    .LeftJoin(t => t.t2.Date = t.t1.Date)
+    .LeftJoin(t => t.t3.Date = t.t1.Date)
+    .OrderByDescending(t => t.t1.Date)
+    .ToList(t => new
+    {
+        t.t1.Date,
+        Sum1 = t.t2.Type1Total,
+        Sum2 t.t3.Type2Total
+    });
+```
+
 ## WithParameters 参数化共享
 
 开启参数化查询功能后，使用 WithParameters 共享参数化，可避免产生相同的参数名称：

From 8687de1eea35010fe650a3b996cfa89cbf6fb3c0 Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@users.noreply.github.com>
Date: Sat, 9 Nov 2024 11:11:33 +0800
Subject: [PATCH 16/16] Update withtempquery.md

---
 docs/guide/withtempquery.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guide/withtempquery.md b/docs/guide/withtempquery.md
index 52a4a1d12..e6c21148f 100644
--- a/docs/guide/withtempquery.md
+++ b/docs/guide/withtempquery.md
@@ -256,11 +256,11 @@ fsql.Select<object>()
     )
     .FromQuery(
         fsql.Select<T1, T2>().InnerJoin((a,b) => ...)
-            .WHere((a,b) => a.CreateDate.BetweenEnd(startDate, endDate)
+            .Where((a,b) => a.CreateDate.BetweenEnd(startDate, endDate)
             .GroupBy((a,b) => a.CreateDate.Date.ToString("yyyy-MM-dd"))
             .WithTempQuery(g => new { Date = g.Key, Type1Total = g.Sum(g.Value.Item2.Qty1) }),
         fsql.Select<T3>()
-            .WHere(a => a.CreateDate.BetweenEnd(startDate, endDate)
+            .Where(a => a.CreateDate.BetweenEnd(startDate, endDate)
             .GroupBy(a => a.CreateDate.Date.ToString("yyyy-MM-dd"))
             .WithTempQuery(g => new { Date = g.Key, Type2Total = g.Sum(g.Value.Qty2) }),
         //... 最多支持 16 个 ISelect 合并