feat: 找出问题

.gitignore

@@ -263,20 +263,14 @@ src/Acme.BookStore.Blazor.Server.Tiered/Logs/*
 
 # Use abp install-libs to restore.
 **/wwwroot/libs/*
-public
 dist
-dist - 副本
 .vscode
 /Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.Development.json
 /Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.Production.json
 /Yi.Abp.Net8/test/Yi.Abp.Test/appsettings.Development.json
 /Yi.Abp.Net8/test/Yi.Abp.Test/appsettings.Production.json
-/Yi.Abp.Net8/tool/Yi.Abp.Tool.Web/appsettings.Development.json
 database_backup
 /Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.Staging.json
 /Yi.Abp.Net8/src/Yi.Abp.Web/logs/
 /Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db
 
-package-lock.json
-
-.claude

README-Docker.md

@@ -1,37 +0,0 @@
-# 🍉Docker 构建说明
-
-## 🍊后端
-执行目录：Yi\Yi.Abp.Net8
-
-#### 🍊启动
-D:/code/csharp/source/Yi/Yi.Bbs.Vue3/yi-bbs.conf 为我的配置文件，内部带了默认的配置文件，根据自己配置进行更改
-
-//不带配置文件
-docker run -d --name yi.admin -p 19001:19001 jiftcc/yi.admin:1.0.0
-
-//带配置文件
-docker run -d --name yi.admin -p 19001:19001 -v D:/code/csharp/source/Yi/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json:/app/appsettings.json jiftcc/yi.admin:1.0.0
-
-
-#### 🍊完整代码编译
-docker build -t jiftcc/yi.admin:1.0.0 -f Dockerfile .
-
-#### 🍊快速产物编译
-docker build -t jiftcc/yi.admin:1.0.0 -f DockerfileFast .
-
-****
-
-## 🍇前端
-执行目录：Yi\Yi.Bbs.Vue3
-
-#### 🍇启动
-D:/code/csharp/source/Yi/Yi.Bbs.Vue3/yi-bbs.conf 为我的conf配置目录，默认反向代理到ccnetcore.com，根据自己后端地址进行修改配置
-
-docker run -d --name yi.bbs -p 18001:18001 -v D:/code/csharp/source/Yi/Yi.Bbs.Vue3/yi-bbs.conf:/etc/nginx/conf.d/yi-bbs.conf jiftcc/yi.bbs:1.0.0
-
-#### 🍇完整代码编译
-docker build -t jiftcc/yi.bbs:1.0.0 -f Dockerfile .
-
-#### 🍇快速产物编译
-docker build -t jiftcc/yi.bbs:1.0.0 -f DockerfileFast .
-

README-en.md

@@ -35,18 +35,6 @@ A Comprehensive Solution, Ultimately Just Another Wheel.
 - Yi.RuoYi.Vue3：RuoYi JS Backend Frontend
 
 ****
-## 🍉 docker 
-
-Full content：README-Docker.md
-
-backend：`docker run -d --name yi.admin -p 19001:19001 jiftcc/yi.admin:last`
-
-bbs frontend：`docker run -d --name yi.bbs -p 18001:18001 -v /home/Yi/Yi.Bbs.Vue3/yi-bbs.conf:/etc/nginx/conf.d/yi-bbs.conf jiftcc/yi.bbs:last`
-
-> In addition, we provide Docker build operation, and we hope that you can build your own image through this method
-
-****
-
 
 ##  🍊  Official website and demo link：
 

README.md

@@ -7,12 +7,6 @@
 [![fork](https://gitee.com/ccnetcore/yi/badge/fork.svg?theme=dark)](https://gitee.com/ccnetcore/Yi)
 [![license](https://img.shields.io/badge/license-MIT-yellow)](https://gitee.com/ccnetcore/Yi)
 
-本项目 CDN 加速及安全防护由 Tencent EdgeOne 赞助
-
-[亚洲最佳CDN、边缘和安全解决方案 - Tencent EdgeOne](https://edgeone.ai/zh?from=github)
-
-<img src="readme/edgeone.png"/>
-
 [English](README-en.md) | 简体中文
 ****
 ##  🍍  简介:
@@ -28,7 +22,7 @@ YiFramework是一个基于.Net8+Abp.vNext+SqlSugar的DDD领域驱动设计后端
 
 Yi框架-一套与SqlSugar一样爽的.Net8开源框架。
 与Sqlsugar理念一致，以用户体验出发。
-全生态拥抱AI，接入AI，100%代码经过AI洗礼
+适合.Net8学习、Sqlsugar学习 、项目二次开发。
 集大成者，终究轮子
 
 （更新频繁，可watching持续关注。）
@@ -47,17 +41,6 @@ Yi框架-一套与SqlSugar一样爽的.Net8开源框架。
 - Yi.Pure.Vue3：Pure ts后台前端
 - Yi.RuoYi.Vue3：RuoYi js后台前端
 
-****
-## 🍉 docker 一键启动
-
-完整内容在：README-Docker.md
-
-后端：`docker run -d --name yi.admin -p 19001:19001 jiftcc/yi.admin:last`
-
-bbs前端：`docker run -d --name yi.bbs -p 18001:18001 -v /home/Yi/Yi.Bbs.Vue3/yi-bbs.conf:/etc/nginx/conf.d/yi-bbs.conf jiftcc/yi.bbs:last`
-
-> 另外我们提供docker的build操作，我们更希望你能通过此种方式二开构建属于自己的镜像
-
 ****
 
 ##  🍊  官网及演示地址：
@@ -66,9 +49,9 @@ bbs前端：`docker run -d --name yi.bbs -p 18001:18001 -v /home/Yi/Yi.Bbs.Vue3/
 
 Yi社区官网网址（Bbs社区正式）：[ccnetcore.com](https://ccnetcore.com)  (已上线，欢迎加入)
 
-Rbac后台演示地址：https://data.ccnetcore.com:1000  （用户cc、密码123456）
+Rbac后台演示地址：https://ccnetcore.com:1000  （用户cc、密码123456）
 
-Pure后台演示地址：https://data.ccnetcore.com:1001  （用户cc、密码123456）
+Pure后台演示地址：https://ccnetcore.com:1001  （用户cc、密码123456）
 
 ##  🍏  支持:
 
@@ -77,11 +60,8 @@ Pure后台演示地址：https://data.ccnetcore.com:1001  （用户cc、密码12
 - [x] 完全支持微服务架构
 
 ****
-
 ##  🍇  详细到爆炸的Yi框架教程导航：
 
-0. [社区导航大全](https://ccnetcore.com/article/aaa00329-7f35-d3fe-d258-3a0f8380b742/fb8c871b-41fc-21bc-474f-3a154498f42b)
-
 1. [框架快速开始教程](https://ccnetcore.com/article/aaa00329-7f35-d3fe-d258-3a0f8380b742)(已完成)
 2. [框架功能模块教程](https://ccnetcore.com/article/8c464ab3-8ba5-2761-a4b0-3a0f83a9f312)(已完成)
 3. [实战演练开发教程](https://ccnetcore.com/article/e89c9593-f337-ada7-d108-3a0f83ae48e6)(已完成)
@@ -267,9 +247,9 @@ js Vue3
 
 作者QQ：`454313500`，2029年之前作者24小时在线，时刻保持活跃更新。
 
-QQ交流群：官方一群（已满）、官方二群（已满）、官方三群：`786308927`（已满）、官方四群:`498310311`（已满）、官方五群:`981136525`
+QQ交流群：官方一群（已满）、官方二群（已满）、官方三群：`786308927`（已满）、官方四群:`498310311`（基本已满）、官方五群:`981136525`（新群）
 
-微信交流群：官方微信一群（已满）、官方微信二群(已满)、官方微信三群
+微信交流群：官方微信一群（已满）、官方微信二群
 
 微信交流群：加作者微信 chengzilaoge520 （橙子老哥520），备注拉群
 

Yi.Abp.Net8/.claude/settings.local.json

@@ -1,10 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(dotnet build \"E:\\code\\github\\Yi\\Yi.Abp.Net8\\module\\ai-hub\\Yi.Framework.AiHub.Application\\Yi.Framework.AiHub.Application.csproj\" --no-restore)",
-      "Read(//e/code/github/Yi/Yi.Ai.Vue3/**)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}

Yi.Abp.Net8/.dockerignore

@@ -28,6 +28,3 @@ README.md
 !.git/config
 !.git/packed-refs
 !.git/refs/heads/**
-appsettings.Development.json
-appsettings.Production.json
-appsettings.Staging.json

Yi.Abp.Net8/Dockerfile

@@ -1,22 +0,0 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
-USER root
-RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-RUN echo "Asia/Shanghai" > /etc/timezone
-WORKDIR /app
-EXPOSE 19001
-
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
-ARG BUILD_CONFIGURATION=Release
-WORKDIR /main
-COPY . .
-WORKDIR "/main/src/Yi.Abp.Web"
-RUN dotnet restore "Yi.Abp.Web.csproj"
-
-FROM build AS publish
-WORKDIR "/main/src/Yi.Abp.Web"
-RUN dotnet publish "Yi.Abp.Web.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "Yi.Abp.Web.dll"]

Yi.Abp.Net8/DockerfileFast

@@ -1,11 +0,0 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
-USER root
-RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-RUN echo "Asia/Shanghai" > /etc/timezone
-WORKDIR /app
-EXPOSE 19001
-
-FROM base AS final
-WORKDIR /app
-COPY ["./publish","."]
-ENTRYPOINT ["dotnet", "Yi.Abp.Web.dll"]

Yi.Abp.Net8/Yi.Abp.sln

@@ -36,8 +36,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		version.props = version.props
 		publish.bat = publish.bat
 		publish_Demo.bat = publish_Demo.bat
-		Dockerfile = Dockerfile
-		DockerfileFast = DockerfileFast
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.SqlSugarCore.Abstractions", "framework\Yi.Framework.SqlSugarCore.Abstractions\Yi.Framework.SqlSugarCore.Abstractions.csproj", "{FD6D6860-3753-4747-8A26-977E4A3001F9}"
@@ -82,6 +80,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.AuditLogging.S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.AspNetCore.Authentication.OAuth", "framework\Yi.Framework.AspNetCore.Authentication.OAuth\Yi.Framework.AspNetCore.Authentication.OAuth.csproj", "{791AC2FA-50D3-4408-8D68-31DA72F608BE}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{01300F0F-686E-47B3-821D-12424177867B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Acme.BookStore.Web", "sample\Acme.BookStore.Web\Acme.BookStore.Web.csproj", "{576DBC97-4E5D-4444-B65C-F41649A5F8E0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Acme.BookStore.Domain.Shared", "sample\Acme.BookStore.Domain.Shared\Acme.BookStore.Domain.Shared.csproj", "{D7F8BD42-F6A2-4F0A-9212-391B5185A99D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Acme.BookStore.Domain", "sample\Acme.BookStore.Domain\Acme.BookStore.Domain.csproj", "{B615847F-8568-41D1-8B7E-63D61AE69F3D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Acme.BookStore.Application.Contracts", "sample\Acme.BookStore.Application.Contracts\Acme.BookStore.Application.Contracts.csproj", "{20827DB5-5CDE-491A-82E8-3CAB82618C1E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Acme.BookStore.Application", "sample\Acme.BookStore.Application\Acme.BookStore.Application.csproj", "{320273B6-7AE3-42DA-9675-D9AD4928A289}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Acme.BookStore.SqlSugarCore", "sample\Acme.BookStore.SqlSugarCore\Acme.BookStore.SqlSugarCore.csproj", "{70CCBD89-C0A1-4AC8-9AFA-C86C356DFDD7}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Test", "test\Yi.Abp.Test\Yi.Abp.Test.csproj", "{68627BC2-F049-4C69-AD17-81DF9478E8CE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tenant-management", "tenant-management", "{499A8C71-7892-42D0-A77E-48756E1EFF16}"
@@ -158,46 +170,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Tool.HttpApi.Client"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.SettingManagement.Application", "module\setting-management\Yi.Framework.SettingManagement.Application\Yi.Framework.SettingManagement.Application.csproj", "{2A31D7CB-BDCC-4253-BA73-273B6B5E1956}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "digital-collectibles", "digital-collectibles", "{B8F76A6B-2EEB-4E64-9F26-D84584E16B9C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.DigitalCollectibles.Application", "module\digital-collectibles\Yi.Framework.DigitalCollectibles.Application\Yi.Framework.DigitalCollectibles.Application.csproj", "{236B88D4-F018-4A5F-A506-7458F2308C70}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.DigitalCollectibles.Application.Contracts", "module\digital-collectibles\Yi.Framework.DigitalCollectibles.Application.Contracts\Yi.Framework.DigitalCollectibles.Application.Contracts.csproj", "{4FE7AC0E-91CC-4DF1-ACA7-ED83483C3F3B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.DigitalCollectibles.Domain", "module\digital-collectibles\Yi.Framework.DigitalCollectibles.Domain\Yi.Framework.DigitalCollectibles.Domain.csproj", "{9B5CAE1A-E062-4C9B-8121-E58FBF69309C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.DigitalCollectibles.Domain.Shared", "module\digital-collectibles\Yi.Framework.DigitalCollectibles.Domain.Shared\Yi.Framework.DigitalCollectibles.Domain.Shared.csproj", "{FFEC9DA6-1A13-480A-AE9E-2BF8763D3061}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.DigitalCollectibles.SqlSugarCore", "module\digital-collectibles\Yi.Framework.DigitalCollectibles.SqlSugarCore\Yi.Framework.DigitalCollectibles.SqlSugarCore.csproj", "{4CE6E4AE-0BA4-4984-A4F1-A9A414B1BB8F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.WeChat.MiniProgram", "framework\Yi.Framework.WeChat.MiniProgram\Yi.Framework.WeChat.MiniProgram.csproj", "{81CEA2ED-917B-41D8-BE0D-39A785B050C0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.BackgroundWorkers.Hangfire", "framework\Yi.Framework.BackgroundWorkers.Hangfire\Yi.Framework.BackgroundWorkers.Hangfire.csproj", "{862CA181-BEE6-4870-82D2-B662E527ED8C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ai-stock", "ai-stock", "{DB46873F-981A-43D8-91B0-D464CCB65943}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.Stock.Application", "module\ai-stock\Yi.Framework.Stock.Application\Yi.Framework.Stock.Application.csproj", "{B79CE23C-10F8-48A5-A039-5940A188CF5A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.Stock.Application.Contracts", "module\ai-stock\Yi.Framework.Stock.Application.Contracts\Yi.Framework.Stock.Application.Contracts.csproj", "{846B781A-B77E-4F86-A31F-0B5B57AB0775}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.Stock.Domain", "module\ai-stock\Yi.Framework.Stock.Domain\Yi.Framework.Stock.Domain.csproj", "{162821E4-8FE0-4A68-B3C0-49BD6596446F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.Stock.Domain.Shared", "module\ai-stock\Yi.Framework.Stock.Domain.Shared\Yi.Framework.Stock.Domain.Shared.csproj", "{10273544-715D-4BB3-893C-6F010D947BDD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.Stock.SqlSugarCore", "module\ai-stock\Yi.Framework.Stock.SqlSugarCore\Yi.Framework.Stock.SqlSugarCore.csproj", "{5F49318F-E6C7-4194-BAE0-83D4FB8D1983}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ai-hub", "ai-hub", "{7AD5DBAE-44F9-474B-8F7B-837EDE908934}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.AiHub.Application", "module\ai-hub\Yi.Framework.AiHub.Application\Yi.Framework.AiHub.Application.csproj", "{1AD10DD2-535E-4EAB-A8A4-EC3FCA206895}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.AiHub.Application.Contracts", "module\ai-hub\Yi.Framework.AiHub.Application.Contracts\Yi.Framework.AiHub.Application.Contracts.csproj", "{123D1C81-D667-4060-8E85-FFE7FB4584AD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.AiHub.Domain", "module\ai-hub\Yi.Framework.AiHub.Domain\Yi.Framework.AiHub.Domain.csproj", "{8EB4C8BB-6B21-4811-9FAB-B98FA5CA754D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.AiHub.Domain.Shared", "module\ai-hub\Yi.Framework.AiHub.Domain.Shared\Yi.Framework.AiHub.Domain.Shared.csproj", "{5FC6CA90-D5B4-433E-9B2C-94330FFB4C48}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.AiHub.SqlSugarCore", "module\ai-hub\Yi.Framework.AiHub.SqlSugarCore\Yi.Framework.AiHub.SqlSugarCore.csproj", "{8698C812-4DDC-4E80-BCD6-24C5D56AEDB1}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -304,6 +276,30 @@ Global
 		{791AC2FA-50D3-4408-8D68-31DA72F608BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{791AC2FA-50D3-4408-8D68-31DA72F608BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{791AC2FA-50D3-4408-8D68-31DA72F608BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{576DBC97-4E5D-4444-B65C-F41649A5F8E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{576DBC97-4E5D-4444-B65C-F41649A5F8E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{576DBC97-4E5D-4444-B65C-F41649A5F8E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{576DBC97-4E5D-4444-B65C-F41649A5F8E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7F8BD42-F6A2-4F0A-9212-391B5185A99D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7F8BD42-F6A2-4F0A-9212-391B5185A99D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7F8BD42-F6A2-4F0A-9212-391B5185A99D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7F8BD42-F6A2-4F0A-9212-391B5185A99D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B615847F-8568-41D1-8B7E-63D61AE69F3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B615847F-8568-41D1-8B7E-63D61AE69F3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B615847F-8568-41D1-8B7E-63D61AE69F3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B615847F-8568-41D1-8B7E-63D61AE69F3D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20827DB5-5CDE-491A-82E8-3CAB82618C1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20827DB5-5CDE-491A-82E8-3CAB82618C1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20827DB5-5CDE-491A-82E8-3CAB82618C1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20827DB5-5CDE-491A-82E8-3CAB82618C1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{320273B6-7AE3-42DA-9675-D9AD4928A289}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{320273B6-7AE3-42DA-9675-D9AD4928A289}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{320273B6-7AE3-42DA-9675-D9AD4928A289}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{320273B6-7AE3-42DA-9675-D9AD4928A289}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70CCBD89-C0A1-4AC8-9AFA-C86C356DFDD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70CCBD89-C0A1-4AC8-9AFA-C86C356DFDD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70CCBD89-C0A1-4AC8-9AFA-C86C356DFDD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70CCBD89-C0A1-4AC8-9AFA-C86C356DFDD7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{68627BC2-F049-4C69-AD17-81DF9478E8CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{68627BC2-F049-4C69-AD17-81DF9478E8CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{68627BC2-F049-4C69-AD17-81DF9478E8CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -432,74 +428,6 @@ Global
 		{2A31D7CB-BDCC-4253-BA73-273B6B5E1956}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2A31D7CB-BDCC-4253-BA73-273B6B5E1956}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A31D7CB-BDCC-4253-BA73-273B6B5E1956}.Release|Any CPU.Build.0 = Release|Any CPU
-		{236B88D4-F018-4A5F-A506-7458F2308C70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{236B88D4-F018-4A5F-A506-7458F2308C70}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{236B88D4-F018-4A5F-A506-7458F2308C70}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{236B88D4-F018-4A5F-A506-7458F2308C70}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4FE7AC0E-91CC-4DF1-ACA7-ED83483C3F3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FE7AC0E-91CC-4DF1-ACA7-ED83483C3F3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FE7AC0E-91CC-4DF1-ACA7-ED83483C3F3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4FE7AC0E-91CC-4DF1-ACA7-ED83483C3F3B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9B5CAE1A-E062-4C9B-8121-E58FBF69309C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B5CAE1A-E062-4C9B-8121-E58FBF69309C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B5CAE1A-E062-4C9B-8121-E58FBF69309C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9B5CAE1A-E062-4C9B-8121-E58FBF69309C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FFEC9DA6-1A13-480A-AE9E-2BF8763D3061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FFEC9DA6-1A13-480A-AE9E-2BF8763D3061}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FFEC9DA6-1A13-480A-AE9E-2BF8763D3061}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FFEC9DA6-1A13-480A-AE9E-2BF8763D3061}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4CE6E4AE-0BA4-4984-A4F1-A9A414B1BB8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CE6E4AE-0BA4-4984-A4F1-A9A414B1BB8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CE6E4AE-0BA4-4984-A4F1-A9A414B1BB8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4CE6E4AE-0BA4-4984-A4F1-A9A414B1BB8F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81CEA2ED-917B-41D8-BE0D-39A785B050C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81CEA2ED-917B-41D8-BE0D-39A785B050C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81CEA2ED-917B-41D8-BE0D-39A785B050C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81CEA2ED-917B-41D8-BE0D-39A785B050C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{862CA181-BEE6-4870-82D2-B662E527ED8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{862CA181-BEE6-4870-82D2-B662E527ED8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{862CA181-BEE6-4870-82D2-B662E527ED8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{862CA181-BEE6-4870-82D2-B662E527ED8C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B79CE23C-10F8-48A5-A039-5940A188CF5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B79CE23C-10F8-48A5-A039-5940A188CF5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B79CE23C-10F8-48A5-A039-5940A188CF5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B79CE23C-10F8-48A5-A039-5940A188CF5A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{846B781A-B77E-4F86-A31F-0B5B57AB0775}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{846B781A-B77E-4F86-A31F-0B5B57AB0775}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{846B781A-B77E-4F86-A31F-0B5B57AB0775}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{846B781A-B77E-4F86-A31F-0B5B57AB0775}.Release|Any CPU.Build.0 = Release|Any CPU
-		{162821E4-8FE0-4A68-B3C0-49BD6596446F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{162821E4-8FE0-4A68-B3C0-49BD6596446F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{162821E4-8FE0-4A68-B3C0-49BD6596446F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{162821E4-8FE0-4A68-B3C0-49BD6596446F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10273544-715D-4BB3-893C-6F010D947BDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10273544-715D-4BB3-893C-6F010D947BDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10273544-715D-4BB3-893C-6F010D947BDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10273544-715D-4BB3-893C-6F010D947BDD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5F49318F-E6C7-4194-BAE0-83D4FB8D1983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F49318F-E6C7-4194-BAE0-83D4FB8D1983}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F49318F-E6C7-4194-BAE0-83D4FB8D1983}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5F49318F-E6C7-4194-BAE0-83D4FB8D1983}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1AD10DD2-535E-4EAB-A8A4-EC3FCA206895}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1AD10DD2-535E-4EAB-A8A4-EC3FCA206895}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1AD10DD2-535E-4EAB-A8A4-EC3FCA206895}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1AD10DD2-535E-4EAB-A8A4-EC3FCA206895}.Release|Any CPU.Build.0 = Release|Any CPU
-		{123D1C81-D667-4060-8E85-FFE7FB4584AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{123D1C81-D667-4060-8E85-FFE7FB4584AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{123D1C81-D667-4060-8E85-FFE7FB4584AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{123D1C81-D667-4060-8E85-FFE7FB4584AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EB4C8BB-6B21-4811-9FAB-B98FA5CA754D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EB4C8BB-6B21-4811-9FAB-B98FA5CA754D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EB4C8BB-6B21-4811-9FAB-B98FA5CA754D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8EB4C8BB-6B21-4811-9FAB-B98FA5CA754D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5FC6CA90-D5B4-433E-9B2C-94330FFB4C48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5FC6CA90-D5B4-433E-9B2C-94330FFB4C48}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5FC6CA90-D5B4-433E-9B2C-94330FFB4C48}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5FC6CA90-D5B4-433E-9B2C-94330FFB4C48}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8698C812-4DDC-4E80-BCD6-24C5D56AEDB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8698C812-4DDC-4E80-BCD6-24C5D56AEDB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8698C812-4DDC-4E80-BCD6-24C5D56AEDB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8698C812-4DDC-4E80-BCD6-24C5D56AEDB1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -533,6 +461,12 @@ Global
 		{73CCF2C4-B9FD-44AB-8D4B-0A421805B094} = {2317227D-7796-4E7B-BEDB-7CD1CAE7B853}
 		{48806510-8E18-4E1E-9BAF-5B97E88C5FC3} = {73CCF2C4-B9FD-44AB-8D4B-0A421805B094}
 		{791AC2FA-50D3-4408-8D68-31DA72F608BE} = {77B949E9-530E-45A5-9657-20F7D5C6875C}
+		{576DBC97-4E5D-4444-B65C-F41649A5F8E0} = {01300F0F-686E-47B3-821D-12424177867B}
+		{D7F8BD42-F6A2-4F0A-9212-391B5185A99D} = {01300F0F-686E-47B3-821D-12424177867B}
+		{B615847F-8568-41D1-8B7E-63D61AE69F3D} = {01300F0F-686E-47B3-821D-12424177867B}
+		{20827DB5-5CDE-491A-82E8-3CAB82618C1E} = {01300F0F-686E-47B3-821D-12424177867B}
+		{320273B6-7AE3-42DA-9675-D9AD4928A289} = {01300F0F-686E-47B3-821D-12424177867B}
+		{70CCBD89-C0A1-4AC8-9AFA-C86C356DFDD7} = {01300F0F-686E-47B3-821D-12424177867B}
 		{68627BC2-F049-4C69-AD17-81DF9478E8CE} = {0D10EEF2-FBAE-4C72-B816-A52823FC299B}
 		{499A8C71-7892-42D0-A77E-48756E1EFF16} = {2317227D-7796-4E7B-BEDB-7CD1CAE7B853}
 		{FA5BBAA1-08DC-472F-BB2C-5314E59D1556} = {499A8C71-7892-42D0-A77E-48756E1EFF16}
@@ -569,26 +503,6 @@ Global
 		{4AE84CDE-2A47-4D68-8E93-86193F72E4E8} = {084CBEEC-5D37-4716-B9C7-D80D6960DFF4}
 		{C8F97775-D903-4365-A4FF-3DA97E318CD2} = {084CBEEC-5D37-4716-B9C7-D80D6960DFF4}
 		{2A31D7CB-BDCC-4253-BA73-273B6B5E1956} = {8C68059E-F3B1-4D28-A1C9-A5830F53E5D3}
-		{B8F76A6B-2EEB-4E64-9F26-D84584E16B9C} = {2317227D-7796-4E7B-BEDB-7CD1CAE7B853}
-		{236B88D4-F018-4A5F-A506-7458F2308C70} = {B8F76A6B-2EEB-4E64-9F26-D84584E16B9C}
-		{4FE7AC0E-91CC-4DF1-ACA7-ED83483C3F3B} = {B8F76A6B-2EEB-4E64-9F26-D84584E16B9C}
-		{9B5CAE1A-E062-4C9B-8121-E58FBF69309C} = {B8F76A6B-2EEB-4E64-9F26-D84584E16B9C}
-		{FFEC9DA6-1A13-480A-AE9E-2BF8763D3061} = {B8F76A6B-2EEB-4E64-9F26-D84584E16B9C}
-		{4CE6E4AE-0BA4-4984-A4F1-A9A414B1BB8F} = {B8F76A6B-2EEB-4E64-9F26-D84584E16B9C}
-		{81CEA2ED-917B-41D8-BE0D-39A785B050C0} = {77B949E9-530E-45A5-9657-20F7D5C6875C}
-		{862CA181-BEE6-4870-82D2-B662E527ED8C} = {77B949E9-530E-45A5-9657-20F7D5C6875C}
-		{DB46873F-981A-43D8-91B0-D464CCB65943} = {2317227D-7796-4E7B-BEDB-7CD1CAE7B853}
-		{B79CE23C-10F8-48A5-A039-5940A188CF5A} = {DB46873F-981A-43D8-91B0-D464CCB65943}
-		{846B781A-B77E-4F86-A31F-0B5B57AB0775} = {DB46873F-981A-43D8-91B0-D464CCB65943}
-		{162821E4-8FE0-4A68-B3C0-49BD6596446F} = {DB46873F-981A-43D8-91B0-D464CCB65943}
-		{10273544-715D-4BB3-893C-6F010D947BDD} = {DB46873F-981A-43D8-91B0-D464CCB65943}
-		{5F49318F-E6C7-4194-BAE0-83D4FB8D1983} = {DB46873F-981A-43D8-91B0-D464CCB65943}
-		{7AD5DBAE-44F9-474B-8F7B-837EDE908934} = {2317227D-7796-4E7B-BEDB-7CD1CAE7B853}
-		{1AD10DD2-535E-4EAB-A8A4-EC3FCA206895} = {7AD5DBAE-44F9-474B-8F7B-837EDE908934}
-		{123D1C81-D667-4060-8E85-FFE7FB4584AD} = {7AD5DBAE-44F9-474B-8F7B-837EDE908934}
-		{8EB4C8BB-6B21-4811-9FAB-B98FA5CA754D} = {7AD5DBAE-44F9-474B-8F7B-837EDE908934}
-		{5FC6CA90-D5B4-433E-9B2C-94330FFB4C48} = {7AD5DBAE-44F9-474B-8F7B-837EDE908934}
-		{8698C812-4DDC-4E80-BCD6-24C5D56AEDB1} = {7AD5DBAE-44F9-474B-8F7B-837EDE908934}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {23D6FBC9-C970-4641-BC1E-2AEA59F51C18}

Yi.Abp.Net8/common.props

@@ -12,7 +12,6 @@
 	</PropertyGroup>
 	
   <PropertyGroup>
-      <SatelliteResourceLanguages>en;zh-CN</SatelliteResourceLanguages>
     <LangVersion>latest</LangVersion>
     <Version>1.0.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS8618;CS1998;CS8604;CS8620;CS8600;CS8602</NoWarn>

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Authentication/RefreshAuthenticationHandlerProvider.cs

@@ -1,64 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.DependencyInjection;
-using Yi.Framework.Core.Authentication;
-
-namespace Yi.Framework.AspNetCore.Microsoft.AspNetCore.Authentication;
-
-/// <summary>
-/// 可刷新的鉴权提供者
-/// </summary>
-public class RefreshAuthenticationHandlerProvider : IRefreshAuthenticationHandlerProvider
-{
-    private Dictionary<string, IAuthenticationHandler> _handlerMap =
-        new Dictionary<string, IAuthenticationHandler>((IEqualityComparer<string>)StringComparer.Ordinal);
-
-    /// <summary>Constructor.</summary>
-    /// <param name="schemes">The <see cref="T:Microsoft.AspNetCore.Authentication.IAuthenticationHandlerProvider" />.</param>
-    public RefreshAuthenticationHandlerProvider(IAuthenticationSchemeProvider schemes)
-    {
-        this.Schemes = schemes;
-    }
-
-    /// <summary>
-    /// The <see cref="T:Microsoft.AspNetCore.Authentication.IAuthenticationHandlerProvider" />.
-    /// </summary>
-    public IAuthenticationSchemeProvider Schemes { get; }
-
-    /// <summary>Returns the handler instance that will be used.</summary>
-    /// <param name="context">The context.</param>
-    /// <param name="authenticationScheme">The name of the authentication scheme being handled.</param>
-    /// <returns>The handler instance.</returns>
-    public async Task<IAuthenticationHandler?> GetHandlerAsync(
-        HttpContext context,
-        string authenticationScheme)
-    {
-        IAuthenticationHandler handlerAsync;
-        if (this._handlerMap.TryGetValue(authenticationScheme, out handlerAsync))
-            return handlerAsync;
-        AuthenticationScheme schemeAsync = await this.Schemes.GetSchemeAsync(authenticationScheme);
-        if (schemeAsync == null)
-            return (IAuthenticationHandler)null;
-
-        if ((context.RequestServices.GetService(schemeAsync.HandlerType) ??
-             ActivatorUtilities.CreateInstance(context.RequestServices, schemeAsync.HandlerType)) is
-            IAuthenticationHandler handler)
-        {
-            handlerAsync = handler;
-            await handler.InitializeAsync(schemeAsync, context);
-            this._handlerMap[authenticationScheme] = handler;
-        }
-
-        return handlerAsync;
-    }
-
-
-    /// <summary>
-    /// 刷新鉴权
-    /// </summary>
-    public void RefreshAuthentication()
-    {
-        _handlerMap = new Dictionary<string, IAuthenticationHandler>((IEqualityComparer<string>)StringComparer.Ordinal);
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Builder/ApiInfoBuilderExtensions.cs

@@ -4,23 +4,13 @@ using Yi.Framework.AspNetCore.Microsoft.AspNetCore.Middlewares;
 
 namespace Yi.Framework.AspNetCore.Microsoft.AspNetCore.Builder
 {
-    /// <summary>
-    /// 提供API信息处理的应用程序构建器扩展方法
-    /// </summary>
     public static class ApiInfoBuilderExtensions
     {
-        /// <summary>
+        public static IApplicationBuilder UseYiApiHandlinge([NotNull] this IApplicationBuilder app)
-        /// 使用Yi框架的API信息处理中间件
-        /// </summary>
-        /// <param name="builder">应用程序构建器实例</param>
-        /// <returns>配置后的应用程序构建器实例</returns>
-        /// <exception cref="ArgumentNullException">当builder参数为null时抛出</exception>
-        public static IApplicationBuilder UseApiInfoHandling([NotNull] this IApplicationBuilder builder)
         {
-            // 添加API信息处理中间件到请求管道
+            app.UseMiddleware<ApiInfoMiddleware>();
-            builder.UseMiddleware<ApiInfoMiddleware>();
+            return app;
 
-            return builder;
         }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Builder/SwaggerBuilderExtensons.cs

@@ -5,101 +5,49 @@ using Volo.Abp.AspNetCore.Mvc;
 
 namespace Yi.Framework.AspNetCore.Microsoft.AspNetCore.Builder
 {
-    /// <summary>
+    public static class SwaggerBuilderExtensons
-    /// Swagger构建器扩展类
-    /// </summary>
-    public static class SwaggerBuilderExtensions
     {
-        /// <summary>
+        public static IApplicationBuilder UseYiSwagger(this IApplicationBuilder app, params SwaggerModel[] swaggerModels)
-        /// 配置并使用Yi框架的Swagger中间件
-        /// </summary>
-        /// <param name="app">应用程序构建器</param>
-        /// <param name="swaggerConfigs">Swagger配置模型数组</param>
-        /// <returns>应用程序构建器</returns>
-        public static IApplicationBuilder UseYiSwagger(
-            this IApplicationBuilder app,
-            params SwaggerConfiguration[] swaggerConfigs)
         {
-            if (app == null)
+            var mvcOptions = app.ApplicationServices.GetRequiredService<IOptions<AbpAspNetCoreMvcOptions>>().Value;
-            {
-                throw new ArgumentNullException(nameof(app));
-            }
 
-            var mvcOptions = app.ApplicationServices
-                .GetRequiredService<IOptions<AbpAspNetCoreMvcOptions>>()
-                .Value;
-
-            // 启用Swagger中间件
             app.UseSwagger();
-
+            app.UseSwaggerUI(c =>
-            // 配置SwaggerUI
-            app.UseSwaggerUI(options =>
             {
-                // 添加约定控制器的Swagger终结点
+                foreach (var setting in mvcOptions.ConventionalControllers.ConventionalControllerSettings)
-                var conventionalSettings = mvcOptions.ConventionalControllers.ConventionalControllerSettings;
-                foreach (var setting in conventionalSettings)
                 {
-                    options.SwaggerEndpoint(
+                    c.SwaggerEndpoint($"/swagger/{setting.RemoteServiceName}/swagger.json", setting.RemoteServiceName);
-                        $"/swagger/{setting.RemoteServiceName}/swagger.json",
+                }
-                        setting.RemoteServiceName);
+                if (mvcOptions.ConventionalControllers.ConventionalControllerSettings.Count==0&&swaggerModels.Length == 0)
+                {
+                    c.SwaggerEndpoint("/swagger/v1/swagger.json", "Yi.Framework");
+                }
+                else
+                {
+                    foreach (var k in swaggerModels)
+                    {
+                        c.SwaggerEndpoint(k.Url, k.Name);
+                    }
                 }
 
-                // 如果没有配置任何终结点，使用默认配置
-                if (!conventionalSettings.Any() && (swaggerConfigs == null || !swaggerConfigs.Any()))
-                {
-                    options.SwaggerEndpoint("/swagger/v1/swagger.json", "Yi.Framework");
-                    return;
-                }
-
-                // 添加自定义Swagger配置的终结点
-                if (swaggerConfigs != null)
-                {
-                    foreach (var config in swaggerConfigs)
-                    {
-                        options.SwaggerEndpoint(config.Url, config.Name);
-                    }
-                }
             });
-
             return app;
         }
+
     }
-
+    public class SwaggerModel
-    /// <summary>
-    /// Swagger配置模型
-    /// </summary>
-    public class SwaggerConfiguration
     {
-        private const string DefaultSwaggerUrl = "/swagger/v1/swagger.json";
+        public SwaggerModel(string name)
-
-        /// <summary>
-        /// Swagger JSON文档的URL
-        /// </summary>
-        public string Url { get; }
-
-        /// <summary>
-        /// Swagger文档的显示名称
-        /// </summary>
-        public string Name { get; }
-
-        /// <summary>
-        /// 使用默认URL创建Swagger配置
-        /// </summary>
-        /// <param name="name">文档显示名称</param>
-        public SwaggerConfiguration(string name)
-            : this(DefaultSwaggerUrl, name)
         {
+            this.Name = name;
+            this.Url = "/swagger/v1/swagger.json";
         }
-
+        public SwaggerModel(string url, string name)
-        /// <summary>
-        /// 创建自定义Swagger配置
-        /// </summary>
-        /// <param name="url">Swagger JSON文档URL</param>
-        /// <param name="name">文档显示名称</param>
-        public SwaggerConfiguration(string url, string name)
         {
-            Url = url ?? throw new ArgumentNullException(nameof(url));
+            this.Url = url;
-            Name = name ?? throw new ArgumentNullException(nameof(name));
+            this.Name = name;
         }
+        public string Url { get; set; }
+        public string Name { get; set; }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Middlewares/ApiInfoMiddleware.cs

@@ -1,61 +1,39 @@
 using System.Diagnostics;
+using System.Net.Http;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Json;
 using Yi.Framework.Core.Extensions;
+using static System.Net.WebRequestMethods;
 
 namespace Yi.Framework.AspNetCore.Microsoft.AspNetCore.Middlewares
 {
-    /// <summary>
-    /// API响应信息处理中间件
-    /// 主要用于处理特定文件类型的响应头信息
-    /// </summary>
     [DebuggerStepThrough]
     public class ApiInfoMiddleware : IMiddleware, ITransientDependency
     {
-        /// <summary>
+       
-        /// 处理HTTP请求的中间件方法
-        /// </summary>
-        /// <param name="context">HTTP上下文</param>
-        /// <param name="next">请求处理委托</param>
-        /// <returns>异步任务</returns>
         public async Task InvokeAsync(HttpContext context, RequestDelegate next)
         {
-            // 在响应开始时处理文件下载相关的响应头
+            context.Response.OnStarting([DebuggerStepThrough] () =>
-            context.Response.OnStarting(() =>
             {
-                HandleFileDownloadResponse(context);
+                if (context.Response.StatusCode == StatusCodes.Status200OK
+                && context.Response.Headers["Content-Type"].ToString() == "application/vnd.ms-excel")
+                {
+                    context.FileAttachmentHandle($"{DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss")}.xlsx");
+                }
+                if (context.Response.StatusCode == StatusCodes.Status200OK &&
+                context.Response.Headers["Content-Type"].ToString() == "application/x-zip-compressed")
+                {
+                    context.FileAttachmentHandle($"{DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss")}.zip");
+                }
                 return Task.CompletedTask;
             });
 
-            // 继续处理管道中的下一个中间件
             await next(context);
-        }
 
-        /// <summary>
-        /// 处理文件下载响应的响应头信息
-        /// </summary>
-        /// <param name="context">HTTP上下文</param>
-        private static void HandleFileDownloadResponse(HttpContext context)
-        {
-            // 仅处理状态码为200的响应
-            if (context.Response.StatusCode != StatusCodes.Status200OK)
-            {
-                return;
-            }
 
-            var contentType = context.Response.Headers["Content-Type"].ToString();
-            var timestamp = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss");
 
-            // 处理Excel文件下载
-            if (contentType == "application/vnd.ms-excel")
-            {
-                context.FileAttachmentHandle($"{timestamp}.xlsx");
-            }
-            // 处理ZIP文件下载
-            else if (contentType == "application/x-zip-compressed")
-            {
-                context.FileAttachmentHandle($"{timestamp}.zip");
-            }
         }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Microsoft/Extensions/DependencyInjection/SwaggerAddExtensions.cs

@@ -1,228 +1,156 @@
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Text;
+using System.Xml.Linq;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.AspNetCore.Mvc.Conventions;
 
 namespace Yi.Framework.AspNetCore.Microsoft.Extensions.DependencyInjection
 {
-    /// <summary>
-    /// Swagger生成器扩展类
-    /// </summary>
     public static class SwaggerAddExtensions
     {
-        /// <summary>
+        public static IServiceCollection AddYiSwaggerGen<Program>(this IServiceCollection services, Action<SwaggerGenOptions>? action=null)
-        /// 添加Yi框架的Swagger生成器服务
-        /// </summary>
-        /// <typeparam name="TProgram">程序入口类型</typeparam>
-        /// <param name="services">服务集合</param>
-        /// <param name="setupAction">自定义配置动作</param>
-        /// <returns>服务集合</returns>
-        public static IServiceCollection AddYiSwaggerGen<TProgram>(
-            this IServiceCollection services,
-            Action<SwaggerGenOptions>? setupAction = null)
         {
-            // 获取MVC配置选项
-            var mvcOptions = services.GetPreConfigureActions<AbpAspNetCoreMvcOptions>().Configure();
 
-            // 获取并去重远程服务名称
+            var serviceProvider = services.BuildServiceProvider();
-            var remoteServiceSettings = mvcOptions.ConventionalControllers
+            var mvcOptions = serviceProvider.GetRequiredService<IOptions<AbpAspNetCoreMvcOptions>>();
-                .ConventionalControllerSettings
+
-                .DistinctBy(x => x.RemoteServiceName);
+            var mvcSettings = mvcOptions.Value.ConventionalControllers.ConventionalControllerSettings.DistinctBy(x => x.RemoteServiceName);
+
 
             services.AddAbpSwaggerGen(
             options =>
             {
-                    // 应用外部配置
+                if (action is not null)
-                    setupAction?.Invoke(options);
-
-                    // 配置API文档分组
-                    ConfigureApiGroups(options, remoteServiceSettings);
-
-                    // 配置API文档过滤器
-                    ConfigureApiFilter(options, remoteServiceSettings);
-
-                    // 配置Schema ID生成规则
-                    options.CustomSchemaIds(type => type.FullName);
-
-                    // 包含XML注释文档
-                    IncludeXmlComments<TProgram>(options);
-
-                    // 配置JWT认证
-                    ConfigureJwtAuthentication(options);
-
-                    // 添加自定义过滤器
-                    ConfigureCustomFilters(options);
-                }
-            );
-
-            return services;
-        }
-
-        /// <summary>
-        /// 配置API分组
-        /// </summary>
-        private static void ConfigureApiGroups(
-            SwaggerGenOptions options, 
-            IEnumerable<ConventionalControllerSetting> settings)
                 {
-            foreach (var setting in settings.OrderBy(x => x.RemoteServiceName))
+                    action.Invoke(options);
+                }
+
+                // 配置分组,还需要去重,支持重写,如果外部传入后，将以外部为准
+                foreach (var setting in mvcSettings.OrderBy(x => x.RemoteServiceName))
                 {
                     if (!options.SwaggerGeneratorOptions.SwaggerDocs.ContainsKey(setting.RemoteServiceName))
                     {
-                    options.SwaggerDoc(setting.RemoteServiceName, new OpenApiInfo 
+                        options.SwaggerDoc(setting.RemoteServiceName, new OpenApiInfo { Title = setting.RemoteServiceName, Version = "v1" });
-                    { 
-                        Title = setting.RemoteServiceName, 
-                        Version = "v1" 
-                    });
-                }
                     }
                 }
 
-        /// <summary>
+                // 根据分组名称过滤 API 文档
-        /// 配置API文档过滤器
-        /// </summary>
-        private static void ConfigureApiFilter(
-            SwaggerGenOptions options,
-            IEnumerable<ConventionalControllerSetting> settings)
-        {
                 options.DocInclusionPredicate((docName, apiDesc) =>
                 {
-                if (apiDesc.ActionDescriptor is ControllerActionDescriptor controllerDesc)
+                    if (apiDesc.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor)
                     {
-                    var matchedSetting = settings
+                        var settingOrNull = mvcSettings.Where(x => x.Assembly == controllerActionDescriptor.ControllerTypeInfo.Assembly).FirstOrDefault();
-                        .FirstOrDefault(x => x.Assembly == controllerDesc.ControllerTypeInfo.Assembly);
+                        if (settingOrNull is not null)
-                    return matchedSetting?.RemoteServiceName == docName;
+                        {
+                            return docName == settingOrNull.RemoteServiceName;
+                        }
                     }
                     return false;
                 });
-        }
 
-        /// <summary>
+                options.CustomSchemaIds(type => type.FullName);
-        /// 包含XML注释文档
+                var basePath = Path.GetDirectoryName(typeof(Program).Assembly.Location);
-        /// </summary>
-        private static void IncludeXmlComments<TProgram>(SwaggerGenOptions options)
-        {
-            var basePath = Path.GetDirectoryName(typeof(TProgram).Assembly.Location);
                 if (basePath is not null)
                 {
-                foreach (var xmlFile in Directory.GetFiles(basePath, "*.xml"))
+                    foreach (var item in Directory.GetFiles(basePath, "*.xml"))
                     {
-                    options.IncludeXmlComments(xmlFile, true);
+                        options.IncludeXmlComments(item, true);
-                }
                     }
                 }
 
-        /// <summary>
+                options.AddSecurityDefinition("JwtBearer", new OpenApiSecurityScheme()
-        /// 配置JWT认证
-        /// </summary>
-        private static void ConfigureJwtAuthentication(SwaggerGenOptions options)
                 {
-            options.AddSecurityDefinition("JwtBearer", new OpenApiSecurityScheme
+                    Description = "直接输入Token即可",
-            {
-                Description = "请在此输入JWT Token",
                     Name = "Authorization",
                     In = ParameterLocation.Header,
                     Type = SecuritySchemeType.Http,
                     Scheme = "bearer"
                 });
-
+                var scheme = new OpenApiSecurityScheme()
-            var scheme = new OpenApiSecurityScheme
                 {
-                Reference = new OpenApiReference 
+                    Reference = new OpenApiReference() { Type = ReferenceType.SecurityScheme, Id = "JwtBearer" }
-                { 
-                    Type = ReferenceType.SecurityScheme, 
-                    Id = "JwtBearer" 
-                }
                 };
-
+                options.AddSecurityRequirement(new OpenApiSecurityRequirement()
-            options.AddSecurityRequirement(new OpenApiSecurityRequirement
                 {
-                [scheme] = Array.Empty<string>()
+                    [scheme] = new string[0]
                 });
-        }
 
-        /// <summary>
+                options.OperationFilter<AddRequiredHeaderParameter>();
-        /// 配置自定义过滤器
-        /// </summary>
-        private static void ConfigureCustomFilters(SwaggerGenOptions options)
-        {
-            options.OperationFilter<TenantHeaderOperationFilter>();
                 options.SchemaFilter<EnumSchemaFilter>();
             }
+        );
+
+         
+
+            return services;
+        }
     }
 
+
     /// <summary>
-    /// Swagger文档枚举字段显示过滤器
+    /// Swagger文档枚举字段显示枚举属性和枚举值,以及枚举描述
     /// </summary>
     public class EnumSchemaFilter : ISchemaFilter
     {
         /// <summary>
-        /// 应用枚举架构过滤器
+        /// 实现接口
         /// </summary>
-        /// <param name="schema">OpenAPI架构</param>
+        /// <param name="model"></param>
-        /// <param name="context">架构过滤器上下文</param>
+        /// <param name="context"></param>
-        public void Apply(OpenApiSchema schema, SchemaFilterContext context)
+
+        public void Apply(OpenApiSchema model, SchemaFilterContext context)
         {
-            if (!context.Type.IsEnum) return;
+            if (context.Type.IsEnum)
-
-            schema.Enum.Clear();
-            schema.Type = "string";
-            schema.Format = null;
-
-            var enumDescriptions = new StringBuilder();
-            foreach (var enumName in Enum.GetNames(context.Type))
             {
-                var enumValue = (Enum)Enum.Parse(context.Type, enumName);
+                model.Enum.Clear();
-                var description = GetEnumDescription(enumValue);
+                model.Type = "string";
-                var enumIntValue = Convert.ToInt64(enumValue);
+                model.Format = null;
 
-                schema.Enum.Add(new OpenApiString(enumName));
+            
-                enumDescriptions.AppendLine(
+                StringBuilder stringBuilder = new StringBuilder();
-                    $"【枚举：{enumName}{(description is null ? string.Empty : $"({description})")}={enumIntValue}】");
+                Enum.GetNames(context.Type)
+                    .ToList()
+                    .ForEach(name =>
+                    {
+                        Enum e = (Enum)Enum.Parse(context.Type, name);
+                        var descrptionOrNull = GetEnumDescription(e);
+                        model.Enum.Add(new OpenApiString(name));
+                        stringBuilder.Append($"【枚举：{name}{(descrptionOrNull is null ? string.Empty : $"({descrptionOrNull})")}={Convert.ToInt64(Enum.Parse(context.Type, name))}】<br />");
+                    });
+                model.Description= stringBuilder.ToString();
             }
-            schema.Description = enumDescriptions.ToString();
         }
 
-        /// <summary>
-        /// 获取枚举描述特性值
-        /// </summary>
         private static string? GetEnumDescription(Enum value)
         {
             var fieldInfo = value.GetType().GetField(value.ToString());
             var attributes = (DescriptionAttribute[])fieldInfo.GetCustomAttributes(typeof(DescriptionAttribute), false);
             return attributes.Length > 0 ? attributes[0].Description : null;
         }
+
     }
 
-    /// <summary>
-    /// 租户头部参数过滤器
-    /// </summary>
-    public class TenantHeaderOperationFilter : IOperationFilter
-    {
-        /// <summary>
-        /// 租户标识键名
-        /// </summary>
-        private const string TenantHeaderKey = "__tenant";
 
-        /// <summary>
+    public class AddRequiredHeaderParameter : IOperationFilter
-        /// 应用租户头部参数过滤器
+    {
-        /// </summary>
+        public static string HeaderKey { get; set; } = "__tenant";
         public void Apply(OpenApiOperation operation, OperationFilterContext context)
         {
-            operation.Parameters ??= new List<OpenApiParameter>();
+            if (operation.Parameters == null)
-            
+                operation.Parameters = new List<OpenApiParameter>();
             operation.Parameters.Add(new OpenApiParameter
             {
-                Name = TenantHeaderKey,
+                Name = HeaderKey,
                 In = ParameterLocation.Header,
                 Required = false,
                 AllowEmptyValue = true,
-                Description = "租户ID或租户名称（留空表示默认租户）"
+                Description="租户id或者租户名称（可空为默认租户）"
             });
         }
     }

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Mvc/YiConventionalRouteBuilder.cs

@@ -9,31 +9,13 @@ using Volo.Abp.Reflection;
 
 namespace Yi.Framework.AspNetCore.Mvc
 {
-    /// <summary>
-    /// 自定义路由构建器，用于生成API路由规则
-    /// </summary>
     [Dependency(ServiceLifetime.Transient, ReplaceServices = true)]
     [ExposeServices(typeof(IConventionalRouteBuilder))]
     public class YiConventionalRouteBuilder : ConventionalRouteBuilder
     {
-        /// <summary>
+        public YiConventionalRouteBuilder(IOptions<AbpConventionalControllerOptions> options) : base(options)
-        /// 构造函数
-        /// </summary>
-        /// <param name="options">ABP约定控制器配置选项</param>
-        public YiConventionalRouteBuilder(IOptions<AbpConventionalControllerOptions> options) 
-            : base(options)
         {
         }
-
-        /// <summary>
-        /// 构建API路由
-        /// </summary>
-        /// <param name="rootPath">根路径</param>
-        /// <param name="controllerName">控制器名称</param>
-        /// <param name="action">Action模型</param>
-        /// <param name="httpMethod">HTTP方法</param>
-        /// <param name="configuration">控制器配置</param>
-        /// <returns>构建的路由URL</returns>
         public override string Build(
     string rootPath,
     string controllerName,
@@ -41,97 +23,51 @@ namespace Yi.Framework.AspNetCore.Mvc
     string httpMethod,
     [CanBeNull] ConventionalControllerSetting configuration)
         {
-            // 获取API路由前缀
+
             var apiRoutePrefix = GetApiRoutePrefix(action, configuration);
+            var controllerNameInUrl =
+                NormalizeUrlControllerName(rootPath, controllerName, action, httpMethod, configuration);
 
-            // 规范化控制器名称
+            var url = $"{rootPath}/{NormalizeControllerNameCase(controllerNameInUrl, configuration)}";
-            var normalizedControllerName = NormalizeUrlControllerName(
-                rootPath, 
-                controllerName, 
-                action, 
-                httpMethod, 
-                configuration);
 
-            // 构建基础URL
+            //Add {id} path if needed
-            var url = $"{rootPath}/{NormalizeControllerNameCase(normalizedControllerName, configuration)}";
+            var idParameterModel = action.Parameters.FirstOrDefault(p => p.ParameterName == "id");
-
+            if (idParameterModel != null)
-            // 处理ID参数路由
-            url = BuildIdParameterRoute(url, action, configuration);
-
-            // 处理Action名称路由
-            url = BuildActionNameRoute(url, rootPath, controllerName, action, httpMethod, configuration);
-
-            return url;
-        }
-
-        /// <summary>
-        /// 构建ID参数路由部分
-        /// </summary>
-        private string BuildIdParameterRoute(
-            string baseUrl, 
-            ActionModel action, 
-            ConventionalControllerSetting configuration)
             {
-            var idParameter = action.Parameters.FirstOrDefault(p => p.ParameterName == "id");
+                if (TypeHelper.IsPrimitiveExtended(idParameterModel.ParameterType, includeEnums: true))
-            if (idParameter == null)
                 {
-                return baseUrl;
+                    url += "/{id}";
                 }
-
+                else
-            // 处理原始类型ID
-            if (TypeHelper.IsPrimitiveExtended(idParameter.ParameterType, includeEnums: true))
                 {
-                return $"{baseUrl}/{{id}}";
+                    var properties = idParameterModel
-            }
+                        .ParameterType
-
-            // 处理复杂类型ID
-            var properties = idParameter.ParameterType
                         .GetProperties(BindingFlags.Instance | BindingFlags.Public);
 
                     foreach (var property in properties)
                     {
-                baseUrl += $"/{{{NormalizeIdPropertyNameCase(property, configuration)}}}";
+                        url += "/{" + NormalizeIdPropertyNameCase(property, configuration) + "}";
+                    }
+                }
             }
 
-            return baseUrl;
+            //Add action name if needed
-        }
+            var actionNameInUrl = NormalizeUrlActionName(rootPath, controllerName, action, httpMethod, configuration);
-
+            if (!actionNameInUrl.IsNullOrEmpty())
-        /// <summary>
-        /// 构建Action名称路由部分
-        /// </summary>
-        private string BuildActionNameRoute(
-            string baseUrl,
-            string rootPath,
-            string controllerName,
-            ActionModel action,
-            string httpMethod,
-            ConventionalControllerSetting configuration)
             {
-            var actionNameInUrl = NormalizeUrlActionName(
+                url += $"/{NormalizeActionNameCase(actionNameInUrl, configuration)}";
-                rootPath, 
-                controllerName, 
-                action, 
-                httpMethod, 
-                configuration);
 
-            if (actionNameInUrl.IsNullOrEmpty())
+                //Add secondary Id
-            {
-                return baseUrl;
-            }
-
-            baseUrl += $"/{NormalizeActionNameCase(actionNameInUrl, configuration)}";
-
-            // 处理次要ID参数
                 var secondaryIds = action.Parameters
-                .Where(p => p.ParameterName.EndsWith("Id", StringComparison.Ordinal))
+                    .Where(p => p.ParameterName.EndsWith("Id", StringComparison.Ordinal)).ToList();
-                .ToList();
-
                 if (secondaryIds.Count == 1)
                 {
-                baseUrl += $"/{{{NormalizeSecondaryIdNameCase(secondaryIds[0], configuration)}}}";
+                    url += $"/{{{NormalizeSecondaryIdNameCase(secondaryIds[0], configuration)}}}";
+                }
             }
 
-            return baseUrl;
+            return url;
         }
+
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Mvc/YiServiceConvention.cs

@@ -13,46 +13,24 @@ using Volo.Abp.Reflection;
 
 namespace Yi.Framework.AspNetCore.Mvc
 {
-    /// <summary>
-    /// 自定义服务约定实现,用于处理API路由和HTTP方法约束
-    /// </summary>
     [Dependency(ServiceLifetime.Transient, ReplaceServices = true)]
     [ExposeServices(typeof(IAbpServiceConvention))]
     public class YiServiceConvention : AbpServiceConvention
     {
-        /// <summary>
+        public YiServiceConvention(IOptions<AbpAspNetCoreMvcOptions> options, IConventionalRouteBuilder conventionalRouteBuilder) : base(options, conventionalRouteBuilder)
-        /// 初始化服务约定的新实例
-        /// </summary>
-        /// <param name="options">ABP AspNetCore MVC 配置选项</param>
-        /// <param name="conventionalRouteBuilder">约定路由构建器</param>
-        public YiServiceConvention(
-            IOptions<AbpAspNetCoreMvcOptions> options,
-            IConventionalRouteBuilder conventionalRouteBuilder) 
-            : base(options, conventionalRouteBuilder)
         {
         }
 
-        /// <summary>
+        protected override void ConfigureSelector(string rootPath, string controllerName, ActionModel action, ConventionalControllerSetting? configuration)
-        /// 配置选择器,处理路由和HTTP方法约束
-        /// </summary>
-        protected override void ConfigureSelector(
-            string rootPath,
-            string controllerName,
-            ActionModel action,
-            ConventionalControllerSetting? configuration)
         {
-            // 移除空选择器
             RemoveEmptySelectors(action.Selectors);
 
-            // 检查远程服务特性
+            var remoteServiceAtt = ReflectionHelper.GetSingleAttributeOrDefault<RemoteServiceAttribute>(action.ActionMethod);
-            var remoteServiceAttr = ReflectionHelper
+            if (remoteServiceAtt != null && !remoteServiceAtt.IsEnabledFor(action.ActionMethod))
-                .GetSingleAttributeOrDefault<RemoteServiceAttribute>(action.ActionMethod);
-            if (remoteServiceAttr != null && !remoteServiceAttr.IsEnabledFor(action.ActionMethod))
             {
                 return;
             }
 
-            // 根据选择器是否存在执行不同的配置
             if (!action.Selectors.Any())
             {
                 AddAbpServiceSelector(rootPath, controllerName, action, configuration);
@@ -63,92 +41,56 @@ namespace Yi.Framework.AspNetCore.Mvc
             }
         }
 
-        /// <summary>
+
-        /// 规范化选择器路由
+        protected override void AddAbpServiceSelector(string rootPath, string controllerName, ActionModel action, ConventionalControllerSetting? configuration)
-        /// </summary>
+        {
-        protected override void NormalizeSelectorRoutes(
+            base.AddAbpServiceSelector(rootPath, controllerName, action, configuration);
-            string rootPath,
+        }
-            string controllerName,
+
-            ActionModel action,
+        protected override void NormalizeSelectorRoutes(string rootPath, string controllerName, ActionModel action, ConventionalControllerSetting? configuration)
-            ConventionalControllerSetting? configuration)
         {
             foreach (var selector in action.Selectors)
             {
-                // 获取HTTP方法约束
+                var httpMethod = selector.ActionConstraints
-                var httpMethod = GetOrCreateHttpMethod(selector, action, configuration);
-
-                // 处理路由模板
-                ConfigureRouteTemplate(selector, rootPath, controllerName, action, httpMethod, configuration);
-
-                // 确保HTTP方法约束存在
-                EnsureHttpMethodConstraint(selector, httpMethod);
-            }
-        }
-
-        /// <summary>
-        /// 获取或创建HTTP方法
-        /// </summary>
-        private string GetOrCreateHttpMethod(
-            SelectorModel selector,
-            ActionModel action,
-            ConventionalControllerSetting? configuration)
-        {
-            return selector.ActionConstraints
                     .OfType<HttpMethodActionConstraint>()
                     .FirstOrDefault()?
                     .HttpMethods?
-                .FirstOrDefault()
+                    .FirstOrDefault();
-                ?? SelectHttpMethod(action, configuration);
+
+                if (httpMethod == null)
+                {
+                    httpMethod = SelectHttpMethod(action, configuration);
                 }
 
-        /// <summary>
-        /// 配置路由模板
-        /// </summary>
-        private void ConfigureRouteTemplate(
-            SelectorModel selector,
-            string rootPath,
-            string controllerName,
-            ActionModel action,
-            string httpMethod,
-            ConventionalControllerSetting? configuration)
-        {
                 if (selector.AttributeRouteModel == null)
                 {
-                selector.AttributeRouteModel = CreateAbpServiceAttributeRouteModel(
+                    selector.AttributeRouteModel = CreateAbpServiceAttributeRouteModel(rootPath, controllerName, action, httpMethod, configuration);
-                    rootPath,
-                    controllerName,
-                    action,
-                    httpMethod,
-                    configuration);
                 }
                 else
                 {
-                NormalizeAttributeRouteTemplate(selector, rootPath);
-            }
-        }
              
-        /// <summary>
-        /// 规范化特性路由模板
-        /// </summary>
-        private void NormalizeAttributeRouteTemplate(SelectorModel selector, string rootPath)
-        {
                     var template = selector.AttributeRouteModel.Template;
                     if (!template.StartsWith("/"))
                     {
-                selector.AttributeRouteModel.Template = $"{rootPath}/{template}";
+                        var route = $"{rootPath}/{template}";
+                        selector.AttributeRouteModel.Template = route;
+
+                    }
+                    
+                }
+
+
+
+                if (!selector.ActionConstraints.OfType<HttpMethodActionConstraint>().Any())
+                {
+                    selector.ActionConstraints.Add(new HttpMethodActionConstraint(new[] { httpMethod }));
+                }
+
+
             }
         }
 
-        /// <summary>
+
-        /// 确保HTTP方法约束存在
+
-        /// </summary>
-        private void EnsureHttpMethodConstraint(SelectorModel selector, string httpMethod)
-        {
-            if (!selector.ActionConstraints.OfType<HttpMethodActionConstraint>().Any())
-            {
-                selector.ActionConstraints.Add(
-                    new HttpMethodActionConstraint(new[] { httpMethod }));
-            }
-        }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/RealIpHttpContextWebClientInfoProvider.cs

@@ -5,53 +5,32 @@ using Volo.Abp.AspNetCore.WebClientInfo;
 
 namespace Yi.Framework.AspNetCore;
 
-/// <summary>
-/// 真实IP地址提供程序,支持代理服务器场景
-/// </summary>
 public class RealIpHttpContextWebClientInfoProvider : HttpContextWebClientInfoProvider
 {
-    private const string XForwardedForHeader = "X-Forwarded-For";
+    public RealIpHttpContextWebClientInfoProvider(ILogger<HttpContextWebClientInfoProvider> logger,
-
+        IHttpContextAccessor httpContextAccessor) : base(logger, httpContextAccessor)
-    /// <summary>
-    /// 初始化真实IP地址提供程序的新实例
-    /// </summary>
-    public RealIpHttpContextWebClientInfoProvider(
-        ILogger<HttpContextWebClientInfoProvider> logger,
-        IHttpContextAccessor httpContextAccessor) 
-        : base(logger, httpContextAccessor)
     {
     }
 
-    /// <summary>
-    /// 获取客户端IP地址,优先从X-Forwarded-For头部获取
-    /// </summary>
-    /// <returns>客户端IP地址</returns>
     protected override string? GetClientIpAddress()
     {
         try
         {
             var httpContext = HttpContextAccessor.HttpContext;
-            if (httpContext == null)
+
+            var headers = httpContext?.Request?.Headers;
+
+            if (headers != null && headers.ContainsKey("X-Forwarded-For"))
             {
-                return null;
+                httpContext.Connection.RemoteIpAddress =
+                    IPAddress.Parse(headers["X-Forwarded-For"].FirstOrDefault());
             }
 
-            var headers = httpContext.Request?.Headers;
+            return httpContext?.Connection?.RemoteIpAddress?.ToString();
-            if (headers != null && headers.ContainsKey(XForwardedForHeader))
-            {
-                // 从X-Forwarded-For获取真实客户端IP
-                var forwardedIp = headers[XForwardedForHeader].FirstOrDefault();
-                if (!string.IsNullOrEmpty(forwardedIp))
-                {
-                    httpContext.Connection.RemoteIpAddress = IPAddress.Parse(forwardedIp);
-                }
-            }
-
-            return httpContext.Connection?.RemoteIpAddress?.ToString();
         }
         catch (Exception ex)
         {
-            Logger.LogWarning(ex, "获取客户端IP地址时发生异常");
+            Logger.LogException(ex, LogLevel.Warning);
             return null;
         }
     }

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/RemoteServiceSuccessInfo.cs

@@ -1,55 +1,49 @@
 namespace Yi.Framework.AspNetCore
 {
-    /// <summary>
-    /// 远程服务成功响应信息
-    /// </summary>
     [Serializable]
     public class RemoteServiceSuccessInfo
     {
         /// <summary>
-        /// 获取或设置响应代码
+        /// Creates a new instance of <see cref="RemoteServiceSuccessInfo"/>.
-        /// </summary>
-        public string? Code { get; private set; }
-
-        /// <summary>
-        /// 获取或设置响应消息
-        /// </summary>
-        public string? Message { get; private set; }
-
-        /// <summary>
-        /// 获取或设置详细信息
-        /// </summary>
-        public string? Details { get; private set; }
-
-        /// <summary>
-        /// 获取或设置响应数据
-        /// </summary>
-        public object? Data { get; private set; }
-
-        /// <summary>
-        /// 初始化远程服务成功响应信息的新实例
         /// </summary>
         public RemoteServiceSuccessInfo()
         {
         }
 
         /// <summary>
-        /// 使用指定参数初始化远程服务成功响应信息的新实例
+        /// Creates a new instance of <see cref="RemoteServiceSuccessInfo"/>.
         /// </summary>
-        /// <param name="message">响应消息</param>
+        /// <param name="code">Error code</param>
-        /// <param name="details">详细信息</param>
+        /// <param name="details">Error details</param>
-        /// <param name="code">响应代码</param>
+        /// <param name="message">Error message</param>
-        /// <param name="data">响应数据</param>
+        /// <param name="data">Error data</param>
-        public RemoteServiceSuccessInfo(
+        public RemoteServiceSuccessInfo(string message, string? details = null, string? code = null, object? data = null)
-            string message, 
-            string? details = null, 
-            string? code = null, 
-            object? data = null)
         {
             Message = message;
             Details = details;
             Code = code;
             Data = data;
         }
+
+        /// <summary>
+        /// code.
+        /// </summary>
+        public string? Code { get; set; }
+
+        /// <summary>
+        /// message.
+        /// </summary>
+        public string? Message { get; set; }
+
+        /// <summary>
+        /// details.
+        /// </summary>
+        public string? Details { get; set; }
+
+        /// <summary>
+        /// data.
+        /// </summary>
+        public object? Data { get; set; }
+
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/UnifyResult/Fiters/FriendlyExceptionFilter.cs

@@ -1,4 +1,4 @@
-// MIT 许可证
+// MIT 许可证
 //
 // 版权 © 2020-present 百小僧, 百签科技（广东）有限公司 和所有贡献者
 //
@@ -17,9 +17,8 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
 using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.Validation;
+using Volo.Abp.DependencyInjection;
 using Yi.Framework.Core.Extensions;
 
 namespace Yi.Framework.AspNetCore.UnifyResult.Fiters;
@@ -36,6 +35,7 @@ public sealed class FriendlyExceptionFilter : IAsyncExceptionFilter
     /// <returns></returns>
     public async Task OnExceptionAsync(ExceptionContext context)
     {
+
         // 排除 WebSocket 请求处理
         if (context.HttpContext.IsWebSocketRequest()) return;
 
@@ -44,19 +44,16 @@ public sealed class FriendlyExceptionFilter : IAsyncExceptionFilter
 
         // 解析异常信息
         var exceptionMetadata = GetExceptionMetadata(context);
-        var unifyResult = context.GetRequiredService<IUnifyResultProvider>();
+        
+        IUnifyResultProvider unifyResult = context.GetRequiredService<IUnifyResultProvider>();
         // 执行规范化异常处理
         context.Result = unifyResult.OnException(context, exceptionMetadata);
         
         // 创建日志记录器
         var logger = context.HttpContext.RequestServices.GetRequiredService<ILogger<FriendlyExceptionFilter>>();
 
-        var errorMsg = "";
-        if (exceptionMetadata.Errors != null) errorMsg = "\n" + JsonConvert.SerializeObject(exceptionMetadata.Errors);
-
-
         // 记录拦截日常
-        logger.LogError(context.Exception, context.Exception.Message + errorMsg);
+        logger.LogError(context.Exception, context.Exception.Message);
     }
 
     /// <summary>
@@ -77,25 +74,22 @@ public sealed class FriendlyExceptionFilter : IAsyncExceptionFilter
         // 判断是否是 ExceptionContext 或者 ActionExecutedContext
         var exception = context is ExceptionContext exContext
             ? exContext.Exception
-            : context is ActionExecutedContext edContext
+            : (
+                context is ActionExecutedContext edContext
                     ? edContext.Exception
-                : default;
+                    : default
-
+            );
-        if (exception is AbpValidationException validationException)
-        {
-            errors = validationException.ValidationErrors;
-            isValidationException = true;
-        }
 
         // 判断是否是友好异常
         if (exception is UserFriendlyException friendlyException)
         {
-            var statusCode2 = 500;
+            int statusCode2 = 500;
             int.TryParse(friendlyException.Code, out statusCode2);
             isFriendlyException = true;
             errorCode = friendlyException.Code;
             originErrorCode = friendlyException.Code;
-            statusCode = statusCode2 == 0 ? 403 : statusCode2;
+            statusCode = statusCode2==0?403:statusCode2;
+            isValidationException = false;
             errors = friendlyException.Message;
             data = friendlyException.Data;
         }

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/UnifyResult/UnifyResultExtensions.cs

@@ -2,7 +2,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using Volo.Abp.AspNetCore.Mvc.ExceptionHandling;
-using Volo.Abp.AspNetCore.Mvc.Response;
 using Yi.Framework.AspNetCore.UnifyResult.Fiters;
 
 namespace Yi.Framework.AspNetCore.UnifyResult;
@@ -21,10 +20,9 @@ public static class UnifyResultExtensions
         services.AddTransient<FriendlyExceptionFilter>();
         services.AddMvc(options =>
         {
-            options.Filters.RemoveAll(x => (x as ServiceFilterAttribute)?.ServiceType == typeof(AbpExceptionFilter));
-            options.Filters.RemoveAll(x => (x as ServiceFilterAttribute)?.ServiceType == typeof(AbpNoContentActionFilter));
             options.Filters.AddService<SucceededUnifyResultFilter>(99);
             options.Filters.AddService<FriendlyExceptionFilter>(100);
+            options.Filters.RemoveAll(x => (x as ServiceFilterAttribute)?.ServiceType == typeof(AbpExceptionFilter));
         });
         return services;
     }

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/YiFrameworkAspNetCoreModule.cs

@@ -1,37 +1,33 @@
-using Microsoft.AspNetCore.Authentication;
+using System.Reflection;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
+using Microsoft.OpenApi.Models;
+using Newtonsoft.Json.Linq;
+using Swashbuckle.AspNetCore.SwaggerGen;
+using Volo.Abp;
+using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.WebClientInfo;
-using Yi.Framework.AspNetCore.Microsoft.AspNetCore.Authentication;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Modularity;
+using Yi.Framework.AspNetCore.Mvc;
 using Yi.Framework.Core;
-using Yi.Framework.Core.Authentication;
 
 namespace Yi.Framework.AspNetCore
 {
-    /// <summary>
+    [DependsOn(typeof(YiFrameworkCoreModule)
-    /// Yi框架ASP.NET Core模块
+        )]
-    /// </summary>
-    [DependsOn(typeof(YiFrameworkCoreModule))]
     public class YiFrameworkAspNetCoreModule : AbpModule
     {
-        /// <summary>
-        /// 配置服务后的处理
-        /// </summary>
         public override void PostConfigureServices(ServiceConfigurationContext context)
         {
             var services = context.Services;
-
+            services.Replace(new ServiceDescriptor(typeof(IWebClientInfoProvider),
-            // 替换默认的WebClientInfoProvider为支持代理的实现
+                typeof(RealIpHttpContextWebClientInfoProvider), ServiceLifetime.Transient));
-            services.Replace(new ServiceDescriptor(
-                typeof(IWebClientInfoProvider),
-                typeof(RealIpHttpContextWebClientInfoProvider),
-                ServiceLifetime.Transient));
-
-            // 替换默认的AuthenticationHandlerProvider为支持刷新鉴权
-            services.Replace(new ServiceDescriptor(
-                typeof(IAuthenticationHandlerProvider),
-                typeof(RefreshAuthenticationHandlerProvider),
-                ServiceLifetime.Scoped));
         }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.BackgroundWorkers.Hangfire/UnitOfWorkHangfireFilter.cs

@@ -1,77 +0,0 @@
-using Hangfire.Server;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Threading;
-using Volo.Abp.Uow;
-
-namespace Yi.Framework.BackgroundWorkers.Hangfire;
-
-/// <summary>
-/// Hangfire 工作单元过滤器
-/// 用于管理后台任务的事务处理
-/// </summary>
-public sealed class UnitOfWorkHangfireFilter : IServerFilter, ISingletonDependency
-{
-    private const string UnitOfWorkItemKey = "HangfireUnitOfWork";
-    private readonly IUnitOfWorkManager _unitOfWorkManager;
-
-    /// <summary>
-    /// 初始化工作单元过滤器
-    /// </summary>
-    /// <param name="unitOfWorkManager">工作单元管理器</param>
-    public UnitOfWorkHangfireFilter(IUnitOfWorkManager unitOfWorkManager)
-    {
-        _unitOfWorkManager = unitOfWorkManager;
-    }
-
-    /// <summary>
-    /// 任务执行前的处理
-    /// </summary>
-    /// <param name="context">执行上下文</param>
-    public void OnPerforming(PerformingContext context)
-    {
-        // 开启一个工作单元并存储到上下文中
-        var uow = _unitOfWorkManager.Begin();
-        context.Items.Add(UnitOfWorkItemKey, uow);
-    }
-
-    /// <summary>
-    /// 任务执行后的处理
-    /// </summary>
-    /// <param name="context">执行上下文</param>
-    public void OnPerformed(PerformedContext context)
-    {
-        AsyncHelper.RunSync(() => OnPerformedAsync(context));
-    }
-
-    /// <summary>
-    /// 任务执行后的异步处理
-    /// </summary>
-    /// <param name="context">执行上下文</param>
-    private async Task OnPerformedAsync(PerformedContext context)
-    {
-        if (!context.Items.TryGetValue(UnitOfWorkItemKey, out var obj) || 
-            obj is not IUnitOfWork uow)
-        {
-            return;
-        }
-
-        try
-        {
-            // 如果没有异常且工作单元未完成，则提交事务
-            if (context.Exception == null && !uow.IsCompleted)
-            {
-                await uow.CompleteAsync();
-            }
-            else
-            {
-                // 否则回滚事务
-                await uow.RollbackAsync();
-            }
-        }
-        finally
-        {
-            // 确保工作单元被释放
-            uow.Dispose();
-        }
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.BackgroundWorkers.Hangfire/Yi.Framework.BackgroundWorkers.Hangfire.csproj

@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <Import Project="..\..\common.props" />
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-
-    <ItemGroup>
-        <PackageReference Include="Volo.Abp.BackgroundJobs.Hangfire" Version="$(AbpVersion)" />
-        <PackageReference Include="Volo.Abp.BackgroundWorkers.Hangfire" Version="$(AbpVersion)" />
-    </ItemGroup>
-
-
-</Project>

Yi.Abp.Net8/framework/Yi.Framework.BackgroundWorkers.Hangfire/YiFrameworkBackgroundWorkersHangfireModule.cs

@@ -1,91 +0,0 @@
-using System.Linq.Expressions;
-using Hangfire;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Volo.Abp.BackgroundJobs.Hangfire;
-using Volo.Abp.BackgroundWorkers;
-using Volo.Abp.BackgroundWorkers.Hangfire;
-using Volo.Abp.DynamicProxy;
-
-namespace Yi.Framework.BackgroundWorkers.Hangfire;
-
-/// <summary>
-/// Hangfire 后台任务模块
-/// </summary>
-[DependsOn(typeof(AbpBackgroundWorkersHangfireModule),
-    typeof(AbpBackgroundJobsHangfireModule))]
-public sealed class YiFrameworkBackgroundWorkersHangfireModule : AbpModule
-{
-    /// <summary>
-    /// 配置服务前的预处理
-    /// </summary>
-    /// <param name="context">服务配置上下文</param>
-    public override void PreConfigureServices(ServiceConfigurationContext context)
-    {
-        // 添加 Hangfire 后台任务约定注册器
-        context.Services.AddConventionalRegistrar(new YiHangfireConventionalRegistrar());
-    }
-
-    /// <summary>
-    /// 应用程序初始化
-    /// </summary>
-    /// <param name="context">应用程序初始化上下文</param>
-    public override async Task OnApplicationInitializationAsync(ApplicationInitializationContext context)
-    {
-        if (!context.ServiceProvider.GetRequiredService<IOptions<AbpBackgroundWorkerOptions>>().Value.IsEnabled)
-        {
-            return;
-        }
-
-
-        // 获取后台任务管理器和所有 Hangfire 后台任务
-        var backgroundWorkerManager = context.ServiceProvider.GetRequiredService<IBackgroundWorkerManager>();
-        var workers = context.ServiceProvider.GetServices<IHangfireBackgroundWorker>();
-
-        // 获取配置
-        var configuration = context.ServiceProvider.GetRequiredService<IConfiguration>();
-
-        // 检查是否启用 Redis
-        var isRedisEnabled = configuration.GetValue<bool>("Redis:IsEnabled");
-
-        foreach (var worker in workers)
-        {
-            // 设置时区为本地时区(上海)
-            worker.TimeZone = TimeZoneInfo.Local;
-
-            if (isRedisEnabled)
-            {
-                // Redis 模式：使用 ABP 后台任务管理器
-                await backgroundWorkerManager.AddAsync(worker);
-            }
-            else
-            {
-                // 内存模式：直接使用 Hangfire
-                var unProxyWorker = ProxyHelper.UnProxy(worker);
-
-                // 添加或更新循环任务
-                RecurringJob.AddOrUpdate(
-                    worker.RecurringJobId,
-                    (Expression<Func<Task>>)(() =>
-                        ((IHangfireBackgroundWorker)unProxyWorker).DoWorkAsync(default)),
-                    worker.CronExpression,
-                    new RecurringJobOptions
-                    {
-                        TimeZone = worker.TimeZone
-                    });
-            }
-        }
-    }
-
-    /// <summary>
-    /// 应用程序初始化前的预处理
-    /// </summary>
-    /// <param name="context">应用程序初始化上下文</param>
-    public override void OnPreApplicationInitialization(ApplicationInitializationContext context)
-    {
-        // 添加工作单元过滤器
-        var services = context.ServiceProvider;
-        GlobalJobFilters.Filters.Add(services.GetRequiredService<UnitOfWorkHangfireFilter>());
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.BackgroundWorkers.Hangfire/YiHangfireConventionalRegistrar.cs

@@ -1,34 +0,0 @@
-using Volo.Abp.BackgroundWorkers.Hangfire;
-using Volo.Abp.DependencyInjection;
-
-namespace Yi.Framework.BackgroundWorkers.Hangfire;
-
-/// <summary>
-/// Hangfire 后台任务约定注册器
-/// </summary>
-public sealed class YiHangfireConventionalRegistrar : DefaultConventionalRegistrar
-{
-    /// <summary>
-    /// 检查类型是否禁用约定注册
-    /// </summary>
-    /// <param name="type">要检查的类型</param>
-    /// <returns>如果类型不是 IHangfireBackgroundWorker 或已被禁用则返回 true</returns>
-    protected override bool IsConventionalRegistrationDisabled(Type type)
-    {
-        return !typeof(IHangfireBackgroundWorker).IsAssignableFrom(type) || 
-               base.IsConventionalRegistrationDisabled(type);
-    }
-
-    /// <summary>
-    /// 获取要暴露的服务类型列表
-    /// </summary>
-    /// <param name="type">实现类型</param>
-    /// <returns>服务类型列表</returns>
-    protected override List<Type> GetExposedServiceTypes(Type type)
-    {
-        return new List<Type>
-        {
-            typeof(IHangfireBackgroundWorker)
-        };
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.BackgroundWorkers.Hangfire/YiTokenAuthorizationFilter.cs

@@ -1,148 +0,0 @@
-using Hangfire.Dashboard;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Users;
-
-namespace Yi.Framework.BackgroundWorkers.Hangfire;
-
-/// <summary>
-/// Hangfire 仪表盘的令牌认证过滤器
-/// </summary>
-public sealed class YiTokenAuthorizationFilter : IDashboardAsyncAuthorizationFilter, ITransientDependency
-{
-    private const string BearerPrefix = "Bearer ";
-    private const string TokenCookieKey = "Token";
-    private const string HtmlContentType = "text/html";
-    
-    private readonly IServiceProvider _serviceProvider;
-    private string _requiredUsername = "cc";
-    private TimeSpan _tokenExpiration = TimeSpan.FromMinutes(10);
-
-    /// <summary>
-    /// 初始化令牌认证过滤器
-    /// </summary>
-    /// <param name="serviceProvider">服务提供者</param>
-    public YiTokenAuthorizationFilter(IServiceProvider serviceProvider)
-    {
-        _serviceProvider = serviceProvider;
-    }
-
-    /// <summary>
-    /// 设置需要的用户名
-    /// </summary>
-    /// <param name="username">允许访问的用户名</param>
-    /// <returns>当前实例，支持链式调用</returns>
-    public YiTokenAuthorizationFilter SetRequiredUsername(string username)
-    {
-        _requiredUsername = username ?? throw new ArgumentNullException(nameof(username));
-        return this;
-    }
-
-    /// <summary>
-    /// 设置令牌过期时间
-    /// </summary>
-    /// <param name="expiration">过期时间间隔</param>
-    /// <returns>当前实例，支持链式调用</returns>
-    public YiTokenAuthorizationFilter SetTokenExpiration(TimeSpan expiration)
-    {
-        _tokenExpiration = expiration;
-        return this;
-    }
-
-    /// <summary>
-    /// 授权验证
-    /// </summary>
-    /// <param name="context">仪表盘上下文</param>
-    /// <returns>是否通过授权</returns>
-    public bool Authorize(DashboardContext context)
-    {
-        var httpContext = context.GetHttpContext();
-        var currentUser = _serviceProvider.GetRequiredService<ICurrentUser>();
-
-        if (!currentUser.IsAuthenticated)
-        {
-            SetChallengeResponse(httpContext);
-            return false;
-        }
-
-        // 如果验证通过，设置 cookie
-        var authorization = httpContext.Request.Headers.Authorization.ToString();
-        if (!string.IsNullOrWhiteSpace(authorization) && authorization.StartsWith(BearerPrefix))
-        {
-            var token = authorization[BearerPrefix.Length..];
-            SetTokenCookie(httpContext, token);
-        }
-
-        return currentUser.UserName == _requiredUsername;
-    }
-
-    /// <summary>
-    /// 设置认证挑战响应
-    /// 当用户未认证时，返回一个包含令牌输入表单的HTML页面
-    /// </summary>
-    /// <param name="httpContext">HTTP 上下文</param>
-    private void SetChallengeResponse(HttpContext httpContext)
-    {
-        httpContext.Response.StatusCode = 401;
-        httpContext.Response.ContentType = HtmlContentType;
-        
-        var html = @"
-            <html>
-            <head>
-                <title>Hangfire Dashboard Authorization</title>
-                <style>
-                    body { font-family: Arial, sans-serif; margin: 40px; }
-                    .container { max-width: 400px; margin: 0 auto; }
-                    .form-group { margin-bottom: 15px; }
-                    input[type='text'] { width: 100%; padding: 8px; }
-                    button { background: #337ab7; color: white; border: none; padding: 10px 15px; cursor: pointer; }
-                    button:hover { background: #286090; }
-                </style>
-            </head>
-            <body>
-                <div class='container'>
-                    <h2>Authorization Required</h2>
-                    <div class='form-group'>
-                        <input type='text' id='token' placeholder='Enter your Bearer token...' />
-                    </div>
-                    <button onclick='authorize()'>Authorize</button>
-                </div>
-                <script>
-                    function authorize() {
-                        var token = document.getElementById('token').value;
-                        if (token) {
-                            document.cookie = 'Token=' + token + '; path=/';
-                            window.location.reload();
-                        }
-                    }
-                </script>
-            </body>
-            </html>";
-
-        httpContext.Response.WriteAsync(html);
-    }
-
-    /// <summary>
-    /// 设置令牌 Cookie
-    /// </summary>
-    /// <param name="httpContext">HTTP 上下文</param>
-    /// <param name="token">令牌值</param>
-    private void SetTokenCookie(HttpContext httpContext, string token)
-    {
-        var cookieOptions = new CookieOptions
-        {
-            Expires = DateTimeOffset.Now.Add(_tokenExpiration),
-            HttpOnly = true,
-            Secure = httpContext.Request.IsHttps,
-            SameSite = SameSiteMode.Lax
-        };
-
-        httpContext.Response.Cookies.Append(TokenCookieKey, token, cookieOptions);
-    }
-
-    public Task<bool> AuthorizeAsync(DashboardContext context)
-    {
-        return Task.FromResult(Authorize(context));
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.Caching.FreeRedis/YiDistributedCacheKeyNormalizer.cs

@@ -10,43 +10,28 @@ using Volo.Abp.MultiTenancy;
 
 namespace Yi.Framework.Caching.FreeRedis
 {
-    /// <summary>
+    [Dependency(ReplaceServices =true)]
-    /// 缓存键标准化处理器
-    /// 用于处理缓存键的格式化和多租户支持
-    /// </summary>
-    [Dependency(ReplaceServices = true)]
     public class YiDistributedCacheKeyNormalizer : IDistributedCacheKeyNormalizer, ITransientDependency
     {
-        private readonly ICurrentTenant _currentTenant;
+        protected ICurrentTenant CurrentTenant { get; }
-        private readonly AbpDistributedCacheOptions _distributedCacheOptions;
+
+        protected AbpDistributedCacheOptions DistributedCacheOptions { get; }
 
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        /// <param name="currentTenant">当前租户服务</param>
-        /// <param name="distributedCacheOptions">分布式缓存配置选项</param>
         public YiDistributedCacheKeyNormalizer(
             ICurrentTenant currentTenant,
             IOptions<AbpDistributedCacheOptions> distributedCacheOptions)
         {
-            _currentTenant = currentTenant;
+            CurrentTenant = currentTenant;
-            _distributedCacheOptions = distributedCacheOptions.Value;
+            DistributedCacheOptions = distributedCacheOptions.Value;
         }
 
-        /// <summary>
-        /// 标准化缓存键
-        /// </summary>
-        /// <param name="args">缓存键标准化参数</param>
-        /// <returns>标准化后的缓存键</returns>
         public virtual string NormalizeKey(DistributedCacheKeyNormalizeArgs args)
         {
-            // 添加全局缓存前缀
+            var normalizedKey = $"{DistributedCacheOptions.KeyPrefix}{args.Key}";
-            var normalizedKey = $"{_distributedCacheOptions.KeyPrefix}{args.Key}";
 
-            //todo 多租户支持已注释，如需启用取消注释即可
+            //if (!args.IgnoreMultiTenancy && CurrentTenant.Id.HasValue)
-            //if (!args.IgnoreMultiTenancy && _currentTenant.Id.HasValue)
             //{
-            //    normalizedKey = $"t:{_currentTenant.Id.Value},{normalizedKey}";
+            //    normalizedKey = $"t:{CurrentTenant.Id.Value},{normalizedKey}";
             //}
 
             return normalizedKey;

Yi.Abp.Net8/framework/Yi.Framework.Caching.FreeRedis/YiFrameworkCachingFreeRedisModule.cs

@@ -1,6 +1,5 @@
 using FreeRedis;
 using Microsoft.Extensions.Caching.Distributed;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Volo.Abp.Caching;
@@ -8,57 +7,26 @@ using Volo.Abp.Caching;
 namespace Yi.Framework.Caching.FreeRedis
 {
     /// <summary>
-    /// FreeRedis缓存模块
+    /// 此模块得益于FreeRedis作者支持IDistributedCache，使用湿滑
-    /// 提供基于FreeRedis的分布式缓存实现
     /// </summary>
     [DependsOn(typeof(AbpCachingModule))]
     public class YiFrameworkCachingFreeRedisModule : AbpModule
     {
-        private const string RedisEnabledKey = "Redis:IsEnabled";
-        private const string RedisConfigurationKey = "Redis:Configuration";
-
-        /// <summary>
-        /// 配置服务
-        /// </summary>
-        /// <param name="context">服务配置上下文</param>
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+
             var configuration = context.Services.GetConfiguration();
 
-            // 检查Redis是否启用
+            var redisEnabled = configuration["Redis:IsEnabled"];
-            if (!IsRedisEnabled(configuration))
+            if (redisEnabled.IsNullOrEmpty() || bool.Parse(redisEnabled))
             {
-                return;
+                var redisConfiguration = configuration["Redis:Configuration"];
-            }
+                RedisClient redisClient = new RedisClient(redisConfiguration);
-
-            // 注册Redis服务
-            RegisterRedisServices(context, configuration);
-        }
-
-        /// <summary>
-        /// 检查Redis是否启用
-        /// </summary>
-        /// <param name="configuration">配置</param>
-        /// <returns>是否启用Redis</returns>
-        private static bool IsRedisEnabled(IConfiguration configuration)
-        {
-            var redisEnabled = configuration[RedisEnabledKey];
-            return redisEnabled.IsNullOrEmpty() || bool.Parse(redisEnabled);
-        }
-
-        /// <summary>
-        /// 注册Redis相关服务
-        /// </summary>
-        /// <param name="context">服务配置上下文</param>
-        /// <param name="configuration">配置</param>
-        private static void RegisterRedisServices(ServiceConfigurationContext context, IConfiguration configuration)
-        {
-            var redisConfiguration = configuration[RedisConfigurationKey];
-            var redisClient = new RedisClient(redisConfiguration);
 
                 context.Services.AddSingleton<IRedisClient>(redisClient);
-            context.Services.Replace(ServiceDescriptor.Singleton<IDistributedCache>(
+                context.Services.Replace(ServiceDescriptor.Singleton<IDistributedCache>(new
-                new DistributedCache(redisClient)));
+                     DistributedCache(redisClient)));
+            }
         }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.Core/Authentication/AuthenticationExtensions.cs

@@ -1,18 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Yi.Framework.Core.Authentication;
-
-public static class AuthenticationExtensions
-{
-    public static void RefreshAuthentication(this HttpContext context)
-    {
-        var currentAuthenticationHandler =
-            context.RequestServices.GetRequiredService<IAuthenticationHandlerProvider>();
-        if (currentAuthenticationHandler is IRefreshAuthenticationHandlerProvider refreshAuthenticationHandler)
-        {
-            refreshAuthenticationHandler.RefreshAuthentication();
-        }
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.Core/Authentication/IRefreshAuthenticationHandlerProvider.cs

@@ -1,11 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-
-namespace Yi.Framework.Core.Authentication;
-
-public interface IRefreshAuthenticationHandlerProvider: IAuthenticationHandlerProvider
-{
-    /// <summary>
-    /// 刷新鉴权
-    /// </summary>
-    void RefreshAuthentication();
-}

Yi.Abp.Net8/framework/Yi.Framework.Core/Data/IOrderNum.cs

@@ -6,21 +6,8 @@ using System.Threading.Tasks;
 
 namespace Yi.Framework.Core.Data
 {
-    /// <summary>
-    /// 排序接口
-    /// </summary>
-    /// <remarks>
-    /// 实现此接口的实体类将支持排序功能
-    /// 通常用于列表数据的展示顺序控制
-    /// </remarks>
     public interface IOrderNum
     {
-        /// <summary>
-        /// 排序号
-        /// </summary>
-        /// <remarks>
-        /// 数字越小越靠前,默认为0
-        /// </remarks>
         int OrderNum { get; set; }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.Core/Data/IState.cs

@@ -6,21 +6,8 @@ using System.Threading.Tasks;
 
 namespace Yi.Framework.Core.Data
 {
-    /// <summary>
-    /// 状态接口
-    /// </summary>
-    /// <remarks>
-    /// 实现此接口的实体类将支持启用/禁用状态管理
-    /// 用于控制数据记录的可用状态
-    /// </remarks>
     public interface IState
     {
-        /// <summary>
+        public bool State { get; set; }
-        /// 状态标识
-        /// </summary>
-        /// <remarks>
-        /// true表示启用,false表示禁用
-        /// </remarks>
-        bool State { get; set; }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.Core/Enums/FileTypeEnum.cs

@@ -7,37 +7,14 @@ using System.Threading.Tasks;
 namespace Yi.Framework.Core.Enums
 {
     /// <summary>
-    /// 文件类型枚举
+    /// 定义公共文件路径
     /// </summary>
-    /// <remarks>
-    /// 用于定义系统支持的文件类型分类
-    /// 主要用于文件上传和存储时的类型区分
-    /// </remarks>
     public enum FileTypeEnum
     {
-        /// <summary>
+        File,
-        /// 普通文件
+        Image,
-        /// </summary>
+        Thumbnail,
-        file = 0,
+        Excel,
-
+        Temp
-        /// <summary>
-        /// 图片文件
-        /// </summary>
-        image = 1,
-
-        /// <summary>
-        /// 缩略图文件
-        /// </summary>
-        thumbnail = 2,
-
-        /// <summary>
-        /// Excel文件
-        /// </summary>
-        excel = 3,
-
-        /// <summary>
-        /// 临时文件
-        /// </summary>
-        temp = 4
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.Core/Enums/OrderByEnum.cs

@@ -6,23 +6,9 @@ using System.Threading.Tasks;
 
 namespace Yi.Framework.Core.Enums
 {
-    /// <summary>
-    /// 排序方向枚举
-    /// </summary>
-    /// <remarks>
-    /// 用于定义数据查询时的排序方向
-    /// 常用于列表数据排序
-    /// </remarks>
     public enum OrderByEnum
     {
-        /// <summary>
+        Asc,
-        /// 升序排列
+        Desc
-        /// </summary>
-        Asc = 0,
-
-        /// <summary>
-        /// 降序排列
-        /// </summary>
-        Desc = 1
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.Core/Enums/QueryOperatorEnum.cs

@@ -6,91 +6,67 @@ using System.Threading.Tasks;
 
 namespace Yi.Framework.Core.Enums
 {
-    /// <summary>
-    /// 查询操作符枚举
-    /// </summary>
-    /// <remarks>
-    /// 定义查询条件中支持的操作符类型
-    /// 用于构建动态查询条件
-    /// </remarks>
     public enum QueryOperatorEnum
     {
         /// <summary>
-        /// 等于
+        /// 相等
         /// </summary>
-        Equal = 0,
+        Equal,
-
         /// <summary>
-        /// 模糊匹配
+        /// 匹配
         /// </summary>
-        Like = 1,
+        Like,
-
         /// <summary>
         /// 大于
         /// </summary>
-        GreaterThan = 2,
+        GreaterThan,
-
         /// <summary>
         /// 大于或等于
         /// </summary>
-        GreaterThanOrEqual = 3,
+        GreaterThanOrEqual,
-
         /// <summary>
         /// 小于
         /// </summary>
-        LessThan = 4,
+        LessThan,
-
         /// <summary>
         /// 小于或等于
         /// </summary>
-        LessThanOrEqual = 5,
+        LessThanOrEqual,
-
         /// <summary>
-        /// 在指定集合中
+        /// 等于集合
         /// </summary>
-        In = 6,
+        In,
-
         /// <summary>
-        /// 不在指定集合中
+        /// 不等于集合
         /// </summary>
-        NotIn = 7,
+        NotIn,
-
         /// <summary>
-        /// 左侧模糊匹配
+        /// 左边匹配
         /// </summary>
-        LikeLeft = 8,
+        LikeLeft,
-
         /// <summary>
-        /// 右侧模糊匹配
+        /// 右边匹配
         /// </summary>
-        LikeRight = 9,
+        LikeRight,
-
         /// <summary>
-        /// 不等于
+        /// 不相等
         /// </summary>
-        NoEqual = 10,
+        NoEqual,
-
         /// <summary>
-        /// 为null或空
+        /// 为空或空
         /// </summary>
-        IsNullOrEmpty = 11,
+        IsNullOrEmpty,
-
         /// <summary>
-        /// 不为null
+        /// 不为空
         /// </summary>
-        IsNot = 12,
+        IsNot,
-
         /// <summary>
         /// 不匹配
         /// </summary>
-        NoLike = 13,
+        NoLike,
-
         /// <summary>
-        /// 日期范围
+        /// 时间段 值用 "|" 隔开
         /// </summary>
-        /// <remarks>
+        DateRange
-        /// 使用"|"分隔起始和结束日期
-        /// </remarks>
-        DateRange = 14
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.Core/Enums/ResultCodeEnum.cs

@@ -6,33 +6,26 @@ using System.Threading.Tasks;
 
 namespace Yi.Framework.Core.Enums
 {
-    /// <summary>
-    /// API返回状态码枚举
-    /// </summary>
-    /// <remarks>
-    /// 定义API接口统一的返回状态码
-    /// 遵循HTTP状态码规范
-    /// </remarks>
     public enum ResultCodeEnum
     {
         /// <summary>
-        /// 操作成功
+        /// 操作成功。
         /// </summary>
         Success = 200,
 
         /// <summary>
-        /// 未授权访问
+        /// 操作不成功
+        /// </summary>
+        NotSuccess = 500,
+
+        /// <summary>
+        /// 无权限
         /// </summary>
         NoPermission = 401,
 
         /// <summary>
-        /// 访问被拒绝
+        /// 被拒绝
         /// </summary>
-        Denied = 403,
+        Denied = 403
-
-        /// <summary>
-        /// 操作失败
-        /// </summary>
-        NotSuccess = 500
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.Core/Extensions/HttpContextExtensions.cs

@@ -4,131 +4,110 @@ using Microsoft.AspNetCore.Http;
 
 namespace Yi.Framework.Core.Extensions
 {
-    /// <summary>
-    /// HttpContext扩展方法类
-    /// </summary>
     public static class HttpContextExtensions
     {
         /// <summary>
-        /// 设置内联文件下载响应头
+        /// 设置文件下载名称
         /// </summary>
-        /// <param name="httpContext">HTTP上下文</param>
+        /// <param name="httpContext"></param>
-        /// <param name="fileName">文件名</param>
+        /// <param name="fileName"></param>
         public static void FileInlineHandle(this HttpContext httpContext, string fileName)
         {
-            var encodeFilename = System.Web.HttpUtility.UrlEncode(fileName, Encoding.UTF8);
+            string encodeFilename = System.Web.HttpUtility.UrlEncode(fileName, Encoding.GetEncoding("UTF-8"));
-            httpContext.Response.Headers.Add("Content-Disposition", $"inline;filename={encodeFilename}");
+            httpContext.Response.Headers.Add("Content-Disposition", "inline;filename=" + encodeFilename);
+
         }
 
         /// <summary>
-        /// 设置附件下载响应头
+        /// 设置文件附件名称
         /// </summary>
-        /// <param name="httpContext">HTTP上下文</param>
+        /// <param name="httpContext"></param>
-        /// <param name="fileName">文件名</param>
+        /// <param name="fileName"></param>
         public static void FileAttachmentHandle(this HttpContext httpContext, string fileName)
         {
-            var encodeFilename = System.Web.HttpUtility.UrlEncode(fileName, Encoding.UTF8);
+            string encodeFilename = System.Web.HttpUtility.UrlEncode(fileName, Encoding.GetEncoding("UTF-8"));
-            httpContext.Response.Headers.Add("Content-Disposition", $"attachment;filename={encodeFilename}");
+            httpContext.Response.Headers.Add("Content-Disposition", "attachment;filename=" + encodeFilename);
+
         }
 
         /// <summary>
-        /// 获取客户端首选语言
+        /// 获取语言种类
         /// </summary>
-        /// <param name="httpContext">HTTP上下文</param>
+        /// <param name="httpContext"></param>
-        /// <returns>语言代码,默认返回zh-CN</returns>
+        /// <returns></returns>
         public static string GetLanguage(this HttpContext httpContext)
         {
-            const string defaultLanguage = "zh-CN";
+            string res = "zh-CN";
-            var acceptLanguage = httpContext.Request.Headers["Accept-Language"].FirstOrDefault();
+            var str = httpContext.Request.Headers["Accept-Language"].FirstOrDefault();
+            if (str is not null)
+            {
+                res = str.Split(",")[0];
+            }
+            return res;
 
-            return string.IsNullOrEmpty(acceptLanguage) 
-                ? defaultLanguage 
-                : acceptLanguage.Split(',')[0];
         }
 
         /// <summary>
-        /// 判断是否为Ajax请求
+        /// 判断是否为异步请求
         /// </summary>
-        /// <param name="request">HTTP请求</param>
+        /// <param name="request"></param>
-        /// <returns>是否为Ajax请求</returns>
+        /// <returns></returns>
         public static bool IsAjaxRequest(this HttpRequest request)
         {
-            const string ajaxHeader = "XMLHttpRequest";
+            string header = request.Headers["X-Requested-With"];
-            return ajaxHeader.Equals(request.Headers["X-Requested-With"], 
+            return "XMLHttpRequest".Equals(header);
-                StringComparison.OrdinalIgnoreCase);
         }
-
         /// <summary>
-        /// 获取客户端IP地址
+        /// 获取客户端IP
         /// </summary>
-        /// <param name="context">HTTP上下文</param>
+        /// <param name="context"></param>
-        /// <returns>客户端IP地址</returns>
+        /// <returns></returns>
         public static string GetClientIp(this HttpContext context)
         {
-            const string localhost = "127.0.0.1";
+            if (context == null) return "";
-            if (context == null) return string.Empty;
+            var result = context.Request.Headers["X-Forwarded-For"].FirstOrDefault();
-
+            if (string.IsNullOrEmpty(result))
-            // 尝试获取X-Forwarded-For头
-            var ip = context.Request.Headers["X-Forwarded-For"].FirstOrDefault();
-            
-            // 如果没有代理头,则获取远程IP
-            if (string.IsNullOrEmpty(ip))
             {
-                ip = context.Connection.RemoteIpAddress?.ToString();
+                result = context.Connection.RemoteIpAddress?.ToString();
             }
+            if (string.IsNullOrEmpty(result) || result.Contains("::1"))
+                result = "127.0.0.1";
 
-            // 处理特殊IP
+            result = result.Replace("::ffff:", "127.0.0.1");
-            if (string.IsNullOrEmpty(ip) || ip.Contains("::1"))
+            //如果有端口号，删除端口号
-            {
+            result = Regex.Replace(result, @":\d{1,5}$", "");
-                return localhost;
+            //Ip规则校验
-            }
+            var regResult = 
+                Regex.IsMatch(result, @"^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$")
+                || Regex.IsMatch(result, @"^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?):\d{1,5}$");
 
-            // 清理IPv6格式
+            result = regResult ? result : "127.0.0.1";
-            ip = ip.Replace("::ffff:", localhost);
+            return result;
-            
-            // 移除端口号
-            ip = Regex.Replace(ip, @":\d{1,5}$", "");
-
-            // 验证IP格式
-            var isValidIp = Regex.IsMatch(ip, @"^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$") || 
-                           Regex.IsMatch(ip, @"^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?):\d{1,5}$");
-
-            return isValidIp ? ip : localhost;
         }
 
         /// <summary>
-        /// 获取User-Agent信息
+        /// 获取浏览器标识
         /// </summary>
-        /// <param name="context">HTTP上下文</param>
+        /// <param name="context"></param>
-        /// <returns>User-Agent字符串</returns>
+        /// <returns></returns>
         public static string GetUserAgent(this HttpContext context)
         {
-            return context.Request.Headers["User-Agent"].ToString();
+            return context.Request.Headers["User-Agent"];
         }
 
-        /// <summary>
-        /// 获取用户权限声明值
-        /// </summary>
-        /// <param name="context">HTTP上下文</param>
-        /// <param name="permissionsName">权限声明名称</param>
-        /// <returns>权限值数组</returns>
         public static string[]? GetUserPermissions(this HttpContext context, string permissionsName)
         {
-            return context.User.Claims
+            return context.User.Claims.Where(x => x.Type == permissionsName).Select(x => x.Value).ToArray();
-                .Where(x => x.Type == permissionsName)
-                .Select(x => x.Value)
-                .ToArray();
         }
         
         /// <summary>
-        /// 判断是否为WebSocket请求
+        /// 判断是否是 WebSocket 请求
         /// </summary>
-        /// <param name="context">HTTP上下文</param>
+        /// <param name="context"></param>
-        /// <returns>是否为WebSocket请求</returns>
+        /// <returns></returns>
         public static bool IsWebSocketRequest(this HttpContext context)
         {
-            return context.WebSockets.IsWebSocketRequest || 
+            return context.WebSockets.IsWebSocketRequest || context.Request.Path == "/ws";
-                   context.Request.Path == "/ws";
         }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/MimeHelper.cs

@@ -45,8 +45,8 @@ namespace Yi.Framework.Core.Helper
         {
             var extension = Path.GetExtension(fileName);
             if (ImageType.Contains(extension.ToLower()))
-                return FileTypeEnum.image;
+                return FileTypeEnum.Image;
-            return FileTypeEnum.file;
+            return FileTypeEnum.File;
 
 
         }

Yi.Abp.Net8/framework/Yi.Framework.Core/Json/DatetimeJsonConverter.cs

@@ -1,50 +0,0 @@
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace Yi.Framework.Core.Json;
-
-/// <summary>
-/// DateTime JSON序列化转换器
-/// </summary>
-public class DatetimeJsonConverter : JsonConverter<DateTime>
-{
-    private readonly string _dateFormat;
-
-    /// <summary>
-    /// 初始化DateTime转换器
-    /// </summary>
-    /// <param name="format">日期格式化字符串,默认为yyyy-MM-dd HH:mm:ss</param>
-    public DatetimeJsonConverter(string format = "yyyy-MM-dd HH:mm:ss")
-    {
-        _dateFormat = format;
-    }
-
-    /// <summary>
-    /// 从JSON读取DateTime值
-    /// </summary>
-    /// <param name="reader">JSON读取器</param>
-    /// <param name="typeToConvert">目标类型</param>
-    /// <param name="options">JSON序列化选项</param>
-    /// <returns>DateTime值</returns>
-    public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-    {
-        if (reader.TokenType == JsonTokenType.String)
-        {
-            return DateTime.TryParse(reader.GetString(), out DateTime dateTime) 
-                ? dateTime 
-                : reader.GetDateTime();
-        }
-        return reader.GetDateTime();
-    }
-
-    /// <summary>
-    /// 将DateTime写入JSON
-    /// </summary>
-    /// <param name="writer">JSON写入器</param>
-    /// <param name="value">DateTime值</param>
-    /// <param name="options">JSON序列化选项</param>
-    public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
-    {
-        writer.WriteStringValue(value.ToString(_dateFormat));
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.Core/Modularity/YiModuleManager.cs

@@ -8,81 +8,52 @@ using Volo.Abp.Modularity;
 
 namespace Yi.Framework.Core.Modularity;
 
-/// <summary>
+[Dependency(ReplaceServices =true)]
-/// Yi框架模块管理器
-/// </summary>
-[Dependency(ReplaceServices = true)]
 public class YiModuleManager : ModuleManager, IModuleManager, ISingletonDependency
 {
     private readonly IModuleContainer _moduleContainer;
     private readonly IEnumerable<IModuleLifecycleContributor> _lifecycleContributors;
     private readonly ILogger<YiModuleManager> _logger;
 
-    /// <summary>
+    public YiModuleManager(IModuleContainer moduleContainer, ILogger<YiModuleManager> logger, IOptions<AbpModuleLifecycleOptions> options, IServiceProvider serviceProvider) : base(moduleContainer, logger, options, serviceProvider)
-    /// 初始化模块管理器
-    /// </summary>
-    public YiModuleManager(
-        IModuleContainer moduleContainer,
-        ILogger<YiModuleManager> logger,
-        IOptions<AbpModuleLifecycleOptions> options,
-        IServiceProvider serviceProvider) 
-        : base(moduleContainer, logger, options, serviceProvider)
     {
         _moduleContainer = moduleContainer;
         _logger = logger;
-        _lifecycleContributors = options.Value.Contributors
+        _lifecycleContributors = options.Value.Contributors.Select(serviceProvider.GetRequiredService).Cast<IModuleLifecycleContributor>().ToArray();
-            .Select(serviceProvider.GetRequiredService)
-            .Cast<IModuleLifecycleContributor>()
-            .ToArray();
     }
 
-    /// <summary>
-    /// 初始化所有模块
-    /// </summary>
-    /// <param name="context">应用程序初始化上下文</param>
     public override async Task InitializeModulesAsync(ApplicationInitializationContext context)
     {
+
         _logger.LogDebug("==========模块Initialize初始化统计-跳过0ms模块==========");
-        
+        var total = 0;
-        var moduleCount = 0;
+        var watch =new Stopwatch();
-        var stopwatch = new Stopwatch();
+        long totalTime = 0;
-        var totalTime = 0L;
-
         foreach (var contributor in _lifecycleContributors)
         {
             foreach (var module in _moduleContainer.Modules)
             {
                 try
                 {
-                    stopwatch.Restart();
+                    watch.Restart();
                     await contributor.InitializeAsync(context, module.Instance);
-                    stopwatch.Stop();
+                    watch.Stop();
-                    
+                    totalTime += watch.ElapsedMilliseconds;
-                    totalTime += stopwatch.ElapsedMilliseconds;
+                    total++;
-                    moduleCount++;
+                    if (watch.ElapsedMilliseconds > 1)
-
-                    // 仅记录耗时超过1ms的模块
-                    if (stopwatch.ElapsedMilliseconds > 1)
                     {
-                        _logger.LogDebug(
+                        _logger.LogDebug($"耗时-{watch.ElapsedMilliseconds}ms,已加载模块-{module.Assembly.GetName().Name}");
-                            "耗时-{Time}ms,已加载模块-{ModuleName}", 
-                            stopwatch.ElapsedMilliseconds,
-                            module.Assembly.GetName().Name);
                     }
+                   
                 }
                 catch (Exception ex)
                 {
-                    throw new AbpInitializationException(
+                    throw new AbpInitializationException($"An error occurred during the initialize {contributor.GetType().FullName} phase of the module {module.Type.AssemblyQualifiedName}: {ex.Message}. See the inner exception for details.", ex);
-                        $"模块 {module.Type.AssemblyQualifiedName} 在 {contributor.GetType().FullName} 阶段初始化失败: {ex.Message}",
-                        ex);
                 }
             }
         }
      
-        _logger.LogInformation(
+        _logger.LogInformation($"==========【{total}】个模块初始化执行完毕，总耗时【{totalTime}ms】==========");
-            "==========【{Count}】个模块初始化执行完毕，总耗时【{Time}ms】==========",
-            moduleCount,
-            totalTime);
     }
     
 }

Yi.Abp.Net8/framework/Yi.Framework.Core/Options/SemanticKernelOptions.cs

@@ -1,8 +0,0 @@
-namespace Yi.Framework.Core.Options;
-
-public class SemanticKernelOptions
-{
-    public List<string> ModelIds { get; set; }
-    public string Endpoint { get; set; }
-    public string ApiKey { get; set; }
-}

Yi.Abp.Net8/framework/Yi.Framework.Core/YiFrameworkCoreModule.cs

@@ -2,28 +2,8 @@
 
 namespace Yi.Framework.Core
 {
-    /// <summary>
+    public class YiFrameworkCoreModule:AbpModule
-    /// Yi框架核心模块
-    /// </summary>
-    /// <remarks>
-    /// 提供框架的基础功能和核心服务
-    /// </remarks>
-    public class YiFrameworkCoreModule : AbpModule
     {
-        /// <summary>
-        /// 配置服务
-        /// </summary>
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            base.ConfigureServices(context);
-        }
 
-        /// <summary>
-        /// 应用程序初始化
-        /// </summary>
-        public override void OnApplicationInitialization(ApplicationInitializationContext context)
-        {
-            base.OnApplicationInitialization(context);
-        }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application.Contracts/IDeletesAppService.cs

@@ -3,17 +3,8 @@ using Volo.Abp.Application.Services;
 
 namespace Yi.Framework.Ddd.Application.Contracts
 {
-    /// <summary>
+    public interface IDeletesAppService<in TKey> : IDeleteAppService< TKey> , IApplicationService, IRemoteService
-    /// 批量删除服务接口
-    /// </summary>
-    /// <typeparam name="TKey">主键类型</typeparam>
-    public interface IDeletesAppService<in TKey> : IDeleteAppService<TKey>, IApplicationService, IRemoteService
     {
-        /// <summary>
-        /// 批量删除实体
-        /// </summary>
-        /// <param name="ids">要删除的实体ID集合</param>
-        /// <returns>删除操作的异步任务</returns>
         Task DeleteAsync(IEnumerable<TKey> ids);
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application.Contracts/IPageTimeResultRequestDto.cs

@@ -2,19 +2,9 @@
 
 namespace Yi.Framework.Ddd.Application.Contracts
 {
-    /// <summary>
-    /// 带时间范围的分页查询请求接口
-    /// </summary>
     public interface IPageTimeResultRequestDto : IPagedAndSortedResultRequest
     {
-        /// <summary>
-        /// 查询开始时间
-        /// </summary>
         DateTime? StartTime { get; set; }
-
-        /// <summary>
-        /// 查询结束时间
-        /// </summary>
         DateTime? EndTime { get; set; }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application.Contracts/IPagedAllResultRequestDto.cs

@@ -2,9 +2,6 @@
 
 namespace Yi.Framework.Ddd.Application.Contracts
 {
-    /// <summary>
-    /// 分页查询请求接口，包含时间范围和排序功能
-    /// </summary>
     public interface IPagedAllResultRequestDto : IPageTimeResultRequestDto, IPagedAndSortedResultRequest
     {
     }

Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application.Contracts/IYiCrudAppService.cs

@@ -7,47 +7,24 @@ using Volo.Abp.Application.Services;
 
 namespace Yi.Framework.Ddd.Application.Contracts
 {
-    /// <summary>
-    /// Yi框架CRUD服务基础接口
-    /// </summary>
-    /// <typeparam name="TEntityDto">实体DTO类型</typeparam>
-    /// <typeparam name="TKey">主键类型</typeparam>
     public interface IYiCrudAppService<TEntityDto, in TKey> : ICrudAppService<TEntityDto, TKey>
     {
     }
 
-    /// <summary>
-    /// Yi框架CRUD服务接口（带查询输入）
-    /// </summary>
-    /// <typeparam name="TEntityDto">实体DTO类型</typeparam>
-    /// <typeparam name="TKey">主键类型</typeparam>
-    /// <typeparam name="TGetListInput">查询输入类型</typeparam>
     public interface IYiCrudAppService<TEntityDto, in TKey, in TGetListInput> : ICrudAppService<TEntityDto, TKey, TGetListInput>
     {
     }
 
-    /// <summary>
-    /// Yi框架CRUD服务接口（带查询输入和创建输入）
-    /// </summary>
-    /// <typeparam name="TEntityDto">实体DTO类型</typeparam>
-    /// <typeparam name="TKey">主键类型</typeparam>
-    /// <typeparam name="TGetListInput">查询输入类型</typeparam>
-    /// <typeparam name="TCreateInput">创建输入类型</typeparam>
     public interface IYiCrudAppService<TEntityDto, in TKey, in TGetListInput, in TCreateInput> : ICrudAppService<TEntityDto, TKey, TGetListInput, TCreateInput>
     {
     }
 
-    /// <summary>
-    /// Yi框架CRUD服务接口（带查询、创建和更新输入）
-    /// </summary>
     public interface IYiCrudAppService<TEntityDto, in TKey, in TGetListInput, in TCreateInput, in TUpdateInput> : ICrudAppService<TEntityDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
     {
     }
 
-    /// <summary>
-    /// Yi框架完整CRUD服务接口（包含所有操作和批量删除功能）
-    /// </summary>
     public interface IYiCrudAppService<TGetOutputDto, TGetListOutputDto, in TKey, in TGetListInput, in TCreateInput, in TUpdateInput> : ICrudAppService<TGetOutputDto, TGetListOutputDto, TKey, TGetListInput, TCreateInput, TUpdateInput>, IDeletesAppService<TKey>
     {
+
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application.Contracts/PagedAllResultRequestDto.cs

@@ -2,51 +2,49 @@
 
 namespace Yi.Framework.Ddd.Application.Contracts
 {
-    /// <summary>
-    /// 分页查询请求DTO，包含时间范围和自定义排序功能
-    /// </summary>
     public class PagedAllResultRequestDto : PagedAndSortedResultRequestDto, IPagedAllResultRequestDto
     {
         /// <summary>
-        /// 查询开始时间
+        /// 查询开始时间条件
         /// </summary>
         public DateTime? StartTime { get; set; }
 
         /// <summary>
-        /// 查询结束时间
+        /// 查询结束时间条件
         /// </summary>
         public DateTime? EndTime { get; set; }
 
         /// <summary>
-        /// 排序列名
+        /// 排序列名，字段名对应前端
         /// </summary>
         public string? OrderByColumn { get; set; }
 
         /// <summary>
-        /// 排序方向（ascending/descending）
+        /// 是否顺序，字段名对应前端
         /// </summary>
         public string? IsAsc { get; set; }
 
         /// <summary>
-        /// 是否为升序排序
+        /// 是否顺序
         /// </summary>
-        public bool IsAscending => string.Equals(IsAsc, "ascending", StringComparison.OrdinalIgnoreCase);
+        public bool CanAsc => IsAsc?.ToLower() == "ascending" ? true : false;
 
-        private string? _sorting;
+        private string _sorting;
 
-        /// <summary>
+        //排序引用
-        /// 排序表达式
+        public new string? Sorting
-        /// </summary>
-        public override string? Sorting
         {
             get
             {
-                if (!string.IsNullOrWhiteSpace(OrderByColumn))
+                if (!OrderByColumn.IsNullOrWhiteSpace())
                 {
-                    return $"{OrderByColumn} {(IsAscending ? "ASC" : "DESC")}";
+                    return $"{OrderByColumn} {(CanAsc ? "ASC" : "DESC")}";
                 }
+                else
+                {
                     return _sorting;
                 }
+            }
             set => _sorting = value;
         }
     }

Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application.Contracts/YiFrameworkDddApplicationContractsModule.cs

@@ -3,9 +3,6 @@ using Volo.Abp.Modularity;
 
 namespace Yi.Framework.Ddd.Application.Contracts
 {
-    /// <summary>
-    /// Yi框架DDD应用层契约模块
-    /// </summary>
     [DependsOn(typeof(AbpDddApplicationContractsModule))]
     public class YiFrameworkDddApplicationContractsModule : AbpModule
     {

Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/YiCacheCrudAppService.cs

@@ -6,19 +6,11 @@ using Volo.Abp.MultiTenancy;
 
 namespace Yi.Framework.Ddd.Application
 {
-    /// <summary>
+    public abstract class YiCacheCrudAppService<TEntity, TEntityDto, TKey> : YiCrudAppService<TEntity, TEntityDto, TKey, PagedAndSortedResultRequestDto>
-    /// 带缓存的CRUD应用服务基类
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <typeparam name="TEntityDto">实体DTO类型</typeparam>
-    /// <typeparam name="TKey">主键类型</typeparam>
-    public abstract class YiCacheCrudAppService<TEntity, TEntityDto, TKey> 
-        : YiCrudAppService<TEntity, TEntityDto, TKey, PagedAndSortedResultRequestDto>
           where TEntity : class, IEntity<TKey>
           where TEntityDto : IEntityDto<TKey>
     {
-        protected YiCacheCrudAppService(IRepository<TEntity, TKey> repository) 
+        protected YiCacheCrudAppService(IRepository<TEntity, TKey> repository) : base(repository)
-            : base(repository)
         {
         }
     }
@@ -55,92 +47,73 @@ namespace Yi.Framework.Ddd.Application
     }
 
 
-    /// <summary>
-    /// 完整的带缓存CRUD应用服务实现
-    /// </summary>
     public abstract class YiCacheCrudAppService<TEntity, TGetOutputDto, TGetListOutputDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
         : YiCrudAppService<TEntity, TGetOutputDto, TGetListOutputDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
     where TEntity : class, IEntity<TKey>
     where TGetOutputDto : IEntityDto<TKey>
     where TGetListOutputDto : IEntityDto<TKey>
     {
-        /// <summary>
+        protected IDistributedCache<TEntity> Cache => LazyServiceProvider.LazyGetRequiredService<IDistributedCache<TEntity>>();
-        /// 分布式缓存访问器
-        /// </summary>
-        private IDistributedCache<TEntity> EntityCache => 
-            LazyServiceProvider.LazyGetRequiredService<IDistributedCache<TEntity>>();
 
-        /// <summary>
+        protected string GetCacheKey(TKey id) => typeof(TEntity).Name + ":" + CurrentTenant.Id ?? Guid.Empty + ":" + id.ToString();
-        /// 获取缓存键
+        protected YiCacheCrudAppService(IRepository<TEntity, TKey> repository) : base(repository)
-        /// </summary>
-        protected virtual string GenerateCacheKey(TKey id) => 
-            $"{typeof(TEntity).Name}:{CurrentTenant.Id ?? Guid.Empty}:{id}";
-
-        protected YiCacheCrudAppService(IRepository<TEntity, TKey> repository) 
-            : base(repository)
         {
         }
 
-        /// <summary>
-        /// 更新实体并清除缓存
-        /// </summary>
         public override async Task<TGetOutputDto> UpdateAsync(TKey id, TUpdateInput input) 
         {
-            var result = await base.UpdateAsync(id, input);
+            var output = await base.UpdateAsync(id, input);
-            await EntityCache.RemoveAsync(GenerateCacheKey(id));
+            await Cache.RemoveAsync(GetCacheKey(id));
-            return result;
+            return output;
         }
 
-        /// <summary>
+        public override async Task<PagedResultDto<TGetListOutputDto>> GetListAsync(TGetListInput input)
-        /// 获取实体列表(需要继承实现具体的缓存策略)
-        /// </summary>
-        public override Task<PagedResultDto<TGetListOutputDto>> GetListAsync(TGetListInput input)
         {
-            // 建议实现两种缓存策略:
+            //两种方式：
-            // 1. 全表缓存: 适用于数据量小且变动不频繁的场景
+            //1：全表缓存，使用缓存直接查询
-            // 2. 按需缓存: 仅缓存常用数据,适用于大数据量场景
+            //2：非全部缓存，查询到的数据直接添加到缓存
-            throw new NotImplementedException("请实现具体的缓存查询策略");
+
+            //判断是否该实体为全表缓存
+            throw new NotImplementedException();
+
+            //IDistributedCache 有局限性，条件查询无法进行缓存了
+            //if (true)
+            //{
+            //    return await GetListByCacheAsync(input);
+            //}
+            //else
+            //{
+            //    return await GetListByDbAsync(input);
+            //}
+
         }
 
-        /// <summary>
+        protected virtual async Task<PagedResultDto<TGetListOutputDto>> GetListByDbAsync(TGetListInput input)
-        /// 从数据库获取实体列表
-        /// </summary>
-        protected virtual Task<PagedResultDto<TGetListOutputDto>> GetListFromDatabaseAsync(
-            TGetListInput input)
         {
+            //如果不是全表缓存，可以走这个啦
+            throw new NotImplementedException();
+        }
+        protected virtual async Task<PagedResultDto<TGetListOutputDto>> GetListByCacheAsync(TGetListInput input)
+        {
+            //如果是全表缓存，可以走这个啦
             throw new NotImplementedException();
         }
 
-        /// <summary>
-        /// 从缓存获取实体列表
-        /// </summary>
-        protected virtual Task<PagedResultDto<TGetListOutputDto>> GetListFromCacheAsync(
-            TGetListInput input)
-        {
-            throw new NotImplementedException(); 
-        }
 
-        /// <summary>
-        /// 获取单个实体(优先从缓存获取)
-        /// </summary>
         protected override async Task<TEntity> GetEntityByIdAsync(TKey id)
         {
-            return (await EntityCache.GetOrAddAsync(
+            var output = await Cache.GetOrAddAsync(GetCacheKey(id), async () => await base.GetEntityByIdAsync(id));
-                GenerateCacheKey(id),
+            return output!;
-                async () => await base.GetEntityByIdAsync(id)))!;
         }
 
-        /// <summary>
+        public override async Task DeleteAsync(IEnumerable<TKey> id)
-        /// 批量删除实体并清除缓存
-        /// </summary>
-        public override async Task DeleteAsync(IEnumerable<TKey> ids)
         {
-            await base.DeleteAsync(ids);
+            await base.DeleteAsync(id);
+            foreach (var itemId in id)
+            {
+                await Cache.RemoveAsync(GetCacheKey(itemId));
+            }
 
-            // 批量清除缓存
-            var tasks = ids.Select(id => 
-                EntityCache.RemoveAsync(GenerateCacheKey(id)));
-            await Task.WhenAll(tasks);
         }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/YiCrudAppService.cs

@@ -8,198 +8,126 @@ using Volo.Abp.Domain.Repositories;
 
 namespace Yi.Framework.Ddd.Application
 {
-    /// <summary>
+    public abstract class
-    /// CRUD应用服务基类 - 基础版本
+        YiCrudAppService<TEntity, TEntityDto, TKey> : YiCrudAppService<TEntity, TEntityDto, TKey,
-    /// </summary>
+        PagedAndSortedResultRequestDto>
-    public abstract class YiCrudAppService<TEntity, TEntityDto, TKey>
-        : YiCrudAppService<TEntity, TEntityDto, TKey, PagedAndSortedResultRequestDto>
         where TEntity : class, IEntity<TKey>
         where TEntityDto : IEntityDto<TKey>
     {
-        protected YiCrudAppService(IRepository<TEntity, TKey> repository)
+        protected YiCrudAppService(IRepository<TEntity, TKey> repository) : base(repository)
-            : base(repository)
         {
         }
     }
 
-    /// <summary>
-    /// CRUD应用服务基类 - 支持自定义查询输入
-    /// </summary>
     public abstract class YiCrudAppService<TEntity, TEntityDto, TKey, TGetListInput>
         : YiCrudAppService<TEntity, TEntityDto, TKey, TGetListInput, TEntityDto>
         where TEntity : class, IEntity<TKey>
         where TEntityDto : IEntityDto<TKey>
     {
-        protected YiCrudAppService(IRepository<TEntity, TKey> repository)
+        protected YiCrudAppService(IRepository<TEntity, TKey> repository) : base(repository)
-            : base(repository)
         {
         }
     }
 
-    /// <summary>
+
-    /// CRUD应用服务基类 - 支持自定义创建输入
-    /// </summary>
     public abstract class YiCrudAppService<TEntity, TEntityDto, TKey, TGetListInput, TCreateInput>
         : YiCrudAppService<TEntity, TEntityDto, TKey, TGetListInput, TCreateInput, TCreateInput>
         where TEntity : class, IEntity<TKey>
         where TEntityDto : IEntityDto<TKey>
     {
-        protected YiCrudAppService(IRepository<TEntity, TKey> repository)
+        protected YiCrudAppService(IRepository<TEntity, TKey> repository) : base(repository)
-            : base(repository)
         {
         }
     }
 
-    /// <summary>
-    /// CRUD应用服务基类 - 支持自定义更新输入
-    /// </summary>
     public abstract class YiCrudAppService<TEntity, TEntityDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
         : YiCrudAppService<TEntity, TEntityDto, TEntityDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
         where TEntity : class, IEntity<TKey>
         where TEntityDto : IEntityDto<TKey>
     {
-        protected YiCrudAppService(IRepository<TEntity, TKey> repository)
+        protected YiCrudAppService(IRepository<TEntity, TKey> repository) : base(repository)
-            : base(repository)
         {
         }
     }
 
-    /// <summary>
+
-    /// CRUD应用服务基类 - 完整实现
+    public abstract class YiCrudAppService<TEntity, TGetOutputDto, TGetListOutputDto, TKey, TGetListInput, TCreateInput,
-    /// </summary>
+        TUpdateInput>
-    public abstract class YiCrudAppService<TEntity, TGetOutputDto, TGetListOutputDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
         : CrudAppService<TEntity, TGetOutputDto, TGetListOutputDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
         where TEntity : class, IEntity<TKey>
         where TGetOutputDto : IEntityDto<TKey>
         where TGetListOutputDto : IEntityDto<TKey>
     {
-        /// <summary>
+        protected YiCrudAppService(IRepository<TEntity, TKey> repository) : base(repository)
-        /// 临时文件存储路径
-        /// </summary>
-        private const string TempFilePath = "/wwwroot/temp";
-
-        protected YiCrudAppService(IRepository<TEntity, TKey> repository)
-            : base(repository)
         {
         }
 
-        /// <summary>
-        /// 更新实体
-        /// </summary>
-        /// <param name="id">实体ID</param>
-        /// <param name="input">更新输入</param>
-        /// <returns>更新后的实体DTO</returns>
         public override async Task<TGetOutputDto> UpdateAsync(TKey id, TUpdateInput input)
         {
-            // 检查更新权限
             await CheckUpdatePolicyAsync();
 
-            // 获取并验证实体
             var entity = await GetEntityByIdAsync(id);
+            await CheckUpdateInputDtoAsync(entity,input);
 
-            // 检查更新输入
-            await CheckUpdateInputDtoAsync(entity, input);
-
-            // 映射并更新实体
             await MapToEntityAsync(input, entity);
             await Repository.UpdateAsync(entity, autoSave: true);
 
             return await MapToGetOutputDtoAsync(entity);
         }
 
-        /// <summary>
+        protected virtual Task CheckUpdateInputDtoAsync(TEntity entity,TUpdateInput input)
-        /// 检查更新输入数据的有效性
-        /// </summary>
-        protected virtual Task CheckUpdateInputDtoAsync(TEntity entity, TUpdateInput input)
         {
             return Task.CompletedTask;
         }
 
-        /// <summary>
-        /// 创建实体
-        /// </summary>
-        /// <param name="input">创建输入</param>
-        /// <returns>创建后的实体DTO</returns>
         public override async Task<TGetOutputDto> CreateAsync(TCreateInput input)
         {
-            // 检查创建权限
             await CheckCreatePolicyAsync();
-
-            // 检查创建输入
             await CheckCreateInputDtoAsync(input);
-
-            // 映射到实体
             var entity = await MapToEntityAsync(input);
 
-            // 设置租户ID
             TryToSetTenantId(entity);
 
-            // 插入实体
             await Repository.InsertAsync(entity, autoSave: true);
 
             return await MapToGetOutputDtoAsync(entity);
         }
 
-        /// <summary>
-        /// 检查创建输入数据的有效性
-        /// </summary>
         protected virtual Task CheckCreateInputDtoAsync(TCreateInput input)
         {
             return Task.CompletedTask;
         }
 
         /// <summary>
-        /// 获取实体列表
+        /// 多查
         /// </summary>
-        /// <param name="input">查询输入</param>
+        /// <param name="input"></param>
-        /// <returns>分页结果</returns>
+        /// <returns></returns>
         public override async Task<PagedResultDto<TGetListOutputDto>> GetListAsync(TGetListInput input)
         {
-            List<TEntity> entities;
+            List<TEntity>? entites = null;
-
+            //区分多查还是批量查
-            // 根据输入类型决定查询方式
             if (input is IPagedResultRequest pagedInput)
             {
-                // 分页查询
+                entites = await Repository.GetPagedListAsync(pagedInput.SkipCount, pagedInput.MaxResultCount,
-                entities = await Repository.GetPagedListAsync(
+                    string.Empty);
-                    pagedInput.SkipCount,
-                    pagedInput.MaxResultCount,
-                    string.Empty
-                );
             }
             else
             {
-                // 查询全部
+                entites = await Repository.GetListAsync();
-                entities = await Repository.GetListAsync();
             }
 
-            // 获取总数并映射结果
+            var total = await Repository.GetCountAsync();
-            var totalCount = await Repository.GetCountAsync();
+            var output = await MapToGetListOutputDtosAsync(entites);
-            var dtos = await MapToGetListOutputDtosAsync(entities);
+            return new PagedResultDto<TGetListOutputDto>(total, output);
-
+            //throw new NotImplementedException($"【{typeof(TEntity)}】实体的CrudAppService，查询为具体业务，通用查询几乎无实际场景，请重写实现！");
-            return new PagedResultDto<TGetListOutputDto>(totalCount, dtos);
         }
 
         /// <summary>
-        /// 获取实体动态下拉框列表，子类重写该方法，通过 keywords 进行筛选
+        /// 多删
         /// </summary>
-        /// <param name="keywords">查询关键字</param>
+        /// <param name="id"></param>
         /// <returns></returns>
-        public virtual async Task<PagedResultDto<TGetListOutputDto>> GetSelectDataListAsync(string? keywords = null)
-        {
-            List<TEntity> entities = await Repository.GetListAsync();
-
-            // 获取总数并映射结果
-            var totalCount = entities.Count;
-            var dtos = await MapToGetListOutputDtosAsync(entities);
-
-            return new PagedResultDto<TGetListOutputDto>(totalCount, dtos);
-        }
-
-        /// <summary>
-        /// 批量删除实体
-        /// </summary>
-        /// <param name="id">实体ID集合</param>
         [RemoteService(isEnabled: true)]
         public virtual async Task DeleteAsync(IEnumerable<TKey> id)
         {
@@ -207,61 +135,56 @@ namespace Yi.Framework.Ddd.Application
         }
 
         /// <summary>
-        /// 单个删除实体(禁用远程访问)
+        /// 偷梁换柱
         /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
         [RemoteService(isEnabled: false)]
         public override Task DeleteAsync(TKey id)
         {
             return base.DeleteAsync(id);
         }
 
+
         /// <summary>
-        /// 导出Excel
+        /// 导出excel
         /// </summary>
-        /// <param name="input">查询条件</param>
+        /// <param name="input"></param>
-        /// <returns>Excel文件</returns>
+        /// <returns></returns>
         public virtual async Task<IActionResult> GetExportExcelAsync(TGetListInput input)
         {
-            // 重置分页参数以获取全部数据
             if (input is IPagedResultRequest paged)
             {
                 paged.SkipCount = 0;
                 paged.MaxResultCount = LimitedResultRequestDto.MaxMaxResultCount;
             }
 
-            // 获取数据
+            var output = await this.GetListAsync(input);
-            var output = await GetListAsync(input);
+            var dirPath = $"/wwwroot/temp";
 
-            // 确保临时目录存在
+            var fileName = $"{typeof(TEntity).Name}_{DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss")}_{Guid.NewGuid()}";
-            if (!Directory.Exists(TempFilePath))
+            var filePath = $"{dirPath}/{fileName}.xlsx";
+            if (!Directory.Exists(dirPath))
             {
-                Directory.CreateDirectory(TempFilePath);
+                Directory.CreateDirectory(dirPath);
             }
 
-            // 生成文件名和路径
+            MiniExcel.SaveAs(filePath, output.Items);
-            var fileName = GenerateExcelFileName();
-            var filePath = Path.Combine(TempFilePath, fileName);
-
-            // 保存Excel文件
-            await MiniExcel.SaveAsAsync(filePath, output.Items);
-
             return new PhysicalFileResult(filePath, "application/vnd.ms-excel");
         }
 
         /// <summary>
-        /// 生成Excel文件名
+        /// 导入excle
         /// </summary>
-        private string GenerateExcelFileName()
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public virtual async Task PostImportExcelAsync(List<TCreateInput> input)
         {
-            return $"{typeof(TEntity).Name}_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{Guid.NewGuid()}.xlsx";
+            var entities = input.Select(x => MapToEntity(x)).ToList();
-        }
+            //安全起见，该接口需要自己实现
-
+            throw new NotImplementedException();
-        /// <summary>
+            //await Repository.DeleteManyAsync(entities.Select(x => x.Id));
-        /// 导入Excel(需要实现类重写此方法)
+            //await Repository.InsertManyAsync(entities);
-        /// </summary>
-        public virtual Task PostImportExcelAsync(List<TCreateInput> input)
-        {
-            throw new NotImplementedException("请在实现类中重写此方法以支持Excel导入");
         }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/YiFrameworkDddApplicationModule.cs

@@ -6,34 +6,14 @@ using Yi.Framework.Ddd.Application.Contracts;
 
 namespace Yi.Framework.Ddd.Application
 {
-    /// <summary>
+    [DependsOn(typeof(AbpDddApplicationModule),
-    /// Yi框架DDD应用层模块
+        typeof(YiFrameworkDddApplicationContractsModule))]
-    /// </summary>
-    [DependsOn(
-        typeof(AbpDddApplicationModule),
-        typeof(YiFrameworkDddApplicationContractsModule)
-    )]
     public class YiFrameworkDddApplicationModule : AbpModule
     {
-        /// <summary>
-        /// 应用程序初始化配置
-        /// </summary>
-        /// <param name="context">应用程序初始化上下文</param>
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
         {
-            // 配置分页查询的默认值和最大值限制
+            //分页限制
-            ConfigureDefaultPagingSettings();
-        }
-
-        /// <summary>
-        /// 配置默认分页设置
-        /// </summary>
-        private void ConfigureDefaultPagingSettings()
-        {
-            // 设置默认每页显示记录数
             LimitedResultRequestDto.DefaultMaxResultCount = 10;
-            
-            // 设置最大允许的每页记录数
             LimitedResultRequestDto.MaxMaxResultCount = 10000;
         }
     }

Yi.Abp.Net8/framework/Yi.Framework.Mapster/MapsterAutoObjectMappingProvider.cs

@@ -8,37 +8,17 @@ using Volo.Abp.ObjectMapping;
 
 namespace Yi.Framework.Mapster
 {
-    /// <summary>
-    /// Mapster自动对象映射提供程序
-    /// 实现IAutoObjectMappingProvider接口，提供对象间的自动映射功能
-    /// </summary>
     public class MapsterAutoObjectMappingProvider : IAutoObjectMappingProvider
     {
-        /// <summary>
-        /// 将源对象映射到目标类型
-        /// </summary>
-        /// <typeparam name="TSource">源类型</typeparam>
-        /// <typeparam name="TDestination">目标类型</typeparam>
-        /// <param name="source">源对象</param>
-        /// <returns>映射后的目标类型实例</returns>
         public TDestination Map<TSource, TDestination>(object source)
         {
-            // 使用Mapster的Adapt方法进行对象映射
+            var sss = typeof(TDestination).Name;
             return source.Adapt<TDestination>();
         }
 
-        /// <summary>
-        /// 将源对象映射到现有的目标对象
-        /// </summary>
-        /// <typeparam name="TSource">源类型</typeparam>
-        /// <typeparam name="TDestination">目标类型</typeparam>
-        /// <param name="source">源对象</param>
-        /// <param name="destination">目标对象</param>
-        /// <returns>映射后的目标对象</returns>
         public TDestination Map<TSource, TDestination>(TSource source, TDestination destination)
         {
-            // 使用Mapster的Adapt方法进行对象映射，保留目标对象的实例
+            return source.Adapt<TSource, TDestination>(destination);
-            return source.Adapt(destination);
         }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.Mapster/MapsterObjectMapper.cs

@@ -7,51 +7,18 @@ using Volo.Abp.ObjectMapping;
 
 namespace Yi.Framework.Mapster
 {
-    /// <summary>
-    /// Mapster对象映射器
-    /// 实现IObjectMapper接口，提供对象映射功能
-    /// </summary>
     public class MapsterObjectMapper : IObjectMapper
     {
-        private readonly IAutoObjectMappingProvider _autoObjectMappingProvider;
+        public IAutoObjectMappingProvider AutoObjectMappingProvider => throw new NotImplementedException();
 
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        /// <param name="autoObjectMappingProvider">自动对象映射提供程序</param>
-        public MapsterObjectMapper(IAutoObjectMappingProvider autoObjectMappingProvider)
-        {
-            _autoObjectMappingProvider = autoObjectMappingProvider;
-        }
-
-        /// <summary>
-        /// 获取自动对象映射提供程序
-        /// </summary>
-        public IAutoObjectMappingProvider AutoObjectMappingProvider => _autoObjectMappingProvider;
-
-        /// <summary>
-        /// 将源对象映射到目标类型
-        /// </summary>
-        /// <typeparam name="TSource">源类型</typeparam>
-        /// <typeparam name="TDestination">目标类型</typeparam>
-        /// <param name="source">源对象</param>
-        /// <returns>映射后的目标类型实例</returns>
         public TDestination Map<TSource, TDestination>(TSource source)
         {
-            return AutoObjectMappingProvider.Map<TSource, TDestination>(source);
+            throw new NotImplementedException();
         }
 
-        /// <summary>
-        /// 将源对象映射到现有的目标对象
-        /// </summary>
-        /// <typeparam name="TSource">源类型</typeparam>
-        /// <typeparam name="TDestination">目标类型</typeparam>
-        /// <param name="source">源对象</param>
-        /// <param name="destination">目标对象</param>
-        /// <returns>映射后的目标对象</returns>
         public TDestination Map<TSource, TDestination>(TSource source, TDestination destination)
         {
-            return AutoObjectMappingProvider.Map(source, destination);
+            throw new NotImplementedException();
         }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.Mapster/YiFrameworkMapsterModule.cs

@@ -1,33 +1,21 @@
+using MapsterMapper;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Volo.Abp.Modularity;
 using Volo.Abp.ObjectMapping;
 using Yi.Framework.Core;
-using Mapster;
 
 namespace Yi.Framework.Mapster
 {
-    /// <summary>
+    [DependsOn(typeof(YiFrameworkCoreModule),
-    /// Yi框架Mapster模块
+
-    /// 用于配置和注册Mapster相关服务
-    /// </summary>
-    [DependsOn(
-        typeof(YiFrameworkCoreModule),
         typeof(AbpObjectMappingModule)
         )]
     public class YiFrameworkMapsterModule : AbpModule
     {
-        /// <summary>
-        /// 配置服务
-        /// </summary>
-        /// <param name="context">服务配置上下文</param>
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var services = context.Services;
+            context.Services.AddTransient<IAutoObjectMappingProvider, MapsterAutoObjectMappingProvider>();
-            // 扫描并注册所有映射配置 
-            TypeAdapterConfig.GlobalSettings.Scan(AppDomain.CurrentDomain.GetAssemblies());
-            // 注册Mapster相关服务
-            services.AddTransient<IAutoObjectMappingProvider, MapsterAutoObjectMappingProvider>();
-            services.AddTransient<IObjectMapper, MapsterObjectMapper>();
         }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.SemanticKernel/Yi.Framework.SemanticKernel.csproj

@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\..\common.props" />
-
-    <ItemGroup>
-        <ProjectReference Include="..\Yi.Framework.Core\Yi.Framework.Core.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <PackageReference Include="Microsoft.SemanticKernel" Version="1.57.0" />
-    </ItemGroup>
-</Project>

Yi.Abp.Net8/framework/Yi.Framework.SemanticKernel/YiFrameworkSemanticKernelModule.cs

@@ -1,15 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.SemanticKernel;
-using Yi.Framework.Core.Options;
-
-namespace Yi.Framework.SemanticKernel;
-
-public class YiFrameworkSemanticKernelModule : AbpModule
-{
-    public override void ConfigureServices(ServiceConfigurationContext context)
-    {
-        var configuration = context.Services.GetConfiguration();
-        var services = context.Services;
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/DbConnOptions.cs

@@ -1,16 +1,11 @@
 using SqlSugar;
-using ArgumentException = System.ArgumentException;
 
 namespace Yi.Framework.SqlSugarCore.Abstractions
 {
-    /// <summary>
-    /// 数据库连接配置选项
-    /// </summary>
     public class DbConnOptions
     {
         /// <summary>
-        /// 主数据库连接字符串
+        /// 连接字符串(如果开启多租户，也就是默认库了)，必填
-        /// 如果开启多租户，此为默认租户数据库
         /// </summary>
         public string? Url { get; set; }
 
@@ -20,48 +15,44 @@ namespace Yi.Framework.SqlSugarCore.Abstractions
         public DbType? DbType { get; set; }
 
         /// <summary>
-        /// 是否启用种子数据初始化
+        /// 开启种子数据
         /// </summary>
         public bool EnabledDbSeed { get; set; } = false;
 
         /// <summary>
-        /// 是否启用驼峰命名转下划线命名
+        /// 开启驼峰转下划线
         /// </summary>
         public bool EnableUnderLine { get; set; } = false;
 
         /// <summary>
-        /// 是否启用Code First模式
+        /// 开启codefirst
         /// </summary>
         public bool EnabledCodeFirst { get; set; } = false;
 
         /// <summary>
-        /// 是否启用SQL日志记录
+        /// 开启sql日志
         /// </summary>
         public bool EnabledSqlLog { get; set; } = true;
 
         /// <summary>
-        /// 实体类所在程序集名称列表
+        /// 实体程序集
         /// </summary>
         public List<string>? EntityAssembly { get; set; }
 
         /// <summary>
-        /// 是否启用读写分离
+        /// 开启读写分离
         /// </summary>
         public bool EnabledReadWrite { get; set; } = false;
 
         /// <summary>
-        /// 只读数据库连接字符串列表
+        /// 读写分离
         /// </summary>
         public List<string>? ReadUrl { get; set; }
 
         /// <summary>
-        /// 是否启用SaaS多租户
+        /// 开启Saas多租户
         /// </summary>
         public bool EnabledSaasMultiTenancy { get; set; } = false;
 
-        /// <summary>
-        /// 是否开启更新并发乐观锁
-        /// </summary>
-        public bool EnabledConcurrencyException { get;set; } = false;
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/DefaultTenantTableAttribute.cs

@@ -4,13 +4,10 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Yi.Framework.SqlSugarCore.Abstractions;
+namespace Yi.Framework.SqlSugarCore.Abstractions
-
-/// <summary>
-/// 默认租户表特性
-/// 标记此特性的实体类将在默认租户数据库中创建表
-/// </summary>
-[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
-public sealed class DefaultTenantTableAttribute : Attribute
 {
+    [AttributeUsage(AttributeTargets.Class)]
+    public class DefaultTenantTableAttribute : Attribute
+    {
+    }
 }

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/ISqlSugarDbConnectionCreator.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using SqlSugar;
+
+namespace Yi.Framework.SqlSugarCore.Abstractions
+{
+    public interface ISqlSugarDbConnectionCreator
+    {
+        DbConnOptions Options { get; }
+        Action<ISqlSugarClient> OnSqlSugarClientConfig { get; set; }
+        Action<object, DataAfterModel> DataExecuted { get; set; }
+        Action<object, DataFilterModel> DataExecuting { get; set; }
+        Action<string, SugarParameter[]> OnLogExecuting { get; set; }
+        Action<string, SugarParameter[]> OnLogExecuted { get; set; }
+        Action<PropertyInfo, EntityColumnInfo> EntityService { get; set; }
+
+        ConnectionConfig Build(Action<ConnectionConfig>? action = null);
+        void SetDbAop(ISqlSugarClient currentDb);
+    }
+}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/ISqlSugarDbContext.cs

@@ -8,19 +8,16 @@ using Volo.Abp.DependencyInjection;
 
 namespace Yi.Framework.SqlSugarCore.Abstractions
 {
-    /// <summary>
-    /// SqlSugar数据库上下文接口
-    /// </summary>
     public interface ISqlSugarDbContext
     {
-        /// <summary>
+        //  IAbpLazyServiceProvider LazyServiceProvider { get; set; }
-        /// 获取SqlSugar客户端实例
-        /// </summary>
         ISqlSugarClient SqlSugarClient { get; }
+        DbConnOptions Options { get; }
 
         /// <summary>
-        /// 执行数据库备份
+        /// 数据库备份
         /// </summary>
         void BackupDataBase();
+        void SetSqlSugarClient(ISqlSugarClient sqlSugarClient);
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/ISqlSugarDbContextDependencies.cs

@@ -1,57 +0,0 @@
-using System.Reflection;
-using SqlSugar;
-
-namespace Yi.Framework.SqlSugarCore.Abstractions;
-
-/// <summary>
-/// SqlSugar数据库上下文依赖接口
-/// 定义数据库操作的各个生命周期钩子
-/// </summary>
-public interface ISqlSugarDbContextDependencies
-{
-    /// <summary>
-    /// 获取执行顺序
-    /// </summary>
-    int ExecutionOrder { get; }
-    
-    /// <summary>
-    /// SqlSugar客户端配置时触发
-    /// </summary>
-    /// <param name="sqlSugarClient">SqlSugar客户端实例</param>
-    void OnSqlSugarClientConfig(ISqlSugarClient sqlSugarClient);
-
-    /// <summary>
-    /// 数据执行后触发
-    /// </summary>
-    /// <param name="oldValue">原始值</param>
-    /// <param name="entityInfo">实体信息</param>
-    void DataExecuted(object oldValue, DataAfterModel entityInfo);
-
-    /// <summary>
-    /// 数据执行前触发
-    /// </summary>
-    /// <param name="oldValue">原始值</param>
-    /// <param name="entityInfo">实体信息</param>
-    void DataExecuting(object oldValue, DataFilterModel entityInfo);
-
-    /// <summary>
-    /// SQL执行前触发
-    /// </summary>
-    /// <param name="sql">SQL语句</param>
-    /// <param name="parameters">SQL参数</param>
-    void OnLogExecuting(string sql, SugarParameter[] parameters);
-
-    /// <summary>
-    /// SQL执行后触发
-    /// </summary>
-    /// <param name="sql">SQL语句</param>
-    /// <param name="parameters">SQL参数</param>
-    void OnLogExecuted(string sql, SugarParameter[] parameters);
-    
-    /// <summary>
-    /// 实体服务配置
-    /// </summary>
-    /// <param name="propertyInfo">属性信息</param>
-    /// <param name="entityColumnInfo">实体列信息</param>
-    void EntityService(PropertyInfo propertyInfo, EntityColumnInfo entityColumnInfo);
-}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/ISqlSugarRepository.cs

@@ -2,246 +2,87 @@
 using SqlSugar;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Uow;
 
 namespace Yi.Framework.SqlSugarCore.Abstractions
 {
-    /// <summary>
+
-    /// SqlSugar仓储接口
+    public interface ISqlSugarRepository<TEntity>:IRepository<TEntity> where TEntity : class, IEntity,new ()
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    public interface ISqlSugarRepository<TEntity> : IRepository<TEntity>, IUnitOfWorkEnabled 
-        where TEntity : class, IEntity, new()
     {
-        #region 数据库访问器
-
-        /// <summary>
-        /// 获取SqlSugar客户端实例
-        /// </summary>
         ISqlSugarClient _Db { get; }
-
-        /// <summary>
-        /// 获取查询构造器
-        /// </summary>
         ISugarQueryable<TEntity> _DbQueryable { get; }
 
-        /// <summary>
-        /// 异步获取数据库上下文
-        /// </summary>
         Task<ISqlSugarClient> GetDbContextAsync();
-
-        /// <summary>
-        /// 获取删除操作构造器
-        /// </summary>
         Task<IDeleteable<TEntity>> AsDeleteable();
-
+        Task<IInsertable<TEntity>> AsInsertable(List<TEntity> insertObjs);
-        /// <summary>
+        Task<IInsertable<TEntity>> AsInsertable(TEntity insertObj);
-        /// 获取插入操作构造器
+        Task<IInsertable<TEntity>> AsInsertable(TEntity[] insertObjs);
-        /// </summary>
-        Task<IInsertable<TEntity>> AsInsertable(TEntity entity);
-
-        /// <summary>
-        /// 获取批量插入操作构造器
-        /// </summary>
-        Task<IInsertable<TEntity>> AsInsertable(List<TEntity> entities);
-
-        /// <summary>
-        /// 获取查询构造器
-        /// </summary>
         Task<ISugarQueryable<TEntity>> AsQueryable();
-
-        /// <summary>
-        /// 获取SqlSugar客户端
-        /// </summary>
         Task<ISqlSugarClient> AsSugarClient();
-
-        /// <summary>
-        /// 获取租户操作接口
-        /// </summary>
         Task<ITenant> AsTenant();
-
+        Task<IUpdateable<TEntity>> AsUpdateable(List<TEntity> updateObjs);
-        /// <summary>
+        Task<IUpdateable<TEntity>> AsUpdateable(TEntity updateObj);
-        /// 获取更新操作构造器
-        /// </summary>
         Task<IUpdateable<TEntity>> AsUpdateable();
+        Task<IUpdateable<TEntity>> AsUpdateable(TEntity[] updateObjs);
 
-        /// <summary>
+        #region 单查
-        /// 获取实体更新操作构造器
+        //单查
-        /// </summary>
-        Task<IUpdateable<TEntity>> AsUpdateable(TEntity entity);
-
-        /// <summary>
-        /// 获取批量更新操作构造器
-        /// </summary>
-        Task<IUpdateable<TEntity>> AsUpdateable(List<TEntity> entities);
-
-        #endregion
-
-        #region 查询操作
-
-        /// <summary>
-        /// 根据主键获取实体
-        /// </summary>
         Task<TEntity> GetByIdAsync(dynamic id);
+        Task<TEntity> GetSingleAsync(Expression<Func<TEntity, bool>> whereExpression);
+        Task<TEntity> GetFirstAsync(Expression<Func<TEntity, bool>> whereExpression);
+        Task<bool> IsAnyAsync(Expression<Func<TEntity, bool>> whereExpression);
+        Task<int> CountAsync(Expression<Func<TEntity, bool>> whereExpression);
 
-        /// <summary>
+        #endregion
-        /// 获取满足条件的单个实体
-        /// </summary>
-        Task<TEntity> GetSingleAsync(Expression<Func<TEntity, bool>> predicate);
 
-        /// <summary>
-        /// 获取满足条件的第一个实体
-        /// </summary>
-        Task<TEntity> GetFirstAsync(Expression<Func<TEntity, bool>> predicate);
 
-        /// <summary>
+        #region 多查
-        /// 判断是否存在满足条件的实体
+        //多查
-        /// </summary>
-        Task<bool> IsAnyAsync(Expression<Func<TEntity, bool>> predicate);
-
-        /// <summary>
-        /// 获取满足条件的实体数量
-        /// </summary>
-        Task<int> CountAsync(Expression<Func<TEntity, bool>> predicate);
-
-        /// <summary>
-        /// 获取所有实体
-        /// </summary>
         Task<List<TEntity>> GetListAsync();
-
+        Task<List<TEntity>> GetListAsync(Expression<Func<TEntity, bool>> whereExpression);
-        /// <summary>
-        /// 获取满足条件的所有实体
-        /// </summary>
-        Task<List<TEntity>> GetListAsync(Expression<Func<TEntity, bool>> predicate);
-
         #endregion
 
-        #region 分页查询
-
-        /// <summary>
-        /// 获取分页数据
-        /// </summary>
-        Task<List<TEntity>> GetPageListAsync(
-            Expression<Func<TEntity, bool>> predicate,
-            int pageIndex,
-            int pageSize);
-
-        /// <summary>
-        /// 获取排序的分页数据
-        /// </summary>
-        Task<List<TEntity>> GetPageListAsync(
-            Expression<Func<TEntity, bool>> predicate,
-            int pageIndex,
-            int pageSize,
-            Expression<Func<TEntity, object>>? orderByExpression = null,
-            OrderByType orderByType = OrderByType.Asc);
 
+        #region 分页查
+        //分页查
+        Task<List<TEntity>> GetPageListAsync(Expression<Func<TEntity, bool>> whereExpression, int pageNum, int pageSize);
+        Task<List<TEntity>> GetPageListAsync(Expression<Func<TEntity, bool>> whereExpression, int pageNum, int pageSize, Expression<Func<TEntity, object>>? orderByExpression = null, OrderByType orderByType = OrderByType.Asc);
         #endregion
 
-        #region 插入操作
+        #region 插入
-
+        //插入
-        /// <summary>
+        Task<bool> InsertAsync(TEntity insertObj);
-        /// 插入实体
+        Task<bool> InsertOrUpdateAsync(TEntity data);
-        /// </summary>
+        Task<bool> InsertOrUpdateAsync(List<TEntity> datas);
-        Task<bool> InsertAsync(TEntity entity);
+        Task<int> InsertReturnIdentityAsync(TEntity insertObj);
-
+        Task<long> InsertReturnBigIdentityAsync(TEntity insertObj);
-        /// <summary>
+        Task<long> InsertReturnSnowflakeIdAsync(TEntity insertObj);
-        /// 插入或更新实体
+        Task<TEntity> InsertReturnEntityAsync(TEntity insertObj);
-        /// </summary>
+        Task<bool> InsertRangeAsync(List<TEntity> insertObjs);
-        Task<bool> InsertOrUpdateAsync(TEntity entity);
-
-        /// <summary>
-        /// 批量插入或更新实体
-        /// </summary>
-        Task<bool> InsertOrUpdateAsync(List<TEntity> entities);
-
-        /// <summary>
-        /// 插入实体并返回自增主键
-        /// </summary>
-        Task<int> InsertReturnIdentityAsync(TEntity entity);
-
-        /// <summary>
-        /// 插入实体并返回长整型自增主键
-        /// </summary>
-        Task<long> InsertReturnBigIdentityAsync(TEntity entity);
-
-        /// <summary>
-        /// 插入实体并返回雪花ID
-        /// </summary>
-        Task<long> InsertReturnSnowflakeIdAsync(TEntity entity);
-
-        /// <summary>
-        /// 插入实体并返回实体
-        /// </summary>
-        Task<TEntity> InsertReturnEntityAsync(TEntity entity);
-
-        /// <summary>
-        /// 批量插入实体
-        /// </summary>
-        Task<bool> InsertRangeAsync(List<TEntity> entities);
-
         #endregion
 
-        #region 更新操作
-
-        /// <summary>
-        /// 更新实体
-        /// </summary>
-        Task<bool> UpdateAsync(TEntity entity);
-
-        /// <summary>
-        /// 批量更新实体
-        /// </summary>
-        Task<bool> UpdateRangeAsync(List<TEntity> entities);
-
-        /// <summary>
-        /// 条件更新指定列
-        /// </summary>
-        Task<bool> UpdateAsync(
-            Expression<Func<TEntity, TEntity>> columns,
-            Expression<Func<TEntity, bool>> predicate);
 
+        #region 更新
+        //更新
+        Task<bool> UpdateAsync(TEntity updateObj);
+        Task<bool> UpdateRangeAsync(List<TEntity> updateObjs);
+        Task<bool> UpdateAsync(Expression<Func<TEntity, TEntity>> columns, Expression<Func<TEntity, bool>> whereExpression);
         #endregion
 
-        #region 删除操作
+        #region 删除
-
+        //删除
-        /// <summary>
+        Task<bool> DeleteAsync(TEntity deleteObj);
-        /// 删除实体
+        Task<bool> DeleteAsync(List<TEntity> deleteObjs);
-        /// </summary>
+        Task<bool> DeleteAsync(Expression<Func<TEntity, bool>> whereExpression);
-        Task<bool> DeleteAsync(TEntity entity);
-
-        /// <summary>
-        /// 批量删除实体
-        /// </summary>
-        Task<bool> DeleteAsync(List<TEntity> entities);
-
-        /// <summary>
-        /// 条件删除
-        /// </summary>
-        Task<bool> DeleteAsync(Expression<Func<TEntity, bool>> predicate);
-
-        /// <summary>
-        /// 根据主键删除
-        /// </summary>
         Task<bool> DeleteByIdAsync(dynamic id);
-
-        /// <summary>
-        /// 根据主键批量删除
-        /// </summary>
         Task<bool> DeleteByIdsAsync(dynamic[] ids);
-
         #endregion
+
     }
 
-    /// <summary>
+
-    /// SqlSugar仓储接口(带主键)
+    public interface ISqlSugarRepository<TEntity, TKey> : ISqlSugarRepository<TEntity>,IRepository<TEntity, TKey> where TEntity : class, IEntity<TKey>, new()
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <typeparam name="TKey">主键类型</typeparam>
-    public interface ISqlSugarRepository<TEntity, TKey> : 
-        ISqlSugarRepository<TEntity>,
-        IRepository<TEntity, TKey> 
-        where TEntity : class, IEntity<TKey>, new()
     { 
+    
+    
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/ISugarDbContextProvider.cs

@@ -6,17 +6,12 @@ using System.Threading.Tasks;
 
 namespace Yi.Framework.SqlSugarCore.Abstractions
 {
-    /// <summary>
-    /// SqlSugar数据库上下文提供者接口
-    /// </summary>
-    /// <typeparam name="TDbContext">数据库上下文类型</typeparam>
     public interface ISugarDbContextProvider<TDbContext>
         where TDbContext : ISqlSugarDbContext
     {
-        /// <summary>
+
-        /// 异步获取数据库上下文实例
-        /// </summary>
-        /// <returns>数据库上下文实例</returns>
         Task<TDbContext> GetDbContextAsync();
+
     }
+
 }

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/IgnoreCodeFirstAttribute.cs

@@ -6,10 +6,6 @@ using System.Threading.Tasks;
 
 namespace Yi.Framework.SqlSugarCore.Abstractions
 {
-    /// <summary>
-    /// 忽略CodeFirst特性
-    /// 标记此特性的实体类将不会被CodeFirst功能扫描
-    /// </summary>
     [AttributeUsage(AttributeTargets.Class)]
     public class IgnoreCodeFirstAttribute : Attribute
     {

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/Yi.Framework.SqlSugarCore.Abstractions.csproj

@@ -3,10 +3,7 @@
 
 
   <ItemGroup>
-<!--    <PackageReference Include="SqlSugarCoreNoDrive" Version="$(SqlSugarVersion)" />-->
+    <PackageReference Include="SqlSugarCoreNoDrive" Version="$(SqlSugarVersion)" />
-    
-    <PackageReference Include="SqlSugarCore" Version="$(SqlSugarVersion)" />
-    
     <PackageReference Include="Volo.Abp.Ddd.Domain" Version="$(AbpVersion)" />
   </ItemGroup>
 

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/YiFrameworkSqlSugarCoreAbstractionsModule.cs

@@ -3,13 +3,9 @@ using Yi.Framework.Core;
 
 namespace Yi.Framework.SqlSugarCore.Abstractions
 {
-    /// <summary>
-    /// SqlSugar Core抽象层模块
-    /// 提供SqlSugar ORM的基础抽象接口和类型定义
-    /// </summary>
     [DependsOn(typeof(YiFrameworkCoreModule))]
     public class YiFrameworkSqlSugarCoreAbstractionsModule : AbpModule
     {
-        // 模块配置方法可在此添加
+
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/AsyncLocalDbContextAccessor .cs

@@ -2,34 +2,18 @@
 
 namespace Yi.Framework.SqlSugarCore
 {
-    /// <summary>
+    public class AsyncLocalDbContextAccessor
-    /// 异步本地数据库上下文访问器
-    /// 用于在异步流中保存和访问数据库上下文
-    /// </summary>
-    public sealed class AsyncLocalDbContextAccessor
     {
-        private readonly AsyncLocal<ISqlSugarDbContext?> _currentScope;
-
-        /// <summary>
-        /// 获取单例实例
-        /// </summary>
         public static AsyncLocalDbContextAccessor Instance { get; } = new();
-
-        /// <summary>
-        /// 获取或设置当前数据库上下文
-        /// </summary>
         public ISqlSugarDbContext? Current
         {
             get => _currentScope.Value;
             set => _currentScope.Value = value;
         }
-
+        public AsyncLocalDbContextAccessor()
-        /// <summary>
-        /// 初始化异步本地数据库上下文访问器
-        /// </summary>
-        private AsyncLocalDbContextAccessor()
         {
             _currentScope = new AsyncLocal<ISqlSugarDbContext?>();
         }
+        private readonly AsyncLocal<ISqlSugarDbContext> _currentScope;
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/DefaultSqlSugarDbContext.cs

@@ -1,362 +0,0 @@
-using System.Collections;
-using System.Reflection;
-using System.Text;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using SqlSugar;
-using Volo.Abp.Auditing;
-using Volo.Abp.Data;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Domain.Entities;
-using Volo.Abp.Domain.Entities.Events;
-using Volo.Abp.Guids;
-using Volo.Abp.MultiTenancy;
-using Volo.Abp.Uow;
-using Volo.Abp.Users;
-using Yi.Framework.SqlSugarCore.Abstractions;
-
-namespace Yi.Framework.SqlSugarCore;
-
-/// <summary>
-/// 默认SqlSugar数据库上下文实现
-/// </summary>
-public class DefaultSqlSugarDbContext : SqlSugarDbContext
-{
-    #region Protected Properties
-
-    /// <summary>
-    /// 数据库连接配置选项
-    /// </summary>
-    protected DbConnOptions DbOptions => LazyServiceProvider.LazyGetRequiredService<IOptions<DbConnOptions>>().Value;
-
-    /// <summary>
-    /// 当前用户服务
-    /// </summary>
-    protected ICurrentUser CurrentUserService => LazyServiceProvider.GetRequiredService<ICurrentUser>();
-
-    /// <summary>
-    /// GUID生成器
-    /// </summary>
-    protected IGuidGenerator GuidGeneratorService => LazyServiceProvider.LazyGetRequiredService<IGuidGenerator>();
-
-    /// <summary>
-    /// 日志工厂
-    /// </summary>
-    protected ILoggerFactory LoggerFactory => LazyServiceProvider.LazyGetRequiredService<ILoggerFactory>();
-
-    /// <summary>
-    /// 当前租户服务
-    /// </summary>
-    protected ICurrentTenant CurrentTenantService => LazyServiceProvider.LazyGetRequiredService<ICurrentTenant>();
-
-    /// <summary>
-    /// 数据过滤服务
-    /// </summary>
-    protected IDataFilter DataFilterService => LazyServiceProvider.LazyGetRequiredService<IDataFilter>();
-
-    /// <summary>
-    /// 工作单元管理器
-    /// </summary>
-    protected IUnitOfWorkManager UnitOfWorkManagerService => LazyServiceProvider.LazyGetRequiredService<IUnitOfWorkManager>();
-
-    /// <summary>
-    /// 实体变更事件帮助类
-    /// </summary>
-    protected IEntityChangeEventHelper EntityChangeEventHelperService =>
-        LazyServiceProvider.LazyGetService<IEntityChangeEventHelper>(NullEntityChangeEventHelper.Instance);
-
-    /// <summary>
-    /// 是否启用多租户过滤
-    /// </summary>
-    protected virtual bool IsMultiTenantFilterEnabled => DataFilterService?.IsEnabled<IMultiTenant>() ?? false;
-
-    /// <summary>
-    /// 是否启用软删除过滤
-    /// </summary>
-    protected virtual bool IsSoftDeleteFilterEnabled => DataFilterService?.IsEnabled<ISoftDelete>() ?? false;
-
-    #endregion
-
-    /// <summary>
-    /// 构造函数
-    /// </summary>
-    public DefaultSqlSugarDbContext(IAbpLazyServiceProvider lazyServiceProvider) 
-        : base(lazyServiceProvider)
-    {
-    }
-
-    /// <summary>
-    /// 自定义数据过滤器
-    /// </summary>
-    protected override void CustomDataFilter(ISqlSugarClient sqlSugarClient)
-    {
-        // 配置软删除过滤器
-        if (IsSoftDeleteFilterEnabled)
-        {
-            sqlSugarClient.QueryFilter.AddTableFilter<ISoftDelete>(entity => !entity.IsDeleted);
-        }
-
-        // 配置多租户过滤器
-        if (IsMultiTenantFilterEnabled)
-        {
-            var currentTenantId = CurrentTenantService.Id;
-            sqlSugarClient.QueryFilter.AddTableFilter<IMultiTenant>(entity => entity.TenantId == currentTenantId);
-        }
-    }
-
-    /// <summary>
-    /// 数据执行前的处理
-    /// </summary>
-    public override void DataExecuting(object oldValue, DataFilterModel entityInfo)
-    {
-        HandleAuditFields(oldValue, entityInfo);
-        HandleEntityEvents(entityInfo);
-        HandleDomainEvents(entityInfo);
-    }
-
-    #region Private Methods
-
-    /// <summary>
-    /// 处理审计字段
-    /// </summary>
-    private void HandleAuditFields(object oldValue, DataFilterModel entityInfo)
-    {
-        switch (entityInfo.OperationType)
-        {
-            case DataFilterType.UpdateByObject:
-                HandleUpdateAuditFields(oldValue, entityInfo);
-                break;
-            case DataFilterType.InsertByObject:
-                HandleInsertAuditFields(oldValue, entityInfo);
-                break;
-        }
-    }
-
-    /// <summary>
-    /// 处理更新时的审计字段
-    /// </summary>
-    private void HandleUpdateAuditFields(object oldValue, DataFilterModel entityInfo)
-    {
-        if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.LastModificationTime)))
-        {
-            entityInfo.SetValue(DateTime.MinValue.Equals(oldValue) ? null : DateTime.Now);
-        }
-        else if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.LastModifierId)) 
-                 && entityInfo.EntityColumnInfo.PropertyInfo.PropertyType == typeof(Guid?))
-        {
-            entityInfo.SetValue(Guid.Empty.Equals(oldValue) ? null : CurrentUserService.Id);
-        }
-    }
-
-    /// <summary>
-    /// 处理插入时的审计字段
-    /// </summary>
-    private void HandleInsertAuditFields(object oldValue, DataFilterModel entityInfo)
-    {
-        if (entityInfo.PropertyName.Equals(nameof(IEntity<Guid>.Id)))
-        {
-            if (typeof(Guid) == entityInfo.EntityColumnInfo.PropertyInfo.PropertyType)
-            {
-                if (Guid.Empty.Equals(oldValue))
-                {
-                    entityInfo.SetValue(GuidGeneratorService.Create());
-                }
-            }
-        }
-        else if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.CreationTime)))
-        {
-            if (DateTime.MinValue.Equals(oldValue))
-            {
-                entityInfo.SetValue(DateTime.Now);
-            }
-        }
-        else if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.CreatorId)))
-        {
-            if (typeof(Guid?) == entityInfo.EntityColumnInfo.PropertyInfo.PropertyType)
-            {
-                if (CurrentUserService.Id is not null)
-                {
-                    entityInfo.SetValue(CurrentUserService.Id);
-                }
-            }
-        }
-        else if (entityInfo.PropertyName.Equals(nameof(IMultiTenant.TenantId)))
-        {
-            if (CurrentTenantService.Id is not null)
-            {
-                entityInfo.SetValue(CurrentTenantService.Id);
-            }
-        }
-    }
-
-    /// <summary>
-    /// 处理实体变更事件
-    /// </summary>
-    private void HandleEntityEvents(DataFilterModel entityInfo)
-    {
-        // 实体变更领域事件
-        switch (entityInfo.OperationType)
-        {
-            case DataFilterType.InsertByObject:
-                if (entityInfo.PropertyName == nameof(IEntity<object>.Id))
-                {
-                    EntityChangeEventHelperService.PublishEntityCreatedEvent(entityInfo.EntityValue);
-                }
-                break;
-            case DataFilterType.UpdateByObject:
-                if (entityInfo.PropertyName == nameof(IEntity<object>.Id))
-                {
-                    if (entityInfo.EntityValue is ISoftDelete softDelete)
-                    {
-                        if (softDelete.IsDeleted == true)
-                        {
-                            EntityChangeEventHelperService.PublishEntityDeletedEvent(entityInfo.EntityValue);
-                        }
-                        else
-                        {
-                            EntityChangeEventHelperService.PublishEntityUpdatedEvent(entityInfo.EntityValue);
-                        }
-                    }
-                    else
-                    {
-                        EntityChangeEventHelperService.PublishEntityUpdatedEvent(entityInfo.EntityValue);
-                    }
-                }
-                break;
-            case DataFilterType.DeleteByObject:
-                if (entityInfo.EntityValue is IEnumerable entityValues)
-                {
-                    foreach (var entityValue in entityValues)
-                    {
-                        EntityChangeEventHelperService.PublishEntityDeletedEvent(entityValue);
-                    }
-                }
-                break;
-        }
-    }
-
-    /// <summary>
-    /// 处理领域事件
-    /// </summary>
-    private void HandleDomainEvents(DataFilterModel entityInfo)
-    {
-        // 实体领域事件-所有操作类型
-        if (entityInfo.PropertyName == nameof(IEntity<object>.Id))
-        {
-            var eventReport = CreateEventReport(entityInfo.EntityValue);
-            PublishEntityEvents(eventReport);
-        }
-    }
-
-    /// <summary>
-    /// 创建领域事件报告
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <returns></returns>
-    protected virtual EntityEventReport? CreateEventReport(object entity)
-    {
-        var eventReport = new EntityEventReport();
-        
-        //判断是否为领域事件-聚合根
-        var generatesDomainEventsEntity = entity as IGeneratesDomainEvents;
-        if (generatesDomainEventsEntity == null)
-        {
-            return eventReport;
-        }
-
-        var localEvents = generatesDomainEventsEntity.GetLocalEvents()?.ToArray();
-        if (localEvents != null && localEvents.Any())
-        {
-            eventReport.DomainEvents.AddRange(
-                localEvents.Select(
-                    eventRecord => new DomainEventEntry(
-                        entity,
-                        eventRecord.EventData,
-                        eventRecord.EventOrder
-                    )
-                )
-            );
-            generatesDomainEventsEntity.ClearLocalEvents();
-        }
-
-        var distributedEvents = generatesDomainEventsEntity.GetDistributedEvents()?.ToArray();
-        if (distributedEvents != null && distributedEvents.Any())
-        {
-            eventReport.DistributedEvents.AddRange(
-                distributedEvents.Select(
-                    eventRecord => new DomainEventEntry(
-                        entity,
-                        eventRecord.EventData,
-                        eventRecord.EventOrder)
-                )
-            );
-            generatesDomainEventsEntity.ClearDistributedEvents();
-        }
-        
-        return eventReport;
-    }
-    
-    /// <summary>
-    /// 发布领域事件
-    /// </summary>
-    /// <param name="changeReport"></param>
-    private void PublishEntityEvents(EntityEventReport changeReport)
-    {
-        foreach (var localEvent in changeReport.DomainEvents)
-        {
-            UnitOfWorkManagerService.Current?.AddOrReplaceLocalEvent(
-                new UnitOfWorkEventRecord(localEvent.EventData.GetType(), localEvent.EventData, localEvent.EventOrder)
-            );
-        }
-
-        foreach (var distributedEvent in changeReport.DistributedEvents)
-        {
-            UnitOfWorkManagerService.Current?.AddOrReplaceDistributedEvent(
-                new UnitOfWorkEventRecord(distributedEvent.EventData.GetType(), distributedEvent.EventData, distributedEvent.EventOrder)
-            );
-        }
-    }
-
-    #endregion
-
-    public override void OnLogExecuting(string sql, SugarParameter[] pars)
-    {
-        if (DbOptions.EnabledSqlLog)
-        {
-            StringBuilder sb = new StringBuilder();
-            sb.AppendLine();
-            sb.AppendLine("==========Yi-SQL执行:==========");
-            sb.AppendLine(UtilMethods.GetSqlString(DbType.SqlServer, sql, pars));
-            sb.AppendLine("===============================");
-            LoggerFactory.CreateLogger<DefaultSqlSugarDbContext>().LogDebug(sb.ToString());
-        }
-    }
-
-    public override void OnLogExecuted(string sql, SugarParameter[] pars)
-    {
-        if (DbOptions.EnabledSqlLog)
-        {
-            var sqllog = $"=========Yi-SQL耗时{SqlSugarClient.Ado.SqlExecutionTime.TotalMilliseconds}毫秒=====";
-            LoggerFactory.CreateLogger<SqlSugarDbContext>().LogDebug(sqllog.ToString());
-        }
-    }
-
-    public override void EntityService(PropertyInfo propertyInfo, EntityColumnInfo entityColumnInfo)
-    {
-        if (propertyInfo.Name == nameof(IHasConcurrencyStamp.ConcurrencyStamp)) //带版本号并发更新
-        {
-            entityColumnInfo.IsEnableUpdateVersionValidation = true;
-        }
-
-        if (propertyInfo.PropertyType == typeof(ExtraPropertyDictionary))
-        {
-            entityColumnInfo.IsIgnore = true;
-        }
-
-        if (propertyInfo.Name == nameof(Entity<object>.Id))
-        {
-            entityColumnInfo.IsPrimarykey = true;
-        }
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Repositories/SqlSugarRepository.cs

@@ -1,9 +1,12 @@
+using System.Linq;
 using System.Linq.Expressions;
-using Microsoft.Extensions.Options;
+using System.Text;
+using Microsoft.Extensions.Logging;
 using Nito.AsyncEx;
 using SqlSugar;
+using Volo.Abp;
+using Volo.Abp.Auditing;
 using Volo.Abp.Data;
-using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Linq;
@@ -14,48 +17,38 @@ namespace Yi.Framework.SqlSugarCore.Repositories
 {
     public class SqlSugarRepository<TEntity> : ISqlSugarRepository<TEntity>, IRepository<TEntity> where TEntity : class, IEntity, new()
     {
-        [Obsolete("使用GetDbContextAsync()")]
         public ISqlSugarClient _Db => AsyncContext.Run(async () => await GetDbContextAsync());
 
-        [Obsolete("使用AsQueryable()")]
         public ISugarQueryable<TEntity> _DbQueryable => _Db.Queryable<TEntity>();
 
-        private readonly ISugarDbContextProvider<ISqlSugarDbContext> _dbContextProvider;
+        private ISugarDbContextProvider<ISqlSugarDbContext> _sugarDbContextProvider;
-        
-        public IAbpLazyServiceProvider LazyServiceProvider { get; set; }
-        
-        protected DbConnOptions? Options => LazyServiceProvider?.LazyGetService<IOptions<DbConnOptions>>().Value;
-        /// <summary>
-        /// 异步查询执行器
-        /// </summary>
         public IAsyncQueryableExecuter AsyncExecuter { get; }
 
-        /// <summary>
-        /// 是否启用变更追踪
-        /// </summary>
         public bool? IsChangeTrackingEnabled => false;
 
-        public SqlSugarRepository(ISugarDbContextProvider<ISqlSugarDbContext> dbContextProvider)
+        public SqlSugarRepository(ISugarDbContextProvider<ISqlSugarDbContext> sugarDbContextProvider)
         {
-            _dbContextProvider = dbContextProvider;
+            _sugarDbContextProvider = sugarDbContextProvider;
         }
 
         /// <summary>
-        /// 获取数据库上下文
+        /// 获取DB
         /// </summary>
+        /// <returns></returns>
         public virtual async Task<ISqlSugarClient> GetDbContextAsync()
         {
-            var dbContext = await _dbContextProvider.GetDbContextAsync();
+            var db = (await _sugarDbContextProvider.GetDbContextAsync()).SqlSugarClient;
-            return dbContext.SqlSugarClient;
+            return db;
         }
 
         /// <summary>
-        /// 获取简单数据库客户端
+        /// 获取简单Db
         /// </summary>
+        /// <returns></returns>
         public virtual async Task<SimpleClient<TEntity>> GetDbSimpleClientAsync()
         {
-            var dbContext = await GetDbContextAsync();
+            var db = await GetDbContextAsync();
-            return new SimpleClient<TEntity>(dbContext);
+            return new SimpleClient<TEntity>(db);
         }
 
         #region Abp模块
@@ -266,7 +259,6 @@ namespace Yi.Framework.SqlSugarCore.Repositories
             if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity)))
             {
                 var entity = await GetByIdAsync(id);
-                if (entity == null) return false;
                 //反射赋值
                 ReflexHelper.SetModelValue(nameof(ISoftDelete.IsDeleted), true, entity);
                 return await UpdateAsync(entity);
@@ -322,12 +314,12 @@ namespace Yi.Framework.SqlSugarCore.Repositories
 
         public virtual async Task<List<TEntity>> GetPageListAsync(Expression<Func<TEntity, bool>> whereExpression, int pageNum, int pageSize)
         {
-            return await (await AsQueryable()).Where(whereExpression).ToPageListAsync(pageNum, pageSize);
+            return await (await GetDbSimpleClientAsync()).GetPageListAsync(whereExpression, new PageModel() { PageIndex = pageNum, PageSize = pageSize });
         }
 
         public virtual async Task<List<TEntity>> GetPageListAsync(Expression<Func<TEntity, bool>> whereExpression, int pageNum, int pageSize, Expression<Func<TEntity, object>>? orderByExpression = null, OrderByType orderByType = OrderByType.Asc)
         {
-            return await (await AsQueryable()).Where(whereExpression) .OrderBy( orderByExpression,orderByType).ToPageListAsync(pageNum, pageSize);
+            return await (await GetDbSimpleClientAsync()).GetPageListAsync(whereExpression, new PageModel { PageIndex = pageNum, PageSize = pageSize }, orderByExpression, orderByType);
         }
 
         public virtual async Task<TEntity> GetSingleAsync(Expression<Func<TEntity, bool>> whereExpression)
@@ -382,24 +374,20 @@ namespace Yi.Framework.SqlSugarCore.Repositories
 
         public virtual async Task<bool> UpdateAsync(TEntity updateObj)
         {
-            if (Options is not null && Options.EnabledConcurrencyException)
+            if (typeof(TEntity).IsAssignableTo<IHasConcurrencyStamp>())//带版本号乐观锁更新
-            {
-                if (typeof(TEntity).IsAssignableTo<IHasConcurrencyStamp>()) //带版本号乐观锁更新
             {
                 try
                 {
                     int num =  await (await GetDbSimpleClientAsync())
                         .Context.Updateable(updateObj).ExecuteCommandWithOptLockAsync(true);
-                        return num > 0;
+                    return num>0;
                 }
                 catch (VersionExceptions ex)
                 {
-                        throw new AbpDbConcurrencyException(
-                            $"{ex.Message}[更新失败：ConcurrencyStamp不是最新版本],entityInfo：{updateObj}", ex);
-                    }
-                }
-            }
  
+                    throw new AbpDbConcurrencyException($"{ex.Message}[更新失败：ConcurrencyStamp不是最新版本],entityInfo：{updateObj}", ex);
+                }
+            }
             return await (await GetDbSimpleClientAsync()).UpdateAsync(updateObj);
         }
 

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarCoreExtensions.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Yi.Framework.SqlSugarCore.Abstractions;
-
-namespace Yi.Framework.SqlSugarCore;
-
-/// <summary>
-/// SqlSugar Core扩展方法
-/// </summary>
-public static class SqlSugarCoreExtensions
-{
-    /// <summary>
-    /// 添加数据库上下文
-    /// </summary>
-    /// <typeparam name="TDbContext">数据库上下文类型</typeparam>
-    /// <param name="services">服务集合</param>
-    /// <param name="serviceLifetime">服务生命周期</param>
-    /// <returns>服务集合</returns>
-    public static IServiceCollection AddYiDbContext<TDbContext>(
-        this IServiceCollection services,
-        ServiceLifetime serviceLifetime = ServiceLifetime.Transient) 
-        where TDbContext : class, ISqlSugarDbContextDependencies
-    {
-        services.Add(new ServiceDescriptor(
-            typeof(ISqlSugarDbContextDependencies),
-            typeof(TDbContext),
-            serviceLifetime));
-
-        return services;
-    }
-
-    /// <summary>
-    /// 添加数据库上下文并配置选项
-    /// </summary>
-    /// <typeparam name="TDbContext">数据库上下文类型</typeparam>
-    /// <param name="services">服务集合</param>
-    /// <param name="configureOptions">配置选项委托</param>
-    /// <returns>服务集合</returns>
-    public static IServiceCollection AddYiDbContext<TDbContext>(
-        this IServiceCollection services,
-        Action<DbConnOptions> configureOptions)
-        where TDbContext : class, ISqlSugarDbContextDependencies
-    {
-        services.Configure(configureOptions);
-        services.AddYiDbContext<TDbContext>();
-        return services;
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbConnectionCreator.cs

@@ -0,0 +1,123 @@
+using System.Reflection;
+using Microsoft.Extensions.Options;
+using SqlSugar;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.SqlSugarCore
+{
+
+    public class SqlSugarDbConnectionCreator: ISqlSugarDbConnectionCreator,ITransientDependency
+    {
+        public SqlSugarDbConnectionCreator(IOptions<DbConnOptions> options)
+        {
+            Options = options.Value;
+        }
+        public DbConnOptions Options { get; }
+
+        public void SetDbAop(ISqlSugarClient currentDb)
+        {
+            currentDb.Aop.OnLogExecuting = this.OnLogExecuting;
+            currentDb.Aop.OnLogExecuted = this.OnLogExecuted;
+            currentDb.Aop.DataExecuting = this.DataExecuting;
+            currentDb.Aop.DataExecuted = this.DataExecuted;
+            OnSqlSugarClientConfig(currentDb);
+        }
+
+
+
+        public ConnectionConfig Build(Action<ConnectionConfig>? action=null)
+        {
+            var dbConnOptions = Options;
+            #region 组装options
+            if (dbConnOptions.DbType is null)
+            {
+                throw new ArgumentException("DbType配置为空");
+            }
+            var slavaConFig = new List<SlaveConnectionConfig>();
+            if (dbConnOptions.EnabledReadWrite)
+            {
+                if (dbConnOptions.ReadUrl is null)
+                {
+                    throw new ArgumentException("读写分离为空");
+                }
+
+                var readCon = dbConnOptions.ReadUrl;
+
+                readCon.ForEach(s =>
+                {
+                    //如果是动态saas分库，这里的连接串都不能写死，需要动态添加，这里只配置共享库的连接
+                    slavaConFig.Add(new SlaveConnectionConfig() { ConnectionString = s });
+                });
+            }
+            #endregion
+
+            #region 组装连接config
+            var connectionConfig = new ConnectionConfig()
+            {
+                ConfigId= ConnectionStrings.DefaultConnectionStringName,
+                DbType = dbConnOptions.DbType ?? DbType.Sqlite,
+                ConnectionString = dbConnOptions.Url,
+                IsAutoCloseConnection = true,
+                SlaveConnectionConfigs = slavaConFig,
+                //设置codefirst非空值判断
+                ConfigureExternalServices = new ConfigureExternalServices
+                {
+                    // 处理表
+                    EntityNameService = (type, entity) =>
+                    {
+                        if (dbConnOptions.EnableUnderLine && !entity.DbTableName.Contains('_'))
+                            entity.DbTableName = UtilMethods.ToUnderLine(entity.DbTableName);// 驼峰转下划线
+                    },
+                    EntityService = (c, p) =>
+                    {
+                        if (new NullabilityInfoContext()
+                        .Create(c).WriteState is NullabilityState.Nullable)
+                        {
+                            p.IsNullable = true;
+                        }
+
+                        if (dbConnOptions.EnableUnderLine && !p.IsIgnore && !p.DbColumnName.Contains('_'))
+                            p.DbColumnName = UtilMethods.ToUnderLine(p.DbColumnName);// 驼峰转下划线
+
+                        EntityService(c, p);
+                    }
+                },
+                //这里多租户有个坑，无效的
+                AopEvents = new AopEvents
+                {
+                    DataExecuted = DataExecuted,
+                    DataExecuting = DataExecuting,
+                    OnLogExecuted = OnLogExecuted,
+                    OnLogExecuting = OnLogExecuting
+                }
+
+            };
+
+            if (action is not null)
+            {
+                action.Invoke(connectionConfig);
+            }
+            #endregion
+            return connectionConfig;
+        }
+        [DisablePropertyInjection]
+        public Action<ISqlSugarClient> OnSqlSugarClientConfig { get; set; }
+
+        [DisablePropertyInjection]
+        public Action<object, DataAfterModel> DataExecuted { get; set; }
+
+        [DisablePropertyInjection]
+        public Action<object, DataFilterModel> DataExecuting { get; set; }
+
+        [DisablePropertyInjection]
+        public Action<string, SugarParameter[]> OnLogExecuting { get; set; }
+
+        [DisablePropertyInjection]
+        public Action<string, SugarParameter[]> OnLogExecuted { get; set; }
+
+        [DisablePropertyInjection]
+        public Action<PropertyInfo, EntityColumnInfo> EntityService { get; set; }
+    }
+}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs

@@ -1,83 +1,362 @@
-using System.Reflection;
+using System.Collections;
+using System.Reflection;
+using System.Text;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using SqlSugar;
+using Volo.Abp.Auditing;
+using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Entities.Events;
+using Volo.Abp.Guids;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Users;
 using Yi.Framework.SqlSugarCore.Abstractions;
+using Check = Volo.Abp.Check;
 
-namespace Yi.Framework.SqlSugarCore;
+namespace Yi.Framework.SqlSugarCore
-
-/// <summary>
-/// SqlSugar数据库上下文基类
-/// </summary>
-public abstract class SqlSugarDbContext : ISqlSugarDbContextDependencies
 {
-    /// <summary>
+    public class SqlSugarDbContext : ISqlSugarDbContext
-    /// 服务提供者
-    /// </summary>
-    protected IAbpLazyServiceProvider LazyServiceProvider { get; }
-
-    /// <summary>
-    /// 数据库客户端实例
-    /// </summary>
-    protected ISqlSugarClient SqlSugarClient { get; private set; }
-
-    /// <summary>
-    /// 执行顺序
-    /// </summary>
-    public virtual int ExecutionOrder => 0;
-
-    protected SqlSugarDbContext(IAbpLazyServiceProvider lazyServiceProvider)
     {
-        LazyServiceProvider = lazyServiceProvider;
-    }
-
         /// <summary>
-    /// 配置SqlSugar客户端
+        /// SqlSugar 客户端
         /// </summary>
-    public virtual void OnSqlSugarClientConfig(ISqlSugarClient sqlSugarClient)
+        public ISqlSugarClient SqlSugarClient { get; private set; }
+
+        protected ICurrentUser CurrentUser => LazyServiceProvider.GetRequiredService<ICurrentUser>();
+        private IAbpLazyServiceProvider LazyServiceProvider { get; }
+
+        private IGuidGenerator GuidGenerator => LazyServiceProvider.LazyGetRequiredService<IGuidGenerator>();
+        private ILoggerFactory Logger => LazyServiceProvider.LazyGetRequiredService<ILoggerFactory>();
+        private ICurrentTenant CurrentTenant => LazyServiceProvider.LazyGetRequiredService<ICurrentTenant>();
+        protected IDataFilter DataFilter => LazyServiceProvider.LazyGetRequiredService<IDataFilter>();
+        protected virtual bool IsMultiTenantFilterEnabled => DataFilter?.IsEnabled<IMultiTenant>() ?? false;
+
+        protected virtual bool IsSoftDeleteFilterEnabled => DataFilter?.IsEnabled<ISoftDelete>() ?? false;
+
+        private IEntityChangeEventHelper EntityChangeEventHelper => LazyServiceProvider.LazyGetService<IEntityChangeEventHelper>(NullEntityChangeEventHelper.Instance);
+        public DbConnOptions Options => LazyServiceProvider.LazyGetRequiredService<IOptions<DbConnOptions>>().Value;
+
+        private ISerializeService SerializeService=> LazyServiceProvider.LazyGetRequiredService<ISerializeService>();
+        
+        public void SetSqlSugarClient(ISqlSugarClient sqlSugarClient)
         {
             SqlSugarClient = sqlSugarClient;
+        }
+        public SqlSugarDbContext(IAbpLazyServiceProvider lazyServiceProvider)
+        {
+            LazyServiceProvider = lazyServiceProvider;
+            var connectionCreator = LazyServiceProvider.LazyGetRequiredService<ISqlSugarDbConnectionCreator>();
+            connectionCreator.OnSqlSugarClientConfig = OnSqlSugarClientConfig;
+            connectionCreator.EntityService = EntityService;
+            connectionCreator.DataExecuting = DataExecuting;
+            connectionCreator.DataExecuted = DataExecuted;
+            connectionCreator.OnLogExecuting = OnLogExecuting;
+            connectionCreator.OnLogExecuted = OnLogExecuted;
+            SqlSugarClient = new SqlSugarClient(connectionCreator.Build(action: options =>
+            {
+                options.ConnectionString = GetCurrentConnectionString();
+                options.DbType = GetCurrentDbType();
+            }));
+            //统一使用aop处理
+            connectionCreator.SetDbAop(SqlSugarClient);
+            //替换默认序列化器
+            SqlSugarClient.CurrentConnectionConfig.ConfigureExternalServices.SerializeService = SerializeService;
+        }
+
+        /// <summary>
+        /// db切换多库支持
+        /// </summary>
+        /// <returns></returns>
+        protected virtual string GetCurrentConnectionString()
+        {
+            var connectionStringResolver = LazyServiceProvider.LazyGetRequiredService<IConnectionStringResolver>();
+            var connectionString = connectionStringResolver.ResolveAsync().ConfigureAwait(false).GetAwaiter().GetResult();
+
+            if (string.IsNullOrWhiteSpace(connectionString))
+            {
+                Check.NotNull(Options.Url, "dbUrl未配置");
+            }
+            return connectionString!;
+        }
+
+        protected virtual DbType GetCurrentDbType()
+        {
+            if (CurrentTenant.Name is not null)
+            {
+                var dbTypeFromTenantName = GetDbTypeFromTenantName(CurrentTenant.Name);
+                if (dbTypeFromTenantName is not null)
+                {
+                    return dbTypeFromTenantName.Value;
+                }
+            }
+            Check.NotNull(Options.DbType, "默认DbType未配置！");
+            return Options.DbType!.Value;
+        }
+
+        //根据租户name进行匹配db类型:  Test_Sqlite，[来自AI]
+        private DbType? GetDbTypeFromTenantName(string name)
+        {
+            if (string.IsNullOrWhiteSpace(name))
+            {
+                return null;
+            }
+
+            // 查找下划线的位置
+            int underscoreIndex = name.LastIndexOf('_');
+
+            if (underscoreIndex == -1 || underscoreIndex == name.Length - 1)
+            {
+                return null;
+            }
+
+            // 提取 枚举 部分
+            string enumString = name.Substring(underscoreIndex + 1);
+
+            // 尝试将 尾缀 转换为枚举
+            if (Enum.TryParse<DbType>(enumString, out DbType result))
+            {
+                return result;
+            }
+
+            // 条件不满足时返回 null
+            return null;
+        }
+
+
+
+        /// <summary>
+        /// 上下文对象扩展
+        /// </summary>
+        /// <param name="sqlSugarClient"></param>
+        protected virtual void OnSqlSugarClientConfig(ISqlSugarClient sqlSugarClient)
+        {
+            //需自定义扩展
+            if (IsSoftDeleteFilterEnabled)
+            {
+                sqlSugarClient.QueryFilter.AddTableFilter<ISoftDelete>(u => u.IsDeleted == false);
+            }
+            if (IsMultiTenantFilterEnabled)
+            {
+                //表达式里只能有具体值，不能运算
+                var expressionCurrentTenant = CurrentTenant.Id ?? null;
+                sqlSugarClient.QueryFilter.AddTableFilter<IMultiTenant>(u => u.TenantId == expressionCurrentTenant);
+            }
             CustomDataFilter(sqlSugarClient);
         }
-
-    /// <summary>
-    /// 自定义数据过滤器
-    /// </summary>
         protected virtual void CustomDataFilter(ISqlSugarClient sqlSugarClient)
         {
+
+        }
+        protected virtual void DataExecuted(object oldValue, DataAfterModel entityInfo)
+        {
+
         }
 
         /// <summary>
-    /// 数据执行后事件
+        /// 数据
         /// </summary>
-    public virtual void DataExecuted(object oldValue, DataAfterModel entityInfo)
+        /// <param name="oldValue"></param>
+        /// <param name="entityInfo"></param>
+        protected virtual void DataExecuting(object oldValue, DataFilterModel entityInfo)
         {
+            //审计日志
+            switch (entityInfo.OperationType)
+            {
+                case DataFilterType.UpdateByObject:
+
+                    if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.LastModificationTime)))
+                    {
+                        if (!DateTime.MinValue.Equals(oldValue))
+                        {
+                            entityInfo.SetValue(DateTime.Now);
+                        }
+                    }
+                    if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.LastModifierId)))
+                    {
+                        if (CurrentUser.Id != null)
+                        {
+                            entityInfo.SetValue(CurrentUser.Id);
+                        }
+                    }
+                    break;
+                case DataFilterType.InsertByObject:
+                    if (entityInfo.PropertyName.Equals(nameof(IEntity<Guid>.Id)))
+                    {
+                        //主键为空或者为默认最小值
+                        if (Guid.Empty.Equals(oldValue))
+                        {
+                            entityInfo.SetValue(GuidGenerator.Create());
+                        }
+                    }
+
+                    if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.CreationTime)))
+                    {
+                        //为空或者为默认最小值
+                        if (DateTime.MinValue.Equals(oldValue))
+                        {
+                            entityInfo.SetValue(DateTime.Now);
+                        }
+                    }
+                    if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.CreatorId)))
+                    {
+                        if (CurrentUser.Id is not null)
+                        {
+                            entityInfo.SetValue(CurrentUser.Id);
+                        }
+                    }
+                    
+                    if (entityInfo.PropertyName.Equals(nameof(IMultiTenant.TenantId)))
+                    {
+                        if (CurrentTenant.Id is not null)
+                        {
+                            entityInfo.SetValue(CurrentTenant.Id);
+                        }
+                    }
+                    break;
+            }
+
+
+            //领域事件
+            switch (entityInfo.OperationType)
+            {
+                case DataFilterType.InsertByObject:
+                    if (entityInfo.PropertyName == nameof(IEntity<object>.Id))
+                    {
+                        EntityChangeEventHelper.PublishEntityCreatedEvent(entityInfo.EntityValue);
+                    }
+                    break;
+                case DataFilterType.UpdateByObject:
+                    if (entityInfo.PropertyName == nameof(IEntity<object>.Id))
+                    {
+                        //软删除，发布的是删除事件
+                        if (entityInfo.EntityValue is ISoftDelete softDelete)
+                        {
+                            if (softDelete.IsDeleted == true)
+                            {
+                                EntityChangeEventHelper.PublishEntityDeletedEvent(entityInfo.EntityValue);
+                            }
+                        }
+                        else
+                        {
+                            EntityChangeEventHelper.PublishEntityUpdatedEvent(entityInfo.EntityValue);
+                        }
+
+                    }
+                    break;
+                case DataFilterType.DeleteByObject:
+                    if (entityInfo.PropertyName == nameof(IEntity<object>.Id))
+                    {
+                        //这里sqlsugar有个特殊，删除会返回批量的结果
+                        if (entityInfo.EntityValue is IEnumerable entityValues)
+                        {
+                            foreach (var entityValue in entityValues)
+                            {
+
+                                EntityChangeEventHelper.PublishEntityDeletedEvent(entityValue);
+                            }
+                        }
+                    }
+                    break;
+            }
+
         }
 
         /// <summary>
-    /// 数据执行前事件
+        /// 日志
         /// </summary>
-    public virtual void DataExecuting(object oldValue, DataFilterModel entityInfo)
+        /// <param name="sql"></param>
+        /// <param name="pars"></param>
+        protected virtual void OnLogExecuting(string sql, SugarParameter[] pars)
         {
+            if (Options.EnabledSqlLog)
+            {
+                StringBuilder sb = new StringBuilder();
+                sb.AppendLine();
+                sb.AppendLine("==========Yi-SQL执行:==========");
+                sb.AppendLine(UtilMethods.GetSqlString(DbType.SqlServer, sql, pars));
+                sb.AppendLine("===============================");
+                Logger.CreateLogger<SqlSugarDbContext>().LogDebug(sb.ToString());
+            }
+
         }
 
         /// <summary>
-    /// SQL执行前事件
+        /// 日志
         /// </summary>
-    public virtual void OnLogExecuting(string sql, SugarParameter[] pars)
+        /// <param name="sql"></param>
+        /// <param name="pars"></param>
+        protected virtual void OnLogExecuted(string sql, SugarParameter[] pars)
         {
+            if (Options.EnabledSqlLog)
+            {
+                var sqllog = $"=========Yi-SQL耗时{SqlSugarClient.Ado.SqlExecutionTime.TotalMilliseconds}毫秒=====";
+                Logger.CreateLogger<SqlSugarDbContext>().LogDebug(sqllog.ToString());
+            }
         }
 
         /// <summary>
-    /// SQL执行后事件
+        /// 实体配置
         /// </summary>
-    public virtual void OnLogExecuted(string sql, SugarParameter[] pars)
+        /// <param name="property"></param>
+        /// <param name="column"></param>
+        protected virtual void EntityService(PropertyInfo property, EntityColumnInfo column)
         {
+            if (property.Name == nameof(IHasConcurrencyStamp.ConcurrencyStamp)) //带版本号并发更新
+            {
+                // column.IsOnlyIgnoreInsert = true;
+                // column.IsOnlyIgnoreUpdate = true;
+                column.IsEnableUpdateVersionValidation = true;
+            }
+            if (property.PropertyType == typeof(ExtraPropertyDictionary))
+            {
+                column.IsIgnore = true;
+            }
+            if (property.Name == nameof(Entity<object>.Id))
+            {
+                column.IsPrimarykey = true;
+            }
         }
 
-    /// <summary>
+        public void BackupDataBase()
-    /// 实体服务配置
-    /// </summary>
-    public virtual void EntityService(PropertyInfo propertyInfo, EntityColumnInfo entityColumnInfo)
         {
+            string directoryName = "database_backup";
+            string fileName = DateTime.Now.ToString($"yyyyMMdd_HHmmss") + $"_{SqlSugarClient.Ado.Connection.Database}";
+            if (!Directory.Exists(directoryName))
+            {
+                Directory.CreateDirectory(directoryName);
+            }
+            switch (Options.DbType)
+            {
+                case DbType.MySql:
+                    //MySql
+                    SqlSugarClient.DbMaintenance.BackupDataBase(SqlSugarClient.Ado.Connection.Database, $"{Path.Combine(directoryName, fileName)}.sql");//mysql 只支持.net core
+                    break;
+
+
+                case DbType.Sqlite:
+                    //Sqlite
+                    SqlSugarClient.DbMaintenance.BackupDataBase(null, $"{fileName}.db"); //sqlite 只支持.net core
+                    break;
+
+
+                case DbType.SqlServer:
+                    //SqlServer
+                    SqlSugarClient.DbMaintenance.BackupDataBase(SqlSugarClient.Ado.Connection.Database, $"{Path.Combine(directoryName, fileName)}.bak"/*服务器路径*/);//第一个参数库名 
+                    break;
+
+
+                default:
+                    throw new NotImplementedException("其他数据库备份未实现");
+
+            }
+
+
+
+
+
+        }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContextCreationContext.cs

@@ -4,52 +4,26 @@ using Yi.Framework.SqlSugarCore.Abstractions;
 
 namespace Yi.Framework.SqlSugarCore;
 
-/// <summary>
-/// SqlSugar数据库上下文创建上下文
-/// </summary>
 public class SqlSugarDbContextCreationContext
 {
-    private static readonly AsyncLocal<SqlSugarDbContextCreationContext> CurrentContextHolder = 
+    public static SqlSugarDbContextCreationContext Current => _current.Value;
-        new AsyncLocal<SqlSugarDbContextCreationContext>();
+    private static readonly AsyncLocal<SqlSugarDbContextCreationContext> _current = new AsyncLocal<SqlSugarDbContextCreationContext>();
-
-    /// <summary>
-    /// 获取当前上下文
-    /// </summary>
-    public static SqlSugarDbContextCreationContext Current => CurrentContextHolder.Value!;
-
-    /// <summary>
-    /// 连接字符串名称
-    /// </summary>
     public string ConnectionStringName { get; }
 
-    /// <summary>
-    /// 连接字符串
-    /// </summary>
     public string ConnectionString { get; }
 
-    /// <summary>
+    public DbConnection ExistingConnection { get; internal set; }
-    /// 现有数据库连接
-    /// </summary>
-    public DbConnection? ExistingConnection { get; internal set; }
 
-    /// <summary>
+    public SqlSugarDbContextCreationContext(string connectionStringName, string connectionString)
-    /// 构造函数
-    /// </summary>
-    public SqlSugarDbContextCreationContext(
-        string connectionStringName,
-        string connectionString)
     {
         ConnectionStringName = connectionStringName;
         ConnectionString = connectionString;
     }
 
-    /// <summary>
-    /// 使用指定的上下文
-    /// </summary>
     public static IDisposable Use(SqlSugarDbContextCreationContext context)
     {
-        var previousContext = Current;
+        var previousValue = Current;
-        CurrentContextHolder.Value = context;
+        _current.Value = context;
-        return new DisposeAction(() => CurrentContextHolder.Value = previousContext);
+        return new DisposeAction(() => _current.Value = previousValue);
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContextFactory.cs

@@ -1,290 +0,0 @@
-using System.Collections.Concurrent;
-using System.Reflection;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using SqlSugar;
-using Volo.Abp.Data;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.MultiTenancy;
-using Volo.Abp.Threading;
-using Volo.Abp.Users;
-using Yi.Framework.SqlSugarCore.Abstractions;
-using Check = Volo.Abp.Check;
-
-namespace Yi.Framework.SqlSugarCore
-{
-    /// <summary>
-    /// SqlSugar数据库上下文工厂类
-    /// 负责创建和配置SqlSugar客户端实例
-    /// </summary>
-    public class SqlSugarDbContextFactory : ISqlSugarDbContext
-    {
-        #region Properties
-
-        /// <summary>
-        /// SqlSugar客户端实例
-        /// </summary>
-        public ISqlSugarClient SqlSugarClient { get; private set; }
-
-        /// <summary>
-        /// 延迟服务提供者
-        /// </summary>
-        private IAbpLazyServiceProvider LazyServiceProvider { get; }
-
-        /// <summary>
-        /// 租户配置包装器
-        /// </summary>
-        private TenantConfigurationWrapper TenantConfigurationWrapper => 
-            LazyServiceProvider.LazyGetRequiredService<TenantConfigurationWrapper>();
-
-        /// <summary>
-        /// 当前租户信息
-        /// </summary>
-        private ICurrentTenant CurrentTenant => 
-            LazyServiceProvider.LazyGetRequiredService<ICurrentTenant>();
-
-        /// <summary>
-        /// 数据库连接配置选项
-        /// </summary>
-        private DbConnOptions DbConnectionOptions => 
-            LazyServiceProvider.LazyGetRequiredService<IOptions<DbConnOptions>>().Value;
-
-        /// <summary>
-        /// 序列化服务
-        /// </summary>
-        private ISerializeService SerializeService => 
-            LazyServiceProvider.LazyGetRequiredService<ISerializeService>();
-
-        /// <summary>
-        /// SqlSugar上下文依赖项集合
-        /// </summary>
-        private IEnumerable<ISqlSugarDbContextDependencies> SqlSugarDbContextDependencies =>
-            LazyServiceProvider.LazyGetRequiredService<IEnumerable<ISqlSugarDbContextDependencies>>();
-
-        /// <summary>
-        /// 连接配置缓存字典
-        /// </summary>
-        private static readonly ConcurrentDictionary<string, ConnectionConfig> ConnectionConfigCache = new();
-
-        #endregion
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        /// <param name="lazyServiceProvider">延迟服务提供者</param>
-        public SqlSugarDbContextFactory(IAbpLazyServiceProvider lazyServiceProvider)
-        {
-            LazyServiceProvider = lazyServiceProvider;
-
-            // 异步获取租户配置
-            var tenantConfiguration = AsyncHelper.RunSync(async () => await TenantConfigurationWrapper.GetAsync());
-           
-            // 构建数据库连接配置
-            var connectionConfig = BuildConnectionConfig(options =>
-            {
-                options.ConnectionString = tenantConfiguration.GetCurrentConnectionString();
-                options.DbType = GetCurrentDbType(tenantConfiguration.GetCurrentConnectionName());
-            });
-
-            // 创建SqlSugar客户端实例
-            SqlSugarClient = new SqlSugarClient(connectionConfig);
-
-            // 配置数据库AOP
-            ConfigureDbAop(SqlSugarClient);
-        }
-
-        /// <summary>
-        /// 配置数据库AOP操作
-        /// </summary>
-        /// <param name="sqlSugarClient">SqlSugar客户端实例</param>
-        protected virtual void ConfigureDbAop(ISqlSugarClient sqlSugarClient)
-        {
-            // 配置序列化服务
-            sqlSugarClient.CurrentConnectionConfig.ConfigureExternalServices.SerializeService = SerializeService;
-
-            // 初始化AOP事件处理器
-            Action<string, SugarParameter[]> onLogExecuting = null;
-            Action<string, SugarParameter[]> onLogExecuted = null;
-            Action<object, DataFilterModel> dataExecuting = null;
-            Action<object, DataAfterModel> dataExecuted = null;
-            Action<ISqlSugarClient> onClientConfig = null;
-
-            // 按执行顺序聚合所有依赖项的AOP处理器
-            foreach (var dependency in SqlSugarDbContextDependencies.OrderBy(x => x.ExecutionOrder))
-            {
-                onLogExecuting += dependency.OnLogExecuting;
-                onLogExecuted += dependency.OnLogExecuted;
-                dataExecuting += dependency.DataExecuting;
-                dataExecuted += dependency.DataExecuted;
-                onClientConfig += dependency.OnSqlSugarClientConfig;
-            }
-
-            // 配置SqlSugar客户端
-            onClientConfig?.Invoke(sqlSugarClient);
-
-            // 设置AOP事件
-            sqlSugarClient.Aop.OnLogExecuting = onLogExecuting;
-            sqlSugarClient.Aop.OnLogExecuted = onLogExecuted;
-            sqlSugarClient.Aop.DataExecuting = dataExecuting;
-            sqlSugarClient.Aop.DataExecuted = dataExecuted;
-        }
-
-        /// <summary>
-        /// 构建数据库连接配置
-        /// </summary>
-        /// <param name="configAction">配置操作委托</param>
-        /// <returns>连接配置对象</returns>
-        protected virtual ConnectionConfig BuildConnectionConfig(Action<ConnectionConfig> configAction = null)
-        {
-            var dbConnOptions = DbConnectionOptions;
-
-            // 验证数据库类型配置
-            if (dbConnOptions.DbType is null)
-            {
-                throw new ArgumentException("未配置数据库类型(DbType)");
-            }
-
-            // 配置读写分离
-            var slaveConfigs = new List<SlaveConnectionConfig>();
-            if (dbConnOptions.EnabledReadWrite)
-            {
-                if (dbConnOptions.ReadUrl is null)
-                {
-                    throw new ArgumentException("启用读写分离但未配置读库连接字符串");
-                }
-
-                slaveConfigs.AddRange(dbConnOptions.ReadUrl.Select(url => 
-                    new SlaveConnectionConfig { ConnectionString = url }));
-            }
-
-            // 创建连接配置
-            var connectionConfig = new ConnectionConfig
-            {
-                ConfigId = ConnectionStrings.DefaultConnectionStringName,
-                DbType = dbConnOptions.DbType ?? DbType.Sqlite,
-                ConnectionString = dbConnOptions.Url,
-                IsAutoCloseConnection = true,
-                SlaveConnectionConfigs = slaveConfigs,
-                ConfigureExternalServices = CreateExternalServices(dbConnOptions)
-            };
-
-            // 应用额外配置
-            configAction?.Invoke(connectionConfig);
-
-            return connectionConfig;
-        }
-
-        /// <summary>
-        /// 创建外部服务配置
-        /// </summary>
-        private ConfigureExternalServices CreateExternalServices(DbConnOptions dbConnOptions)
-        {
-            return new ConfigureExternalServices
-            {
-                EntityNameService = (type, entity) =>
-                {
-                    if (dbConnOptions.EnableUnderLine && !entity.DbTableName.Contains('_'))
-                    {
-                        entity.DbTableName = UtilMethods.ToUnderLine(entity.DbTableName);
-                    }
-                },
-                EntityService = (propertyInfo, columnInfo) =>
-                {
-                    // 配置空值处理
-                    if (new NullabilityInfoContext().Create(propertyInfo).WriteState 
-                        is NullabilityState.Nullable)
-                    {
-                        columnInfo.IsNullable = true;
-                    }
-
-                    // 处理下划线命名
-                    if (dbConnOptions.EnableUnderLine && !columnInfo.IsIgnore 
-                        && !columnInfo.DbColumnName.Contains('_'))
-                    {
-                        columnInfo.DbColumnName = UtilMethods.ToUnderLine(columnInfo.DbColumnName);
-                    }
-
-                    // 聚合所有依赖项的实体服务
-                    Action<PropertyInfo, EntityColumnInfo> entityService = null;
-                    foreach (var dependency in SqlSugarDbContextDependencies.OrderBy(x => x.ExecutionOrder))
-                    {
-                        entityService += dependency.EntityService;
-                    }
-
-                    entityService?.Invoke(propertyInfo, columnInfo);
-                }
-            };
-        }
-
-        /// <summary>
-        /// 获取当前数据库类型
-        /// </summary>
-        /// <param name="tenantName">租户名称</param>
-        /// <returns>数据库类型</returns>
-        protected virtual DbType GetCurrentDbType(string tenantName)
-        {
-            return tenantName == ConnectionStrings.DefaultConnectionStringName 
-                ? DbConnectionOptions.DbType!.Value 
-                : GetDbTypeFromTenantName(tenantName) 
-                  ?? throw new ArgumentException($"无法从租户名称{tenantName}中解析数据库类型");
-        }
-
-        /// <summary>
-        /// 从租户名称解析数据库类型
-        /// 格式：TenantName@DbType
-        /// </summary>
-        private DbType? GetDbTypeFromTenantName(string name)
-        {
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                return null;
-            }
-
-            var atIndex = name.LastIndexOf('@');
-            if (atIndex == -1 || atIndex == name.Length - 1)
-            {
-                return null;
-            }
-
-            var dbTypeString = name[(atIndex + 1)..];
-            return Enum.TryParse<DbType>(dbTypeString, out var dbType) 
-                ? dbType 
-                : throw new ArgumentException($"不支持的数据库类型: {dbTypeString}");
-        }
-
-        /// <summary>
-        /// 备份数据库
-        /// </summary>
-        public virtual void BackupDataBase()
-        {
-            const string backupDirectory = "database_backup";
-            var fileName = $"{DateTime.Now:yyyyMMdd_HHmmss}_{SqlSugarClient.Ado.Connection.Database}";
-            
-            Directory.CreateDirectory(backupDirectory);
-
-            switch (DbConnectionOptions.DbType)
-            {
-                case DbType.MySql:
-                    SqlSugarClient.DbMaintenance.BackupDataBase(
-                        SqlSugarClient.Ado.Connection.Database,
-                        Path.Combine(backupDirectory, $"{fileName}.sql"));
-                    break;
-
-                case DbType.Sqlite:
-                    SqlSugarClient.DbMaintenance.BackupDataBase(
-                        null, 
-                        $"{fileName}.db");
-                    break;
-
-                case DbType.SqlServer:
-                    SqlSugarClient.DbMaintenance.BackupDataBase(
-                        SqlSugarClient.Ado.Connection.Database,
-                        Path.Combine(backupDirectory, $"{fileName}.bak"));
-                    break;
-
-                default:
-                    throw new NotImplementedException($"数据库类型 {DbConnectionOptions.DbType} 的备份操作尚未实现");
-            }
-        }
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarNonPublicSerializer.cs

@@ -63,14 +63,14 @@ public class SqlSugarNonPublicSerializer : ISerializeService
 
             // 调用 SerializeObject 方法序列化对象
             T json = (T)methods.MakeGenericMethod(typeof(T))
-                .Invoke(null, new object[] { value, null! });
+                .Invoke(null, new object[] { value, null });
-            return json!;
+            return json;
         }
         var jSetting = new JsonSerializerSettings 
         {
             NullValueHandling = NullValueHandling.Ignore,
             ContractResolver =new NonPublicPropertiesResolver() //替换默认解析器使能支持protect
         };
-        return JsonConvert.DeserializeObject<T>(value, jSetting)!;
+        return JsonConvert.DeserializeObject<T>(value, jSetting);
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlsugarCoreExtensions.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.SqlSugarCore
+{
+    public static class SqlsugarCoreExtensions
+    {
+        public static IServiceCollection AddYiDbContext<DbContext>(this IServiceCollection service, ServiceLifetime serviceLifetime = ServiceLifetime.Transient) where DbContext : class, ISqlSugarDbContext
+        {
+            service.Replace(new ServiceDescriptor(typeof(ISqlSugarDbContext), typeof(DbContext), serviceLifetime));
+            return service;
+        }
+        public static IServiceCollection TryAddYiDbContext<DbContext>(this IServiceCollection service, ServiceLifetime serviceLifetime = ServiceLifetime.Transient) where DbContext : class, ISqlSugarDbContext
+        {
+            service.TryAdd(new ServiceDescriptor(typeof(ISqlSugarDbContext), typeof(DbContext), serviceLifetime));
+            return service;
+        }
+
+
+        public static IServiceCollection AddYiDbContext<DbContext>(this IServiceCollection service, Action<DbConnOptions> options) where DbContext : class, ISqlSugarDbContext
+        {
+
+            service.Configure<DbConnOptions>(ops =>
+            {
+                options.Invoke(ops);
+            });
+            service.AddYiDbContext<DbContext>();
+            return service;
+        }
+    }
+}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/TenantConfigurationWrapper.cs

@@ -1,112 +0,0 @@
-using Microsoft.Extensions.Options;
-using Volo.Abp.Data;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.MultiTenancy;
-using Yi.Framework.SqlSugarCore.Abstractions;
-
-namespace Yi.Framework.SqlSugarCore;
-
-/// <summary>
-/// 租户配置包装器
-/// </summary>
-public class TenantConfigurationWrapper : ITransientDependency
-{
-    private readonly IAbpLazyServiceProvider _serviceProvider;
-    
-    private ICurrentTenant CurrentTenantService => 
-        _serviceProvider.LazyGetRequiredService<ICurrentTenant>();
-    
-    private ITenantStore TenantStoreService => 
-        _serviceProvider.LazyGetRequiredService<ITenantStore>();
-    
-    private DbConnOptions DbConnectionOptions => 
-        _serviceProvider.LazyGetRequiredService<IOptions<DbConnOptions>>().Value;
-
-    /// <summary>
-    /// 构造函数
-    /// </summary>
-    public TenantConfigurationWrapper(IAbpLazyServiceProvider serviceProvider)
-    {
-        _serviceProvider = serviceProvider;
-    }
-
-    /// <summary>
-    /// 获取租户配置信息
-    /// </summary>
-    public async Task<TenantConfiguration?> GetAsync()
-    {
-        if (!DbConnectionOptions.EnabledSaasMultiTenancy)
-        {
-            return await TenantStoreService.FindAsync(ConnectionStrings.DefaultConnectionStringName);
-        }
-
-        return await GetTenantConfigurationByCurrentTenant();
-    }
-
-    private async Task<TenantConfiguration?> GetTenantConfigurationByCurrentTenant()
-    {
-        // 通过租户ID查找
-        if (CurrentTenantService.Id.HasValue)
-        {
-            var config = await TenantStoreService.FindAsync(CurrentTenantService.Id.Value);
-            if (config == null)
-            {
-                throw new ApplicationException($"未找到租户信息,租户Id:{CurrentTenantService.Id}");
-            }
-            return config;
-        }
-
-        // 通过租户名称查找
-        if (!string.IsNullOrEmpty(CurrentTenantService.Name))
-        {
-            var config = await TenantStoreService.FindAsync(CurrentTenantService.Name);
-            if (config == null)
-            {
-                throw new ApplicationException($"未找到租户信息,租户名称:{CurrentTenantService.Name}");
-            }
-            return config;
-        }
-
-        // 返回默认配置
-        return await TenantStoreService.FindAsync(ConnectionStrings.DefaultConnectionStringName);
-    }
-
-    /// <summary>
-    /// 获取当前连接字符串
-    /// </summary>
-    /// <returns></returns>
-    public async Task<string> GetCurrentConnectionStringAsync()
-    {
-        return  (await GetAsync()).ConnectionStrings.Default!;
-    }
-    /// <summary>
-    /// 获取当前连接名
-    /// </summary>
-    /// <returns></returns>
-    public async Task<string> GetCurrentConnectionNameAsync()
-    {
-        return  (await GetAsync()).Name;
-    }
-}
-
-public static class TenantConfigurationExtensions
-{
-    /// <summary>
-    /// 获取当前连接字符串
-    /// </summary>
-    /// <returns></returns>
-    public static string GetCurrentConnectionString(this TenantConfiguration tenantConfiguration)
-    {
-        return  tenantConfiguration.ConnectionStrings.Default!;
-    }
-    
-    /// <summary>
-    /// 获取当前连接名
-    /// </summary>
-    /// <returns></returns>
-    public static string GetCurrentConnectionName(this TenantConfiguration tenantConfiguration)
-    {
-        return  tenantConfiguration.Name;
-    }
-}
-

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/SqlSugarDatabaseApi.cs

@@ -8,20 +8,10 @@ using Yi.Framework.SqlSugarCore.Abstractions;
 
 namespace Yi.Framework.SqlSugarCore.Uow
 {
-    /// <summary>
-    /// SqlSugar数据库API实现
-    /// </summary>
     public class SqlSugarDatabaseApi : IDatabaseApi
     {
-        /// <summary>
-        /// 数据库上下文
-        /// </summary>
         public ISqlSugarDbContext DbContext { get; }
 
-        /// <summary>
-        /// 初始化SqlSugar数据库API
-        /// </summary>
-        /// <param name="dbContext">数据库上下文</param>
         public SqlSugarDatabaseApi(ISqlSugarDbContext dbContext)
         {
             DbContext = dbContext;

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/SqlSugarTransactionApi.cs

@@ -3,48 +3,33 @@ using Yi.Framework.SqlSugarCore.Abstractions;
 
 namespace Yi.Framework.SqlSugarCore.Uow
 {
-    /// <summary>
-    /// SqlSugar事务API实现
-    /// </summary>
     public class SqlSugarTransactionApi : ITransactionApi, ISupportsRollback
     {
-        private readonly ISqlSugarDbContext _dbContext;
+        private ISqlSugarDbContext _sqlsugarDbContext;
 
-        public SqlSugarTransactionApi(ISqlSugarDbContext dbContext)
+        public SqlSugarTransactionApi(ISqlSugarDbContext sqlsugarDbContext)
         {
-            _dbContext = dbContext;
+            _sqlsugarDbContext = sqlsugarDbContext;
         }
 
-        /// <summary>
-        /// 获取数据库上下文
-        /// </summary>
         public ISqlSugarDbContext GetDbContext()
         {
-            return _dbContext;
+            return _sqlsugarDbContext;
         }
 
-        /// <summary>
-        /// 提交事务
-        /// </summary>
         public async Task CommitAsync(CancellationToken cancellationToken = default)
         {
-            await _dbContext.SqlSugarClient.Ado.CommitTranAsync();
+            await _sqlsugarDbContext.SqlSugarClient.Ado.CommitTranAsync();
         }
 
-        /// <summary>
-        /// 回滚事务
-        /// </summary>
-        public async Task RollbackAsync(CancellationToken cancellationToken = default)
-        {
-            await _dbContext.SqlSugarClient.Ado.RollbackTranAsync();
-        }
-
-        /// <summary>
-        /// 释放资源
-        /// </summary>
         public void Dispose()
         {
-            _dbContext.SqlSugarClient.Ado.Dispose();
+            _sqlsugarDbContext.SqlSugarClient.Ado.Dispose();
+        }
+
+        public async Task RollbackAsync(CancellationToken cancellationToken = default)
+        {
+            await _sqlsugarDbContext.SqlSugarClient.Ado.RollbackTranAsync();
         }
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/UnitOfWorkSqlsugarDbContextProvider.cs

@@ -13,121 +13,138 @@ namespace Yi.Framework.SqlSugarCore.Uow
 {
     public class UnitOfWorkSqlsugarDbContextProvider<TDbContext> : ISugarDbContextProvider<TDbContext> where TDbContext : ISqlSugarDbContext
     {
-        /// <summary>
+        private readonly ISqlSugarDbConnectionCreator _dbConnectionCreator;
-        /// 日志记录器
-        /// </summary>
-        public ILogger<UnitOfWorkSqlsugarDbContextProvider<TDbContext>> Logger { get; set; }
 
-        /// <summary>
+        public ILogger<UnitOfWorkSqlsugarDbContextProvider<TDbContext>> Logger { get; set; }
-        /// 服务提供者
-        /// </summary>
         public IServiceProvider ServiceProvider { get; set; }
 
-        /// <summary>
-        /// 数据库上下文访问器实例
-        /// </summary>
         private static AsyncLocalDbContextAccessor ContextInstance => AsyncLocalDbContextAccessor.Instance;
-
+        protected readonly IUnitOfWorkManager UnitOfWorkManager;
-        private readonly TenantConfigurationWrapper _tenantConfigurationWrapper;
+        protected readonly IConnectionStringResolver ConnectionStringResolver;
-        private readonly IUnitOfWorkManager _unitOfWorkManager;
+        protected readonly ICancellationTokenProvider CancellationTokenProvider;
-        private readonly IConnectionStringResolver _connectionStringResolver;
+        protected readonly ICurrentTenant CurrentTenant;
-        private readonly ICancellationTokenProvider _cancellationTokenProvider;
-        private readonly ICurrentTenant _currentTenant;
 
         public UnitOfWorkSqlsugarDbContextProvider(
             IUnitOfWorkManager unitOfWorkManager,
             IConnectionStringResolver connectionStringResolver,
             ICancellationTokenProvider cancellationTokenProvider,
             ICurrentTenant currentTenant,
-            TenantConfigurationWrapper tenantConfigurationWrapper)
+            ISqlSugarDbConnectionCreator dbConnectionCreator
+        )
         {
-            _unitOfWorkManager = unitOfWorkManager;
+            UnitOfWorkManager = unitOfWorkManager;
-            _connectionStringResolver = connectionStringResolver;
+            ConnectionStringResolver = connectionStringResolver;
-            _cancellationTokenProvider = cancellationTokenProvider;
+            CancellationTokenProvider = cancellationTokenProvider;
-            _currentTenant = currentTenant;
+            CurrentTenant = currentTenant;
-            _tenantConfigurationWrapper = tenantConfigurationWrapper;
             Logger = NullLogger<UnitOfWorkSqlsugarDbContextProvider<TDbContext>>.Instance;
+            _dbConnectionCreator = dbConnectionCreator;
         }
 
-        /// <summary>
+        //private static object _databaseApiLock = new object();
-        /// 获取数据库上下文
-        /// </summary>
         public virtual async Task<TDbContext> GetDbContextAsync()
         {
-            // 获取当前租户配置
-            var tenantConfiguration = await _tenantConfigurationWrapper.GetAsync();
 
-            // 获取连接字符串信息
+            var connectionStringName = ConnectionStrings.DefaultConnectionStringName;
-            var connectionStringName = tenantConfiguration.GetCurrentConnectionName();
+
-            var connectionString = tenantConfiguration.GetCurrentConnectionString();
+            //获取当前连接字符串，未多租户时，默认为空
+            var connectionString = await ResolveConnectionStringAsync(connectionStringName);
             var dbContextKey = $"{this.GetType().Name}_{connectionString}";
 
-            var unitOfWork = _unitOfWorkManager.Current;
+
-            if (unitOfWork == null)
+            var unitOfWork = UnitOfWorkManager.Current;
+            if (unitOfWork == null /*|| unitOfWork.Options.IsTransactional == false*/)
             {
-                throw new AbpException(
+                var dbContext = (TDbContext)ServiceProvider.GetRequiredService<ISqlSugarDbContext>();
-                    "DbContext 只能在工作单元内工作，当前DbContext没有工作单元，如需创建新线程并发操作，请手动创建工作单元");
+                //提高体验，取消工作单元强制性
+                //throw new AbpException("A DbContext can only be created inside a unit of work!");
+                //如果不启用工作单元，创建一个新的db，不开启事务即可
+                return dbContext;
             }
 
-            // 尝试从当前工作单元获取数据库API
+
+
+
+
+            //尝试当前工作单元获取db
             var databaseApi = unitOfWork.FindDatabaseApi(dbContextKey);
 
-            // 当前没有数据库API则创建新的
+            //当前没有db创建一个新的db
             if (databaseApi == null)
             {
+                //db根据连接字符串来创建
                 databaseApi = new SqlSugarDatabaseApi(
                   await CreateDbContextAsync(unitOfWork, connectionStringName, connectionString)
                 );
-                unitOfWork.AddDatabaseApi(dbContextKey, databaseApi);
-            }
 
+                //await Console.Out.WriteLineAsync(">>>----------------实例化了db"+ ((SqlSugarDatabaseApi)databaseApi).DbContext.SqlSugarClient.ContextID.ToString());
+                //创建的db加入到当前工作单元中
+                unitOfWork.AddDatabaseApi(dbContextKey, databaseApi);
+
+            }
             return (TDbContext)((SqlSugarDatabaseApi)databaseApi).DbContext;
         }
 
-        /// <summary>
+
-        /// 创建数据库上下文
+
-        /// </summary>
+        protected virtual async Task<TDbContext> CreateDbContextAsync(IUnitOfWork unitOfWork, string connectionStringName, string connectionString)
-        protected virtual async Task<TDbContext> CreateDbContextAsync(
-            IUnitOfWork unitOfWork, 
-            string connectionStringName, 
-            string connectionString)
         {
             var creationContext = new SqlSugarDbContextCreationContext(connectionStringName, connectionString);
+            //将连接key进行传值
             using (SqlSugarDbContextCreationContext.Use(creationContext))
             {
-                return await CreateDbContextAsync(unitOfWork);
+                var dbContext = await CreateDbContextAsync(unitOfWork);
+                return dbContext;
             }
         }
 
-        /// <summary>
-        /// 根据工作单元创建数据库上下文
-        /// </summary>
         protected virtual async Task<TDbContext> CreateDbContextAsync(IUnitOfWork unitOfWork)
         {
             return unitOfWork.Options.IsTransactional
                 ? await CreateDbContextWithTransactionAsync(unitOfWork)
                 : unitOfWork.ServiceProvider.GetRequiredService<TDbContext>();
         }
-
-        /// <summary>
-        /// 创建带事务的数据库上下文
-        /// </summary>
         protected virtual async Task<TDbContext> CreateDbContextWithTransactionAsync(IUnitOfWork unitOfWork)
         {
-            var transactionApiKey = $"SqlSugarCore_{SqlSugarDbContextCreationContext.Current.ConnectionString}";
+            //事务key
+            var transactionApiKey = $"SqlsugarCore_{SqlSugarDbContextCreationContext.Current.ConnectionString}";
+
+            //尝试查找事务
             var activeTransaction = unitOfWork.FindTransactionApi(transactionApiKey) as SqlSugarTransactionApi;
 
+            //该db还没有进行开启事务
             if (activeTransaction == null)
             {
+                //获取到db添加事务即可
                 var dbContext = unitOfWork.ServiceProvider.GetRequiredService<TDbContext>();
-                var transaction = new SqlSugarTransactionApi(dbContext);
+                var transaction = new SqlSugarTransactionApi(
+                          dbContext
+                      );
                 unitOfWork.AddTransactionApi(transactionApiKey, transaction);
 
                 await dbContext.SqlSugarClient.Ado.BeginTranAsync();
                 return dbContext;
             }
-
+            else
+            {
                 return (TDbContext)activeTransaction.GetDbContext();
             }
+
+
+        }
+
+
+        protected virtual async Task<string> ResolveConnectionStringAsync(string connectionStringName)
+        {
+            if (typeof(TDbContext).IsDefined(typeof(IgnoreMultiTenancyAttribute), false))
+            {
+                using (CurrentTenant.Change(null))
+                {
+                    return await ConnectionStringResolver.ResolveAsync(connectionStringName);
+                }
+            }
+
+            return await ConnectionStringResolver.ResolveAsync(connectionStringName);
+        }
+
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/YiFrameworkSqlSugarCoreModule.cs

@@ -6,189 +6,111 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using SqlSugar;
+using Volo.Abp;
+using Volo.Abp.Auditing;
 using Volo.Abp.Data;
 using Volo.Abp.Domain;
 using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Guids;
+using Volo.Abp.Modularity;
-using Volo.Abp.MultiTenancy;
-using Volo.Abp.MultiTenancy.ConfigurationStore;
 using Yi.Framework.SqlSugarCore.Abstractions;
 using Yi.Framework.SqlSugarCore.Repositories;
 using Yi.Framework.SqlSugarCore.Uow;
 
 namespace Yi.Framework.SqlSugarCore
 {
-    /// <summary>
-    /// SqlSugar Core模块
-    /// </summary>
     [DependsOn(typeof(AbpDddDomainModule))]
     public class YiFrameworkSqlSugarCoreModule : AbpModule
     {
         public override Task ConfigureServicesAsync(ServiceConfigurationContext context)
         {
-            var services = context.Services;
+            var service = context.Services;
-            var configuration = services.GetConfiguration();
+            var configuration = service.GetConfiguration();
+            var section = configuration.GetSection("DbConnOptions");
+            Configure<DbConnOptions>(section);
 
-            // 配置数据库连接选项
+            service.TryAddScoped<ISqlSugarDbContext, SqlSugarDbContext>();
-            ConfigureDbOptions(services, configuration);
 
-            // 配置GUID生成器
+            //不开放sqlsugarClient
-            ConfigureGuidGenerator(services);
+            //service.AddTransient<ISqlSugarClient>(x => x.GetRequiredService<ISqlsugarDbContext>().SqlSugarClient);
 
-            // 注册仓储和服务
+
-            RegisterRepositories(services);
+            service.AddTransient(typeof(IRepository<>), typeof(SqlSugarRepository<>));
+            service.AddTransient(typeof(IRepository<,>), typeof(SqlSugarRepository<,>));
+            service.AddTransient(typeof(ISqlSugarRepository<>), typeof(SqlSugarRepository<>));
+            service.AddTransient(typeof(ISqlSugarRepository<,>), typeof(SqlSugarRepository<,>));
+
+            service.AddTransient(typeof(ISugarDbContextProvider<>), typeof(UnitOfWorkSqlsugarDbContextProvider<>));
+            //替换Sqlsugar默认序列化器，用来解决.Select()不支持嵌套对象/匿名对象的非公有访问器 值无法绑定,如Id属性
+            context.Services.AddSingleton<ISerializeService, SqlSugarNonPublicSerializer>();
+
+            var dbConfig = section.Get<DbConnOptions>();
+            //将默认db传递给abp连接字符串模块
+            Configure<AbpDbConnectionOptions>(x => { x.ConnectionStrings.Default = dbConfig.Url; });
 
             return Task.CompletedTask;
         }
 
-        private void ConfigureDbOptions(IServiceCollection services, IConfiguration configuration)
-        {
-            var section = configuration.GetSection("DbConnOptions");
-            Configure<DbConnOptions>(section);
-
-            var dbConnOptions = new DbConnOptions();
-            section.Bind(dbConnOptions);
-
-            // 配置默认连接字符串
-            Configure<AbpDbConnectionOptions>(options => 
-            { 
-                options.ConnectionStrings.Default = dbConnOptions.Url; 
-            });
-
-            // 配置默认租户
-            ConfigureDefaultTenant(services, dbConnOptions);
-        }
-
-        private void ConfigureGuidGenerator(IServiceCollection services)
-        {
-            var dbConnOptions = services.GetConfiguration()
-                .GetSection("DbConnOptions")
-                .Get<DbConnOptions>();
-
-            var guidType = GetSequentialGuidType(dbConnOptions?.DbType);
-            Configure<AbpSequentialGuidGeneratorOptions>(options =>
-            {
-                options.DefaultSequentialGuidType = guidType;
-            });
-        }
-
-        private void RegisterRepositories(IServiceCollection services)
-        {
-            services.TryAddTransient<ISqlSugarDbContext, SqlSugarDbContextFactory>();
-            services.AddTransient(typeof(IRepository<>), typeof(SqlSugarRepository<>));
-            services.AddTransient(typeof(IRepository<,>), typeof(SqlSugarRepository<,>));
-            services.AddTransient(typeof(ISqlSugarRepository<>), typeof(SqlSugarRepository<>));
-            services.AddTransient(typeof(ISqlSugarRepository<,>), typeof(SqlSugarRepository<,>));
-            services.AddTransient(typeof(ISugarDbContextProvider<>), typeof(UnitOfWorkSqlsugarDbContextProvider<>));
-            services.AddSingleton<ISerializeService, SqlSugarNonPublicSerializer>();
-            services.AddYiDbContext<DefaultSqlSugarDbContext>();
-        }
-
-        private void ConfigureDefaultTenant(IServiceCollection services, DbConnOptions dbConfig)
-        {
-            Configure<AbpDefaultTenantStoreOptions>(options => 
-            {
-                var tenants = options.Tenants.ToList();
-                
-                // 规范化租户名称
-                foreach (var tenant in tenants)
-                {
-                    tenant.NormalizedName = tenant.Name.Contains("@") 
-                        ? tenant.Name.Substring(0, tenant.Name.LastIndexOf("@")) 
-                        : tenant.Name;
-                }
-
-                // 添加默认租户
-                tenants.Insert(0, new TenantConfiguration
-                {
-                    Id = Guid.Empty,
-                    Name = ConnectionStrings.DefaultConnectionStringName,
-                    NormalizedName = ConnectionStrings.DefaultConnectionStringName,
-                    ConnectionStrings = new ConnectionStrings 
-                    { 
-                        { ConnectionStrings.DefaultConnectionStringName, dbConfig.Url } 
-                    },
-                    IsActive = true
-                });
-
-                options.Tenants = tenants.ToArray();
-            });
-        }
-
-        private SequentialGuidType GetSequentialGuidType(DbType? dbType)
-        {
-            return dbType switch
-            {
-                DbType.MySql or DbType.PostgreSQL => SequentialGuidType.SequentialAsString,
-                DbType.SqlServer => SequentialGuidType.SequentialAtEnd,
-                DbType.Oracle => SequentialGuidType.SequentialAsBinary,
-                _ => SequentialGuidType.SequentialAtEnd
-            };
-        }
 
         public override async Task OnPreApplicationInitializationAsync(ApplicationInitializationContext context)
         {
-            var serviceProvider = context.ServiceProvider;
+            //进行CodeFirst
-            var options = serviceProvider.GetRequiredService<IOptions<DbConnOptions>>().Value;
+            var service = context.ServiceProvider;
-            var logger = serviceProvider.GetRequiredService<ILogger<YiFrameworkSqlSugarCoreModule>>();
+            var options = service.GetRequiredService<IOptions<DbConnOptions>>().Value;
 
-            // 记录配置信息
+            var logger = service.GetRequiredService<ILogger<YiFrameworkSqlSugarCoreModule>>();
-            LogConfiguration(logger, options);
+
+
+            StringBuilder sb = new StringBuilder();
+            sb.AppendLine();
+            sb.AppendLine("==========Yi-SQL配置:==========");
+            sb.AppendLine($"数据库连接字符串：{options.Url}");
+            sb.AppendLine($"数据库类型：{options.DbType.ToString()}");
+            sb.AppendLine($"是否开启种子数据：{options.EnabledDbSeed}");
+            sb.AppendLine($"是否开启CodeFirst：{options.EnabledCodeFirst}");
+            sb.AppendLine($"是否开启Saas多租户：{options.EnabledSaasMultiTenancy}");
+            sb.AppendLine("===============================");
+
+
+            logger.LogInformation(sb.ToString());
+            //Todo：准备支持多租户种子数据及CodeFirst
 
-            // 初始化数据库
             if (options.EnabledCodeFirst)
             {
-                await InitializeDatabase(serviceProvider);
+                CodeFirst(service);
             }
 
-            // 初始化种子数据
             if (options.EnabledDbSeed)
             {
-                await InitializeSeedData(serviceProvider);
+                await DataSeedAsync(service);
             }
         }
 
-        private void LogConfiguration(ILogger logger, DbConnOptions options)
+        private void CodeFirst(IServiceProvider service)
         {
-            var logMessage = new StringBuilder()
+            var moduleContainer = service.GetRequiredService<IModuleContainer>();
-                .AppendLine()
+            var db = service.GetRequiredService<ISqlSugarDbContext>().SqlSugarClient;
-                .AppendLine("==========Yi-SQL配置:==========")
-                .AppendLine($"数据库连接字符串：{options.Url}")
-                .AppendLine($"数据库类型：{options.DbType}")
-                .AppendLine($"是否开启种子数据：{options.EnabledDbSeed}")
-                .AppendLine($"是否开启CodeFirst：{options.EnabledCodeFirst}")
-                .AppendLine($"是否开启Saas多租户：{options.EnabledSaasMultiTenancy}")
-                .AppendLine("===============================")
-                .ToString();
 
-            logger.LogInformation(logMessage);
+            //尝试创建数据库
-        }
-
-        private async Task InitializeDatabase(IServiceProvider serviceProvider)
-        {
-            var moduleContainer = serviceProvider.GetRequiredService<IModuleContainer>();
-            var db = serviceProvider.GetRequiredService<ISqlSugarDbContext>().SqlSugarClient;
-
-            // 创建数据库
             db.DbMaintenance.CreateDatabase();
 
-            // 获取需要创建表的实体类型
+            List<Type> types = new List<Type>();
-            var entityTypes = moduleContainer.Modules
+            foreach (var module in moduleContainer.Modules)
-                .SelectMany(m => m.Assembly.GetTypes())
-                .Where(t => t.GetCustomAttribute<IgnoreCodeFirstAttribute>() == null
-                    && t.GetCustomAttribute<SugarTable>() != null
-                    && t.GetCustomAttribute<SplitTableAttribute>() == null)
-                .ToList();
-
-            if (entityTypes.Any())
             {
-                db.CopyNew().CodeFirst.InitTables(entityTypes.ToArray());
+                types.AddRange(module.Assembly.GetTypes()
+                    .Where(x => x.GetCustomAttribute<IgnoreCodeFirstAttribute>() == null)
+                    .Where(x => x.GetCustomAttribute<SugarTable>() != null)
+                    .Where(x => x.GetCustomAttribute<SplitTableAttribute>() is null));
+            }
+
+            if (types.Count > 0)
+            {
+                db.CopyNew().CodeFirst.InitTables(types.ToArray());
             }
         }
 
-        private async Task InitializeSeedData(IServiceProvider serviceProvider)
+        private async Task DataSeedAsync(IServiceProvider service)
         {
-            var dataSeeder = serviceProvider.GetRequiredService<IDataSeeder>();
+            var dataSeeder = service.GetRequiredService<IDataSeeder>();
             await dataSeeder.SeedAsync();
         }
     }

Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/Abstract/IErrorObjct.cs

@@ -1,6 +0,0 @@
-namespace Yi.Framework.WeChat.MiniProgram.Abstract;
-
-public interface IErrorObjct: IHasErrcode, IHasErrmsg
-{
-    
-}

Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/Abstract/IHasErrcode.cs

@@ -1,6 +0,0 @@
-namespace Yi.Framework.WeChat.MiniProgram.Abstract;
-
-public interface IHasErrcode
-{
-    public int errcode { get; set; }
-}

Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/Abstract/IHasErrmsg.cs

@@ -1,6 +0,0 @@
-namespace Yi.Framework.WeChat.MiniProgram.Abstract;
-
-public interface IHasErrmsg
-{
-    string errmsg { get; set; }
-}

Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/HttpModels/AccessTokenHttpModel.cs

@@ -1,15 +0,0 @@
-namespace Yi.Framework.WeChat.MiniProgram.HttpModels;
-
-public class AccessTokenResponse
-{
-    public string access_token { get;  set; }
-
-    public int expires_in { get; set; }
-}
-
-public class AccessTokenRequest
-{
-    public string grant_type { get; set; }
-    public string appid { get; set; }
-    public string secret { get; set; }
-}

Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/HttpModels/Code2SessionHttpModel.cs

@@ -1,31 +0,0 @@
-using Yi.Framework.WeChat.MiniProgram.Abstract;
-
-namespace Yi.Framework.WeChat.MiniProgram.HttpModels;
-
-
-    public class Code2SessionResponse: IErrorObjct
-    {
-        public string openid { get; set; }
-        public string session_key { get; set; }
-        public string unionid { get; set; }
-        public int errcode { get; set; }
-        public string errmsg { get; set; }
-    }
-
-    public class Code2SessionRequest
-    {
-        public string appid { get; set; }
-        public string secret { get; set; }
-        public string js_code { get; set; }
-        public string grant_type => "authorization_code";
-    }
-
-    public class Code2SessionInput
-    {
-        public Code2SessionInput(string js_code)
-        { 
-        
-            this.js_code=js_code;
-        }
-        public string js_code { get; set; }
-    }

Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/HttpModels/SubscribeNoticeHttpModel.cs

@@ -1,79 +0,0 @@
-using Yi.Framework.WeChat.MiniProgram.Abstract;
-
-namespace Yi.Framework.WeChat.MiniProgram.HttpModels;
-
-public class SubscribeNoticeRequest
-{
-    /// <summary>
-    ///用户openid，可以是小程序的openid，也可以是mp_template_msg.appid对应的公众号的openid
-    /// </summary>
-    public string touser { get; set; }
-
-    /// <summary>
-    /// 小程序模板id
-    /// </summary>
-    public string template_id { get; set; }
-    
-    /// <summary>
-    /// 跳转页面
-    /// </summary>
-    public string page { get; set; }
-
-    /// <summary>
-    /// 小程序模板消息的数据
-    /// </summary>
-    public Dictionary<string, keyValueItem> data { get; set; }
-
-    /// <summary>
-    /// 默认为正式版
-    /// </summary>
-    public string miniprogram_state { get; set; } = "formal";
-
-    /// <summary>
-    /// 默认为中文
-    /// </summary>
-    public string lang { get; set; } = "zh_CN";
-}
-
-
-public class SubscribeNoticeInput
-{
-    /// <summary>
-    ///用户openid，可以是小程序的openid，也可以是mp_template_msg.appid对应的公众号的openid
-    /// </summary>
-    public string touser { get; set; }
-
-    /// <summary>
-    /// 小程序模板id
-    /// </summary>
-    public string template_id { get; set; }
-
-    /// <summary>
-    /// 跳转页面
-    /// </summary>
-    public string page { get; set; }
-
-    /// <summary>
-    /// 公众号模板消息的数据
-    /// </summary>
-    public Dictionary<string, keyValueItem> data { get; set; }
-}
-
-public class SubscribeNoticeResponse : IErrorObjct
-{
-    public int errcode { get; set; }
-    public string errmsg { get; set; }
-}
-
-
-
-
-public class keyValueItem
-{
-    public keyValueItem(string value)
-    {
-        this.value = value;
-    }
-
-    public string value { get; set; }
-}

Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/IWeChatMiniProgramManager.cs

@@ -1,20 +0,0 @@
-using Yi.Framework.WeChat.MiniProgram.HttpModels;
-
-namespace Yi.Framework.WeChat.MiniProgram;
-
-public interface IWeChatMiniProgramManager
-{
-    /// <summary>
-    /// 获取用户openid
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    Task<Code2SessionResponse> Code2SessionAsync(Code2SessionInput input);
-
-    /// <summary>
-    /// 向用户发送订阅消息，要openid
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    Task SendSubscribeNoticeAsync(SubscribeNoticeInput input);
-}

Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/Token/CacheMiniProgramToken.cs

@@ -1,28 +0,0 @@
-using Microsoft.Extensions.Caching.Distributed;
-using Microsoft.Extensions.Options;
-using Volo.Abp.Caching;
-
-namespace Yi.Framework.WeChat.MiniProgram.Token;
-
-internal class CacheMiniProgramToken : DefaultMinProgramToken, IMiniProgramToken
-{
-    private IDistributedCache<string> _cache;
-    private const string CacheKey = "MiniProgramToken";
-
-    public CacheMiniProgramToken(IOptions<WeChatMiniProgramOptions> options, IDistributedCache<string> cache) :
-        base(options)
-    {
-        _cache = cache;
-    }
-
-    public async Task<string> GetTokenAsync()
-    {
-        return await _cache.GetOrAddAsync("MiniProgramToken", async () => { return await base.GetTokenAsync(); }, () =>
-        {
-            return new DistributedCacheEntryOptions()
-            {
-                AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(2) - TimeSpan.FromMinutes(1)
-            };
-        });
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/Token/DefaultMinProgramToken.cs

@@ -1,40 +0,0 @@
-using System.Net.Http.Json;
-using Microsoft.Extensions.Options;
-using Yi.Framework.Core.Extensions;
-using Yi.Framework.WeChat.MiniProgram.HttpModels;
-
-namespace Yi.Framework.WeChat.MiniProgram.Token;
-
-internal class DefaultMinProgramToken:IMiniProgramToken
-{
-    private const string Url = "https://api.weixin.qq.com/cgi-bin/token";
-    private WeChatMiniProgramOptions _options;
-    public DefaultMinProgramToken(IOptions<WeChatMiniProgramOptions> options)
-    {
-        _options = options.Value;
-    }
-    public async Task<string> GetTokenAsync()
-    {
-        var token = await this.GetAccessToken();
-        return token.access_token;
-    }
-    public async Task<AccessTokenResponse> GetAccessToken()
-    {
-        var req = new AccessTokenRequest();
-        req.appid = _options.AppID;
-        req.secret = _options.AppSecret;
-        req.grant_type = "client_credential";
-        using (HttpClient httpClient = new HttpClient())
-        {
-            string queryString = req.ToQueryString();
-            var builder = new UriBuilder(Url);
-            builder.Query = queryString;
-            HttpResponseMessage response = await httpClient.GetAsync(builder.ToString());
-
-            response.EnsureSuccessStatusCode();
-
-            var responseBody = await response.Content.ReadFromJsonAsync<AccessTokenResponse>();
-            return responseBody;
-        }
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/Token/IMiniProgramToken.cs

@@ -1,6 +0,0 @@
-namespace Yi.Framework.WeChat.MiniProgram.Token;
-
-public interface IMiniProgramToken
-{
-    public Task<string> GetTokenAsync();
-}

Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/WeChatMiniProgramException.cs

@@ -1,27 +0,0 @@
-namespace Yi.Framework.WeChat.MiniProgram;
-
-public class WeChatMiniProgramException: Exception
-{
-    public override string Message
-    {
-        get
-        {
-            // 加上前缀
-            return "微信Api异常: " + base.Message;
-        }
-    }
-
-    public WeChatMiniProgramException()
-    {
-    }
-
-    public WeChatMiniProgramException(string message)
-        : base(message)
-    {
-    }
-
-    public WeChatMiniProgramException(string message, Exception innerException)
-        : base(message, innerException)
-    {
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/WeChatMiniProgramExtensions.cs

@@ -1,50 +0,0 @@
-using System.Reflection;
-using System.Web;
-using Yi.Framework.WeChat.MiniProgram.Abstract;
-
-namespace Yi.Framework.WeChat.MiniProgram;
-
-public static class WeChatMiniProgramExtensions
-{
-    /// <summary>
-    /// 效验请求是否成功
-    /// </summary>
-    /// <param name="response"></param>
-    /// <returns></returns>
-    internal static void ValidateSuccess(this IErrorObjct response)
-    {
-
-        if (response.errcode != 0)
-        {
-            throw new WeChatMiniProgramException(response.errmsg);
-        }
-    }
-
-    internal static string ToQueryString<T>(this T obj)
-    {
-        var properties = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
-        var queryParams = new List<string>();
-
-        foreach (var prop in properties)
-        {
-            var value = prop.GetValue(obj, null);
-            if (value != null)
-            {
-                // 处理集合
-                if (value is IEnumerable<object> enumerable)
-                {
-                    foreach (var item in enumerable)
-                    {
-                        queryParams.Add($"{HttpUtility.UrlEncode(prop.Name)}={HttpUtility.UrlEncode(item.ToString())}");
-                    }
-                }
-                else
-                {
-                    queryParams.Add($"{HttpUtility.UrlEncode(prop.Name)}={HttpUtility.UrlEncode(value.ToString())}");
-                }
-            }
-        }
-
-        return string.Join("&", queryParams);
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/WeChatMiniProgramManager.cs

@@ -1,77 +0,0 @@
-using System.Net.Http.Json;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-using Volo.Abp.DependencyInjection;
-using Yi.Framework.Core.Extensions;
-using Yi.Framework.WeChat.MiniProgram.HttpModels;
-using Yi.Framework.WeChat.MiniProgram.Token;
-
-namespace Yi.Framework.WeChat.MiniProgram;
-
-public class WeChatMiniProgramManager : IWeChatMiniProgramManager, ISingletonDependency
-{
-    private IMiniProgramToken _weChatToken;
-    private WeChatMiniProgramOptions _options;
-
-    public WeChatMiniProgramManager(IMiniProgramToken weChatToken, IOptions<WeChatMiniProgramOptions> options)
-    {
-        _weChatToken = weChatToken;
-        _options = options.Value;
-    }
-
-    /// <summary>
-    /// 获取用户openid
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    public async Task<Code2SessionResponse> Code2SessionAsync(Code2SessionInput input)
-    {
-        string url = "https://api.weixin.qq.com/sns/jscode2session";
-        var req = new Code2SessionRequest();
-        req.js_code = input.js_code;
-        req.secret = _options.AppSecret;
-        req.appid = _options.AppID;
-
-        using (HttpClient httpClient = new HttpClient())
-        {
-            string queryString = req.ToQueryString();
-            var builder = new UriBuilder(url);
-            builder.Query = queryString;
-            HttpResponseMessage response = await httpClient.GetAsync(builder.ToString());
-            var responseBody = await response.Content.ReadFromJsonAsync<Code2SessionResponse>();
-
-            responseBody.ValidateSuccess();
-
-            return responseBody;
-        }
-    }
-
-
-    
-    /// <summary>
-    /// 发送模板订阅消息
-    /// </summary>
-    /// <param name="input"></param>
-    public async Task SendSubscribeNoticeAsync(SubscribeNoticeInput input)
-    {
-        var token = await _weChatToken.GetTokenAsync();
-        string url = $"https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token={token}";
-        var req = new SubscribeNoticeRequest
-        {
-            touser = input.touser,
-            template_id = input.template_id,
-            page = input.page,
-            data = input.data,
-            miniprogram_state = _options.Notice?.State??"formal"
-        };
-        req.template_id=req.template_id?? _options.Notice?.TemplateId;
- 
-        using (HttpClient httpClient = new HttpClient())
-        {
-            var body =new StringContent(JsonConvert.SerializeObject(req));
-            HttpResponseMessage response = await httpClient.PostAsync(url, body);
-            var responseBody = await response.Content.ReadFromJsonAsync<SubscribeNoticeResponse>();
-            responseBody.ValidateSuccess();
-        }
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/WeChatMiniProgramOptions.cs

@@ -1,30 +0,0 @@
-namespace Yi.Framework.WeChat.MiniProgram;
-
-public class WeChatMiniProgramOptions
-{
-    /// <summary>
-    /// AppId
-    /// </summary>
-    public string AppID { get; set; }
-    
-    /// <summary>
-    /// App密钥
-    /// </summary>
-    public string AppSecret { get; set; }
-
-    /// <summary>
-    /// 消息
-    /// </summary>
-    public WeChatMiniProgramNoticeItem Notice { get; set; }
-
-}
-
-public class WeChatMiniProgramNoticeItem
-{
-    /// <summary>
-    /// 模板id
-    /// </summary>
-    public string TemplateId { get; set; }
-
-    public string State { get; set; }
-}

Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/Yi.Framework.WeChat.MiniProgram.csproj

@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <Import Project="..\..\common.props" />
-    <ItemGroup>
-        <ProjectReference Include="..\Yi.Framework.Core\Yi.Framework.Core.csproj" />
-        <PackageReference Include="Volo.Abp.Caching" Version="$(AbpVersion)" />
-    </ItemGroup>
-</Project>

Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/YiFrameworkWeChatMiniProgramModule.cs

@@ -1,19 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Caching;
-using Yi.Framework.Core;
-using Yi.Framework.WeChat.MiniProgram.Token;
-
-namespace Yi.Framework.WeChat.MiniProgram;
-
-[DependsOn(typeof(YiFrameworkCoreModule),
-    typeof(AbpCachingModule))]
-public class YiFrameworkWeChatMiniProgramModule: AbpModule
-{
-    public override void ConfigureServices(ServiceConfigurationContext context)
-    {
-        var services = context.Services;
-        var configuration = context.Services.GetConfiguration();
-        Configure<WeChatMiniProgramOptions>(configuration.GetSection("WeChatMiniProgram"));
-        services.AddSingleton<IMiniProgramToken, CacheMiniProgramToken>();
-    }
-}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/AiUserRoleMenuDto.cs

@@ -1,21 +0,0 @@
-using Yi.Framework.Rbac.Domain.Shared.Dtos;
-
-namespace Yi.Framework.AiHub.Application.Contracts.Dtos;
-
-public class AiUserRoleMenuDto:UserRoleMenuDto
-{
-    /// <summary>
-    /// 是否绑定服务号
-    /// </summary>
-    public bool IsBindFuwuhao { get; set; }
-
-    /// <summary>
-    /// 是否为VIP用户
-    /// </summary>
-    public bool IsVip { get; set; }
-
-    /// <summary>
-    /// VIP到期时间
-    /// </summary>
-    public DateTime? VipExpireTime { get; set; }
-}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Announcement/AnnouncementCacheDto.cs

@@ -1,22 +0,0 @@
-namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Announcement;
-
-/// <summary>
-/// 公告缓存 DTO
-/// </summary>
-public class AnnouncementCacheDto
-{
-    /// <summary>
-    /// 版本号
-    /// </summary>
-    public string Version { get; set; } = string.Empty;
-
-    /// <summary>
-    /// 公告日志列表
-    /// </summary>
-    public List<AnnouncementLogDto> Logs { get; set; } = new List<AnnouncementLogDto>();
-    
-    /// <summary>
-    /// 跳转链接
-    /// </summary>
-    public string? Url { get; set; }
-}