fix: 同步

.gitignore

@@ -1,7 +1,20 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+WebFirst/SoEasyPlatform.exe
+WebFirst/excel
+WebFirst/wwwroot
+WebFirst/SoEasyPlatform.exe
+WebFirst/appsettings.Development.json
+WebFirst/appsettings.json
+WebFirst/SoEasyPlatform.pdb
+WebFirst/SoEasyPlatform.Views.pdb
+WebFirst/web.config
+WebFirst/WebFirst.exe
 
 # User-specific files
+*.rsuser
 *.suo
 *.user
 *.userosscache
@@ -17,16 +30,21 @@
 [Rr]eleases/
 x64/
 x86/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
 bld/
 [Bb]in/
 [Oo]bj/
-[L]og/
+[Ll]og/
 
-# Visual Studio 2015 cache/options directory
+# Visual Studio 2015/2017 cache/options directory
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
 
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
@@ -40,18 +58,28 @@ TestResult.xml
 [Rr]eleasePS/
 dlldata.c
 
-# DNX
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
 project.lock.json
+project.fragment.lock.json
 artifacts/
 
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
 *_i.c
 *_p.c
-*_i.h
+*_h.h
 *.ilk
 *.meta
 *.obj
+*.iobj
 *.pch
 *.pdb
+*.ipdb
 *.pgc
 *.pgd
 *.rsp
@@ -61,6 +89,7 @@ artifacts/
 *.tlh
 *.tmp
 *.tmp_proj
+*_wpftmp.csproj
 *.log
 *.vspscc
 *.vssscc
@@ -89,6 +118,9 @@ ipch/
 *.vspx
 *.sap
 
+# Visual Studio Trace Files
+*.e2e
+
 # TFS 2012 Local Workspace
 $tf/
 
@@ -109,6 +141,14 @@ _TeamCity*
 # DotCover is a Code Coverage Tool
 *.dotCover
 
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
 # NCrunch
 _NCrunch_*
 .*crunch*.local.xml
@@ -140,7 +180,7 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
+# Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
 *.publishproj
@@ -153,12 +193,12 @@ PublishScripts/
 # NuGet Packages
 *.nupkg
 # The packages folder can be ignored because of Package Restore
-**/packages/*
+**/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
-!**/packages/build/
+!**/[Pp]ackages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
+#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
+# NuGet v3's project.json files produces more ignorable files
 *.nuget.props
 *.nuget.targets
 
@@ -175,12 +215,13 @@ AppPackages/
 BundleArtifacts/
 Package.StoreAssociation.xml
 _pkginfo.txt
+*.appx
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
 *.[Cc]ache
 # but keep track of directories ending in .cache
-!*.[Cc]ache/
+!?*.[Cc]ache/
 
 # Others
 ClientBin/
@@ -188,11 +229,15 @@ ClientBin/
 *~
 *.dbmdl
 *.dbproj.schemaview
+*.jfm
 *.pfx
 *.publishsettings
-node_modules/
 orleans.codegen.cs
 
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
 # Since there are multiple workflows, uncomment next line to ignore bower_components
 # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
 #bower_components/
@@ -207,15 +252,20 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
 
 # SQL Server files
 *.mdf
 *.ldf
+*.ndf
 
 # Business Intelligence projects
 *.rdl.data
 *.bim.layout
 *.bim_*.settings
+*.rptproj.rsuser
+*- Backup*.rdl
 
 # Microsoft Fakes
 FakesAssemblies/
@@ -225,6 +275,7 @@ FakesAssemblies/
 
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
+node_modules/
 
 # Visual Studio 6 build log
 *.plg
@@ -232,6 +283,9 @@ FakesAssemblies/
 # Visual Studio 6 workspace options file
 *.opt
 
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
@@ -251,29 +305,48 @@ paket-files/
 .idea/
 *.sln.iml
 
-# BookStore
+# CodeRush personal settings
-src/Acme.BookStore.Web/Logs/*
+.cr/personal
-src/Acme.BookStore.Web.Host/Logs/*
-src/Acme.BookStore.AuthServer/Logs/*
-src/Acme.BookStore.HttpApi.Host/Logs/*
-src/Acme.BookStore.HttpApi.HostWithIds/Logs/*
-src/Acme.BookStore.DbMigrator/Logs/*
-src/Acme.BookStore.Blazor.Server/Logs/*
-src/Acme.BookStore.Blazor.Server.Tiered/Logs/*
 
-# Use abp install-libs to restore.
+# Python Tools for Visual Studio (PTVS)
-**/wwwroot/libs/*
+__pycache__/
-public
+*.pyc
-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
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+appsettings.Development.json

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 橙子
+Copyright (c) 2022 jacktang
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -1,225 +0,0 @@
-<h1 align="center"><img align="left" height="150px" src="https://ccnetcore.com/prod-api/wwwroot/logo.png"> Yi-Framework</h1>
-<h4 align="center">A .NET 8 Web open-source Asp.NetCore framework focused on user experience.</h4>
-<h5 align="center">Supports Native/Abp.vNext/Furion/Ruoyi/Pure</h5>
-<h2 align="center">A comprehensive solution that ultimately becomes a wheel</h2>
-
-[![star](https://gitee.com/ccnetcore/yi/badge/star.svg?theme=dark)](https://gitee.com/ccnetcore/Yi)
-[![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)
-
-English | [简体中文](README.md)
-****
-## 🍍  Introduction:
-YiFramework is a DDD (Domain-Driven Design) backend open-source framework based on .Net8, Abp.vNext, and SqlSugar.
-
-Who says ABP is complex? Who says DDD is difficult?`Breaking conventions, simplifying complexity.`,Newcomer-friendly and one of the best approaches for project extensions.
-
-Modular design allows for the independent inclusion or exclusion of components based on business needs. It is an all-encompassing framework where you may gain unique insights.
-
-A Comprehensive Solution, Ultimately Just Another Wheel.
-
-(Frequent updates, feel free to watch for continuous updates.)
-
-— This is not just a program; it is also a work of art, focused on artistic development!
-
-> Core Features: Simple and easy to use, the framework is not referenced in a packaged form, but is provided directly with the project alongside the source code. It offers maximum freedom and complies with the MIT license, allowing for unrestricted modifications (please indicate the source).
-
-**Branch Directory：**
-
-- Branch  **Abp**: Based on the Abp.vNext branch, DDD (Domain-Driven Design) simplifies the essence of development, providing support for multiple frontends from one backend.
-
-- Yi.Abp.Net8：Backend
-- Yi.Bbs.Vue3：Bbs Community - Frontend
-- Yi.Doc.Md: Open Source Documentation Tutorial
-- Yi.Pure.Vue3：Pure TS Backend Frontend
-- 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：
-
-Let's get straight to the point and provide the link.
-
-YiCommunity official website URL.(Bbs)：[ccnetcore.com](https://ccnetcore.com)  (Now live, welcome to join!)
-
-Rbac：https://ccnetcore.com:1000  (userName cc\password 123456)
-
-Pure：https://ccnetcore.com:1001  （userNamecc\password 123456）
-
-##  🍏  Support:
-
-- [x] Fully supports monolithic application architecture
-- [x] Fully supports distributed application architecture
-- [x] Fully supports microservices architecture
-
-****
-##  🍇  Explosive Detail Yi Framework Tutorial Navigation:
-
-1. [Framework Quick Start Guide](https://ccnetcore.com/article/aaa00329-7f35-d3fe-d258-3a0f8380b742)(Completed)
-2. [Framework Functionality Module Tutorials](https://ccnetcore.com/article/8c464ab3-8ba5-2761-a4b0-3a0f83a9f312)(Completed)
-3. [Practical Development Exercises](https://ccnetcore.com/article/e89c9593-f337-ada7-d108-3a0f83ae48e6)(Completed)
-4. [Chengzi Ops CI/CD Tutorial](https://ccnetcore.com/article/6b80ed42-50cd-db15-c073-3a0fa8f7fd77)(Completed)
-5. [Version Update Log](https://ccnetcore.com/article/e9e69a38-ce1e-06f5-7944-3a0fdc942ef3)(Completed)
-
-****
-##  🍓  Its philosophy:
-Who says ABP is complicated? Who says DDD is difficult? Break the norm, simplify complexity, and serve as one of the best ways for newcomers and project second development.
-
-> For every hundred people, there are a hundred different interpretations of DDD. The YiFramework may not strict adherence to DDD principles, but it is built on the shoulders of giants, distilled from numerous projects to craft a best practice.
-
-Effortlessly achieve rapid development; typically, simplicity and elegance are hard to reconcile. The YiFramework does not solely pursue extreme decoupling but considers user experience and ease of use.
-
-A user-oriented rapid development backend framework.
-
-> Once you truly get hands-on, you'll understand this: extreme simplicity is also a form of elegance.
-****
-
-##  🍍  Features
-- A user-oriented backend framework that is easy to use, suitable for small, medium, and enterprise-level projects.
-- The project comes with the source code directly embedded, without packaging, making it ideal for secondary development and modification.
-- Includes a large number of reusable modules for common scenarios.
-- Elegantly supports distributed and microservices architectures.
-- And more…
-
-##  🥭  Core Technologies
-#### Backend
-C# Asp.NetCore 8.0
-- [x] Dynamic API: Abp.vNext
-- [x] Authentication and Authorization: Jwt
-- [x] Logging: Serilog
-- [x] Modularization: Abp.vNext
-- [x] Dependency Injection: Autofac
-- [x] Object Mapping: Mapster
-- [x] ORM: SqlsugarCore
-- [x] Multi-tenancy: Abp.vNext
-- [x] Background Tasks: Quartz.Net
-- [x] Local Caching: Abp.vNext
-- [x] Distributed Caching: Abp.vNext
-- [x] Event Bus: Abp.vNext
-
-#### Frontend
-js Vue3
-- [x] Asynchronous Requests: axios
-- [x] Charts: echarts
-- [x] UI: element-plus
-- [x] State Management: pinia
-- [x] Routing: vue-router
-- [x] Bundling: vite
-
-#### DevOps
-- [x] Deployment: nginx
-- [x] CICD: gitlab+Jenkins
-- [x] Docker: harbor
-
-####  🍉 Demo： 
- <table>
-    <tr>
-        <td><img src="readme/101.png"/></td>
-        <td><img src="readme/102.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="readme/103.png"/></td>
-        <td><img src="readme/104.png"/></td>
-    </tr>
-</table>
-
- <table>
-    <tr>
-        <td><img src="readme/201.png"/></td>
-        <td><img src="readme/202.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="readme/203.png"/></td>
-        <td><img src="readme/204.png"/></td>
-    </tr>
-        <tr>
-        <td><img src="readme/205.png"/></td>
-        <td><img src="readme/206.png"/></td>
-    </tr>
-</table> 
-
- 
-<table>
-    <tr>
-        <td><img src="readme/1.png"/></td>
-        <td><img src="readme/2.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="readme/3.png"/></td>
-        <td><img src="readme/4.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="readme/3.png"/></td>
-        <td><img src="readme/4.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="readme/5.png"/></td>
-        <td><img src="readme/6.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="readme/7.png"/></td>
-        <td><img src="readme/8.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="readme/9.png"/></td>
-        <td><img src="readme/10.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="readme/11.png"/></td>
-        <td><img src="readme/12.png"/></td>
-    </tr>
-</table>
-
-##  🌶  Thank you：
-
-[橙子]https://ccnetcore.com
-
-[XWen]https://gitee.com/on-wensil
-
-[朝夕教育]https://www.zhaoxiedu.net
-
-[Sqlsugar老杰哥]https://www.donet5.com/Home/Doc
-
-[车神]微信公众号搜索Dotnet技术进阶
-
-[RuYiAdmin如意老兄]https://gitee.com/pang-mingjun/RuYiAdmin
-
-[ZrAdminNetCore字母老哥]https://gitee.com/izory/ZrAdminNetCore
-
-[Admin.NET]https://gitee.com/zuohuaijun/Admin.NET
-
-[Furion百小僧]https://furion.baiqian.ltd/
-
-****
-##  🌽 Contact Us:
-
-Author's QQ：`454313500`
-
-QQ group chat：官方一群（Full）、官方二群（Full）、官方三群：`786308927`（Full）、官方四群:`498310311`（Full）、官方五群:`981136525`（New）
-
-WeChat Group Chat：官方微信一群（Full）、官方微信二群
-
-WeChat Community: Add the author's WeChat chengzilaoge520 （橙子老哥520）,Note: Join the group.
-
-Contact the author, everyone here is a consultant.
-
-Official website message area：[ccnetcore.com](https://ccnetcore.com) 
-
-****
-##  🍄 FQA:
-
-Visit the official website to view the message board.
-
-[the message board](https://ccnetcore.com/discuss/1641030787056930818)

README.md

@@ -1,159 +1,100 @@
-<h1 align="center"><img align="left" height="150px" src="https://ccnetcore.com/prod-api/wwwroot/logo.png"> Yi框架</h1>
+
-<h4 align="center">一套以用户体验出发的.Net8 Web开源框架</h4>
+
-<h5 align="center">支持Abp.vNext 版本原生版本、Furion版本，前端接入Ruoyi/Pure Vue</h5>
+<h1 align="center"><img align="left" height="100px" src="https://user-images.githubusercontent.com/68722157/138828506-f58b7c57-5e10-4178-8f7d-5d5e12050113.png"> Yi框架</h1>
+<h4 align="center">一套与SqlSugar一样爽的.Net6开源框架</h4>
 <h2 align="center">集大成者，终究轮子</h2>
 
-[![star](https://gitee.com/ccnetcore/yi/badge/star.svg?theme=dark)](https://gitee.com/ccnetcore/Yi)
-[![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)
-
 [English](README-en.md) | 简体中文
+
+![sdk](https://img.shields.io/badge/sdk-6.0.1-d.svg)![License MIT](https://img.shields.io/badge/license-Apache-blue.svg?style=flat-square)
+
 ****
-##  🍍  简介:
+### 简介:
-YiFramework是一个基于.Net8+Abp.vNext+SqlSugar的DDD领域驱动设计后端开源框架
-
-谁说Abp复杂？谁说DDD难？`打破常规，化繁为简`，新人入门，项目二开，最佳方式之一
-
 **中文：意框架**（和他的名字一样“简易”，同时接入Java的Ruoyi Vue3.0前端）
 
-模块化，可根据业务自行引用或抛弃，集大成者，大而全乎，也许你能从中学习到一些独特见解
+模块分化较多，可根据业务自行引用或抛弃，集大成者，大而全乎，也许你能从中学习到一些独特见解
+
+正在持续更进业务模块，已接入ruoyi
 
 **英文：YiFramework**
 
-Yi框架-一套与SqlSugar一样爽的.Net8开源框架。
+Yi框架-一套与SqlSugar一样爽的.Net6低代码开源框架。
 与Sqlsugar理念一致，以用户体验出发。
-全生态拥抱AI，接入AI，100%代码经过AI洗礼
+架构干净整洁、无业务代码、采用微软风格原生框架封装、CodeFrist+配套自研文件模板代码生成器 开发。
+适合.Net6学习、Sqlsugar学习 、项目二次开发。
 集大成者，终究轮子
 
-（更新频繁，可watching持续关注。）
+Yi框架最新版本标签：`v1.2.1`，具体版本可以查看标签迭代
+
+（项目与Sqlsugar同步更新，但这作者老杰哥代码天天爆肝到凌晨两点，我们也尽量会跟上他的脚步。更新频繁，所以可watching持续关注。）
 
 ————这不仅仅是一个程序，更是一个艺术品，面向艺术的开发！
 
-> 核心特点：简单好用，框架不以打包形式引用，而是直接以项目附带源码给出，自由度拉满，遵循Mit协议，允许随意修改（请注明来源即可）
+**分支**：
 
-**分支目录：**
+（本项目由EFCore版本历经3年不断迭代至Sqlsugar版本，现EFcore版本已弃用，目前sqlsugar已带业务功能）
 
-- 分支**Abp**: 基于Abp.vNext分支，DDD领域驱动设计,回归开发本质，极度简单，一个后台支持以下多个前端
+**SqlSugar**:.Net6 DDD领域驱动设计 简单分层微服务架构
 
-- Yi.Abp.Net8：后端
+- Yi.Framework.Net6：.NetCore 6 意框架 （后端）
-- Yi.Bbs.Vue3：Bbs社区 前端
-- Yi.Doc.Md: 开源文档教程
-- Yi.Pure.Vue3：Pure ts后台前端
-- Yi.RuoYi.Vue3：RuoYi js后台前端
 
-****
+- Yi.Vue3.X.RuoYi：Vue3 RuoYi前端框架 （前端后台）
-## 🍉 docker 一键启动
 
-完整内容在：README-Docker.md
+  （你没有听错，已经接入java流行指数最高最火爆的框架之一，与其他框架不同，Yi框架后端为完全重制版，并非为ruoyi java模仿版）
+  
+- Yi.Vue3.x.Vant：Vue3 移动端前端框架 （前端前台）持续迭代
 
-后端：`docker run -d --name yi.admin -p 19001:19001 jiftcc/yi.admin:last`
+**SqlSugar-Dev**：为sqlsugar分支的实时开发版本
 
-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`
+~~**ec**: EFcore完整电商项目~~
-
-> 另外我们提供docker的build操作，我们更希望你能通过此种方式二开构建属于自己的镜像
 
 ****
 
-##  🍊  官网及演示地址：
+### 演示地址：
 
-废话少说直接上地址
+废话少说直接上地址，**请不要**更改里面的数据
 
-Yi社区官网网址（Bbs社区正式）：[ccnetcore.com](https://ccnetcore.com)  (已上线，欢迎加入)
+API服务：[yi.ccnetcore.com](http://yi.ccnetcore.com)    管理员账号：cc 、 123456
 
-Rbac后台演示地址：https://ccnetcore.com:1000  （用户cc、密码123456）
+网关地址：~~[gate.ccnetcore.com/swagger](http://gate.ccnetcore.com/swagger)~~
 
-Pure后台演示地址：https://ccnetcore.com:1001  （用户cc、密码123456）
+~~WebFirst开发：所有代码生成器已经配置完成，无需任何操作数据库及任何代码，只需要网页表格上点点点即可~~
 
-##  🍏  支持:
+代码自动生成：
+
+![代码生成](Readme/%E4%BB%A3%E7%A0%81%E7%94%9F%E6%88%90.gif)
+
+### 支持:
 
 - [x] 完全支持单体应用架构
 - [x] 完全支持分布式应用架构
 - [x] 完全支持微服务架构
+- [ ] 即将支持网格服务架构（我们将在后续版本加入dapr）
 
 ****
+### 软件架构:
 
-##  🍇  详细到爆炸的Yi框架教程导航：
+**架构**：后端.NET6(Asp.NetCore 6)、WebFirst代码生成器~~与.NET5(Asp.NetCore 5)、前端Vue（2.0）~~
 
-0. [社区导航大全](https://ccnetcore.com/article/aaa00329-7f35-d3fe-d258-3a0f8380b742/fb8c871b-41fc-21bc-474f-3a154498f42b)
+**关系型数据库**：mysql、sql server、sqlite、oracle(正在兼容中)
 
-1. [框架快速开始教程](https://ccnetcore.com/article/aaa00329-7f35-d3fe-d258-3a0f8380b742)(已完成)
+**操作系统**：Windows、Linux
-2. [框架功能模块教程](https://ccnetcore.com/article/8c464ab3-8ba5-2761-a4b0-3a0f83a9f312)(已完成)
+
-3. [实战演练开发教程](https://ccnetcore.com/article/e89c9593-f337-ada7-d108-3a0f83ae48e6)(已完成)
+**身份验证**：JWT、IdentityServer4
-4. [橙子运维CICD教程](https://ccnetcore.com/article/6b80ed42-50cd-db15-c073-3a0fa8f7fd77)(已完成)
+
-5. [版本更新日志](https://ccnetcore.com/article/e9e69a38-ce1e-06f5-7944-3a0fdc942ef3)(已完成)
+**组件**：SqlSugar、Autofac、Castle、Swagger、Log4Net、Redis、RabbitMq、ES、Quartz.net、~~T4~~
+
+**分布式**：CAP、Lock
+
+**微服务**：Consul、Ocelot、IdentityService、Apollo、Docker、Jenkins、Nginx、K8s、ELK、Polly
+
+**封装**：Json处理模块，滑动验证码模块，base64图片处理模块，异常捕捉模块、邮件处理模块、linq封装模块、随机数模块、统一接口模块、基于策略的jwt验证、过滤器、数据库连接、跨域、初始化种子数据、Base32、Console输出、日期处理、文件传输、html筛选、http请求、ip过滤、md5加密、Rsa加密、序列化、雪花算法、字符串处理、编码处理、地址处理、xml处理、心跳检查。。。
 
 ****
-##  🍓  它的理念:
+<h3>业务支持模块</h3>
-谁说Abp复杂？谁说DDD难？打破常规，化繁为简，新人入门，项目二开，最佳方式之一
 
-> 一百个人，就有一百种DDD，Yi框架不一定是极度严格的DDD，而是站在巨人的肩膀上，经过极多项目的提炼，摸索出一种最佳实践
+RABC权限管理系统（正在更新）
-
+（大部分ruoyi功能，采用ruoyi前端）
-
-优雅的进行快速开发，通常，简单程度与优雅程度不可兼得，Yi框架并不一昧的追求极致的解耦，会站在用户使用角度上，在使用难易度进行考虑衡量
-
-> 一个面向用户的快速开发后端框架
-
-在真正的使用过，你会明白这一点，极致的简单，也是优雅的一种体现。
-****
-
-##  🍍  特点
-- 面向用户的后端框架，使用简单，适合小型、中型、企业级项目
-- 项目直接内置源码，不打包，非常适合进行二开改造
-- 内置包含大量通用场景模块
-- 优雅支持分布式及微服务架构
-- 等等
-
-##  🍍  基础设施简介
-
-以下全部功能可直接使用：
-
-- [Abp.vNext官网](https://docs.abp.io/zh-Hans/abp/latest/)
-
-- [SqlSugar官网](https://www.donet5.com/home/doc)
-
-##  🍅  内置模块简介
-- Rbac权限管理系统（已上线）（支持pure、ruoyi前端）
-- Bbs论坛社区系统（已上线）
-
-> 重复的东西，无需再写一遍，这也是优雅的体现之一
-
-****
-##  🥭  核心技术
-#### 后端
-C# Asp.NetCore 8.0
-- [x] 动态Api：Abp.vNext
-- [x] 鉴权授权：Jwt
-- [x] 日志：Serilog
-- [x] 模块化：Abp.vNext
-- [x] 依赖注入：Autofac
-- [x] 对象映射：Mapster
-- [x] ORM: SqlsugarCore
-- [x] 多租户：Abp.vNext
-- [x] 后台任务：Quartz.Net
-- [x] 本地缓存：Abp.vNext
-- [x] 分布式缓存：Abp.vNext
-- [x] 事件总线：Abp.vNext
-
-#### 前端
-js Vue3
-- [x] 异步请求：axios
-- [x] 图表：echarts
-- [x] ui：element-plus
-- [x] 存储：pinia
-- [x] 路由：vue-router
-- [x] 打包：vite
-
-#### 运维
-- [x] 部署：nginx
-- [x] CICD：gitlab+Jenkins
-- [x] Docker：harbor
-
-
-****
-##  🍌  业务支持模块：  
-
-#### 🍒 RABC权限管理系统（持续更新）
-（采用ruoyi前端）
 - 用户管理
 - 角色管理
 - 菜单管理
@@ -164,116 +105,177 @@ js Vue3
 - 用户在线
 - 操作日志
 - 登录日志
-- 定时任务
+- 等等
-- 缓存列表
-- 服务监控
 
-#### 🍐 BBS社区论坛系统（持续更新）
+ERP进销存系统（正在更新）
-（采用vue3前端）
+- 供货商管理
-- 文章功能
+- 等等
-- 板块功能
-- 主题功能
-- 个人中心
-- 授权中心
-- 权限管理
 
-####  🍉 演示截图： 
+BBS论坛系统（持续迭代）
- <table>
+- 文章管理
-    <tr>
+- 评论管理
-        <td><img src="readme/101.png"/></td>
+- 等等
-        <td><img src="readme/102.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="readme/103.png"/></td>
-        <td><img src="readme/104.png"/></td>
-    </tr>
-</table>
 
- <table>
+SHOP电商系统（持续迭代）
-    <tr>
+- SPU管理
-        <td><img src="readme/201.png"/></td>
+- SKU管理
-        <td><img src="readme/202.png"/></td>
+- 商品规格
-    </tr>
+- 商品分类
-    <tr>
+- 等等
-        <td><img src="readme/203.png"/></td>
-        <td><img src="readme/204.png"/></td>
-    </tr>
-        <tr>
-        <td><img src="readme/205.png"/></td>
-        <td><img src="readme/206.png"/></td>
-    </tr>
-</table> 
 
- 
-<table>
-    <tr>
-        <td><img src="readme/1.png"/></td>
-        <td><img src="readme/2.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="readme/3.png"/></td>
-        <td><img src="readme/4.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="readme/3.png"/></td>
-        <td><img src="readme/4.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="readme/5.png"/></td>
-        <td><img src="readme/6.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="readme/7.png"/></td>
-        <td><img src="readme/8.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="readme/9.png"/></td>
-        <td><img src="readme/10.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="readme/11.png"/></td>
-        <td><img src="readme/12.png"/></td>
-    </tr>
-</table>
 
-##  🌶  感谢：
+![输入图片说明](Readme/%E7%94%A8%E6%88%B7%E7%AE%A1%E7%90%86.png)
+
+![输入图片说明](Readme/%E8%8F%9C%E5%8D%95%E7%AE%A1%E7%90%86.png)
+
+### 框架支持模块:
+
+大致如图：
+
+![image](https://user-images.githubusercontent.com/68722157/142923071-2fa524eb-e833-4143-a926-51566e56e889.png)
+![image](https://user-images.githubusercontent.com/68722157/142923150-ebe1b538-c3fc-42dd-bea8-83e10e0f819a.png)
+![image](https://user-images.githubusercontent.com/68722157/142923529-e4fbb2f6-def1-4702-b9da-5adbd22f0a2f.png)
+
+(删除线代表已实现功能还未迁移过来)
+- [x] 支持大致`DDD领域驱动设计`进行分层，支持微服务扩展
+- [x] 支持采用`异步`开发awit/async
+- [x] 支持数据库主从`读写分离`
+- [x] 支持功能替换，无需改动代码，只需配置`json文件`进行装配即可
+- [x] 支持`Aop封装`，FilterAop、IocAop、LogAop、SqlAop
+- [x] 支持`Log4Net日志`记录，自动生成至bin目录下的logs文件夹
+- [x] 支持`DbSeed数据库种子数据`接入
+- [x] 支持主流`数据库随意切换`，Mysql/Sqlite/Sqlserver/Oracle
+- [x] 支持上海杰哥官方`SqlSugar ORM`封装
+- [x] 支持新版`SwaggerWebAPI`，jwt身份认证接入
+- [x] 支持`Cors`跨域
+- [x] 支持`AutoFac`自动映射依赖注入
+- [x] 支持`consul`服务器注册与发现
+- [x] 支持`健康检查`
+- [x] 支持`RabbitMQ`消息队列
+- [x] 支持`Redis`多级缓存
+- [x] 支持`MemoryCache`多级缓存 
+- [x] 支持`Ocelot`网关，路由、服务聚合、服务发现、认证、鉴权、限流、熔断、缓存、Header头传递
+- [x] 支持`Apollo`全局配置中心;
+- [x] 支持`docker`镜像制作
+- [x] 支持`Quartz.net`任务调度，实现任意接口被调度
+- [x] 支持`ThumbnailSharp`缩略图封装
+- [x] 支持`ELK`，log4net+kafka+es+logstach+kibana
+- [x] 支持`IdentityService4`授权中心
+- [x] 支持`Es`分词查询
+- [x] 支持多级`缓存`
+- [x] 支持`CAP`分布式事务，mysql+rabbitMq
+- [x] 支持`Docker+k8s`部署
+- [x] 支持`Jenkins+CI/CD`
+- [x] 支持`AutoMapper`模块映射
+- [x] 支持`微信支付`模块
+- [x] 支持`单表多租户`常用功能
+- [x] 支持`逻辑删除`常用功能
+- [x] 支持`操作日志`常用功能
+- [x] 支持`自动分表`
+- [x] 支持`数据权限`
+- [x] 支持`CodeFrist`快速构建数据库
+- [x] 支持自研文件版`代码生成器`快速构建通用代码
+- [x] 支持完整`Dto`模式
+- [x] 支持 太多了忘了
+
+
+****
+### 目录结构:
+
+![image](https://s1.ax1x.com/2022/04/09/LCTleH.png)
+![image](https://s1.ax1x.com/2022/04/24/L4qlSs.png)
+![image](https://s1.ax1x.com/2022/04/24/L4q1ln.png)
+
+我们大致依照DDD领域驱动设计分层
+
+分层如此清晰！什么？还感觉太复杂了？用户只需关注Api、Service其他都是轮子啊！
+
+- BackGround：后台进程（通常使用消息队列进行消费任务）
+- Test：测试（单元测试）
+- Domain：领域层（Dto、服务接口层、模型层、仓储层、服务层）
+- Infrastructure：基础实例层(通用工具层、核心层、定时任务Job、国际化、Web扩展层)
+- Module：模块层（其他模块，可按需进行引入，例如微信支付、代码生成）
+- MicroServiceInstance：服务层（微服务）
+
+****
+### 安装教程:
+
+我们将在之后更新教程手册！
+
+后端
+1.  下载全部源码，默认使用sqlite数据库，已经生成
+2.  直接点击sln文件运行即可，没有任何其他依赖
+
+前端
+1.  下载全部源码，npm i 安装依赖
+2.  使用npm run dev进行运行
+
+
+****
+### 使用说明:
+
+~~1.  导入使用仓库中的WebFirst数据库~~
+~~2.  使用WebFirst添加实体、同步实体、修改模板生成路径并生成方案~~
+
+ 没了，恭喜你已经成功完成了项目，并且已经具备大部分通用场景业务
+是不是一个字？爽！
+到此为止，你无需写任何一个代码！
+
+**爽点**：
+
+新人，看这里，项目下载之后直接可以启动，无任何依赖，之后你可以查看`Test控制器`，迫不及待的快来爽一爽！
+
+我们将使用说明转移至我们的官方论坛中，正在制作中，尽情期待！
+
+****
+### 感谢：
+
+**大力支持**： Eleven神、Sqlsugar上海杰哥、Gerry、哲学的老张
 
 [橙子]https://ccnetcore.com
 
-[XWen]https://gitee.com/on-wensil
+[lzw]https://github.com/yeslode
 
 [朝夕教育]https://www.zhaoxiedu.net
 
-[Sqlsugar老杰哥]https://www.donet5.com/Home/Doc
+[Sqlsugar]https://www.donet5.com/Home/Doc
 
-[车神]微信公众号搜索Dotnet技术进阶
+[RuYiAdmin]https://gitee.com/pang-mingjun/RuYiAdmin
 
-[RuYiAdmin如意老兄]https://gitee.com/pang-mingjun/RuYiAdmin
+[ZrAdminNetCore]https://gitee.com/izory/ZrAdminNetCore
-
-[ZrAdminNetCore字母老哥]https://gitee.com/izory/ZrAdminNetCore
-
-[Admin.NET]https://gitee.com/zuohuaijun/Admin.NET
-
-[Furion百小僧]https://furion.baiqian.ltd/
 
 ****
-##  🌽 联系我们：
+### 联系我们：
 
 作者QQ：`454313500`，2029年之前作者24小时在线，时刻保持活跃更新。
 
-QQ交流群：官方一群（已满）、官方二群（已满）、官方三群：`786308927`（已满）、官方四群:`498310311`（已满）、官方五群:`981136525`
+QQ交流群：官方一群（已满）、官方二群（已满）、官方三群：`786308927`（加作者QQ后同意）
-
-微信交流群：官方微信一群（已满）、官方微信二群(已满)、官方微信三群
-
-微信交流群：加作者微信 chengzilaoge520 （橙子老哥520），备注拉群
 
 联系作者，这里人人都是顾问
 
-官方网址留言区：[ccnetcore.com](https://ccnetcore.com) 
+官方网址：正在建设
 
 ****
-##  🍄 FQA:
+### FQA:
 
-前往官网查看留言区
+问1：为什么不采用EFcore？
 
-[留言区](https://ccnetcore.com/discuss/1641030787056930818)
+答1：别问，问就是Sqlsugar，和本框架一样爽！
+
+问2：以后会持续更新下去吗？
+
+答2：一定会的，我们的标题是 一个和Sqlsugar一样爽的.Net6开源框架 ，只要Sqlsugar在，我们将一直更新下去。
+
+问3：这个框架的针对人群是哪些人？适合所有人吗？
+
+答3：并不是适合所有人，应该算适合需要有一定基础的开发人员，当然，如果你是大神，你完全可以将这个框架二次开发！
+
+问4：花如此多的精力制作这个框架，是为了什么？是为了赚钱吗？和目前主流的abp等框架比，又有什么意义呢？
+
+答4：我们与Sqlsugar作者理念一致，我们是从用户角度出发，框架是为用户服务，与ABP复杂上手理念完全是相反的。
+
+问5：为何不出版一个详细的说明书呢？
+
+答5：暂时不会了，之后可能会，代码都是基于Asp.NetCore框架，适用于新手不用造轮子，整个框架较为简单，阅读源码后，基本能自定义改造使用了，过难也已经封装完毕，别忘了，其意义是为了开发更加简易！建议添加作者好友，这里人人都是顾问。
+
+我大抵要厌倦了负重前行。

Yi.Abp.Net8/.dockerignore

@@ -1,33 +0,0 @@
-**/.classpath
-**/.dockerignore
-**/.env
-**/.git
-**/.gitignore
-**/.project
-**/.settings
-**/.toolstarget
-**/.vs
-**/.vscode
-**/*.*proj.user
-**/*.dbmdl
-**/*.jfm
-**/azds.yaml
-**/bin
-**/charts
-**/docker-compose*
-**/Dockerfile*
-**/node_modules
-**/npm-debug.log
-**/obj
-**/secrets.dev.yaml
-**/values.dev.yaml
-LICENSE
-README.md
-!**/.gitignore
-!.git/HEAD
-!.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

@@ -1,596 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.7.34202.233
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Web", "src\Yi.Abp.Web\Yi.Abp.Web.csproj", "{15913E44-DA92-44B9-9AC5-E9457EA34BF5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.SqlSugarCore", "framework\Yi.Framework.SqlSugarCore\Yi.Framework.SqlSugarCore.csproj", "{DC431ECC-C75D-4B01-8B79-4861948179BB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B782C78B-6C17-49E6-A237-3383BA720766}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0D10EEF2-FBAE-4C72-B816-A52823FC299B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "framework", "framework", "{77B949E9-530E-45A5-9657-20F7D5C6875C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "module", "module", "{2317227D-7796-4E7B-BEDB-7CD1CAE7B853}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.SqlSugarCore", "src\Yi.Abp.SqlSugarCore\Yi.Abp.SqlSugarCore.csproj", "{9A7BBA40-28D6-4900-9E1D-D627A516EE72}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Application", "src\Yi.Abp.Application\Yi.Abp.Application.csproj", "{746DBBD6-23E8-4D5D-9D23-E2902BE338BD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Application.Contracts", "src\Yi.Abp.Application.Contracts\Yi.Abp.Application.Contracts.csproj", "{51EEBF59-3D37-4681-981D-56F8D8F8968D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Domain", "src\Yi.Abp.Domain\Yi.Abp.Domain.csproj", "{7B15C198-538A-44ED-A6AA-3A0FEAA1D2BD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Domain.Shared", "src\Yi.Abp.Domain.Shared\Yi.Abp.Domain.Shared.csproj", "{F4D5A496-BFBE-470B-A05B-CB5823B47E72}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6A5375C6-1D55-4E93-9B19-736F1C68CBC3}"
-	ProjectSection(SolutionItems) = preProject
-		common.props = common.props
-		end.sh = end.sh
-		logo.png = logo.png
-		start.sh = start.sh
-		tool.bat = tool.bat
-		usings.props = usings.props
-		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}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Core", "framework\Yi.Framework.Core\Yi.Framework.Core.csproj", "{ECE874D4-F882-4EF4-84A6-A842D9B8FBC5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Mapster", "framework\Yi.Framework.Mapster\Yi.Framework.Mapster.csproj", "{1995A019-C8AE-467E-B427-ED57D6CBF44F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.AspNetCore", "framework\Yi.Framework.AspNetCore\Yi.Framework.AspNetCore.csproj", "{F5011C0D-209B-4A98-BBE3-68157503EEF8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Ddd.Application.Contracts", "framework\Yi.Framework.Ddd.Application.Contracts\Yi.Framework.Ddd.Application.Contracts.csproj", "{0A8296A3-C11F-4F13-8E49-6BC8188D4804}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Ddd.Application", "framework\Yi.Framework.Ddd.Application\Yi.Framework.Ddd.Application.csproj", "{F0141C17-0EBD-4261-98D5-1C5B7BC1DFEE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "rbac", "rbac", "{9CC7A457-1236-40BA-B47B-E7B710A3F061}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Rbac.Application.Contracts", "module\rbac\Yi.Framework.Rbac.Application.Contracts\Yi.Framework.Rbac.Application.Contracts.csproj", "{1C360956-8CD8-407E-B87F-D0BD57068EB9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Rbac.Application", "module\rbac\Yi.Framework.Rbac.Application\Yi.Framework.Rbac.Application.csproj", "{4F02B08D-5FE2-460D-BCA5-DA565151AE30}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Rbac.Domain", "module\rbac\Yi.Framework.Rbac.Domain\Yi.Framework.Rbac.Domain.csproj", "{C04D3F71-1557-46D0-B810-97B1FBB6AB73}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Rbac.Domain.Shared", "module\rbac\Yi.Framework.Rbac.Domain.Shared\Yi.Framework.Rbac.Domain.Shared.csproj", "{A2BB899D-4F9A-4184-81BD-94B938E2AB03}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Rbac.SqlSugarCore", "module\rbac\Yi.Framework.Rbac.SqlSugarCore\Yi.Framework.Rbac.SqlSugarCore.csproj", "{4503A2F9-139D-4CBC-AF11-689C34F0D77B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "bbs", "bbs", "{E902A945-4F41-4E96-A0DA-9F66CDA22261}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Bbs.Domain.Shared", "module\bbs\Yi.Framework.Bbs.Domain.Shared\Yi.Framework.Bbs.Domain.Shared.csproj", "{EB9349E2-256D-41EB-A345-21635A1361B3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Bbs.Domain", "module\bbs\Yi.Framework.Bbs.Domain\Yi.Framework.Bbs.Domain.csproj", "{4EABBC84-BCED-46C1-8CF1-62A7B8081ED7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Bbs.Application.Contracts", "module\bbs\Yi.Framework.Bbs.Application.Contracts\Yi.Framework.Bbs.Application.Contracts.csproj", "{7E569FD9-B1AB-4848-8AB7-FD9EFA1DBA20}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Bbs.Application", "module\bbs\Yi.Framework.Bbs.Application\Yi.Framework.Bbs.Application.csproj", "{AD4EE9E6-F4A3-4139-AF05-71388167DE5B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Bbs.SqlSugarCore", "module\bbs\Yi.Framework.Bbs.SqlSugarCore\Yi.Framework.Bbs.SqlSugarCore.csproj", "{6C86BA71-9F87-4E2C-B467-2950D77DCDFA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "audit-logging", "audit-logging", "{73CCF2C4-B9FD-44AB-8D4B-0A421805B094}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.AuditLogging.SqlSugarCore", "module\audit-logging\Yi.Framework.AuditLogging.SqlSugarCore\Yi.Framework.AuditLogging.SqlSugarCore.csproj", "{48806510-8E18-4E1E-9BAF-5B97E88C5FC3}"
-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("{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}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.TenantManagement.SqlSugarCore", "module\tenant-management\Yi.Framework.TenantManagement.SqlSugarCore\Yi.Framework.TenantManagement.SqlSugarCore.csproj", "{FA5BBAA1-08DC-472F-BB2C-5314E59D1556}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.TenantManagement.Domain", "module\tenant-management\Yi.Framework.TenantManagement.Domain\Yi.Framework.TenantManagement.Domain.csproj", "{54D8E2BC-591C-4344-A58E-874D49C00B41}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.AuditLogging.Domain", "module\audit-logging\Yi.Framework.AuditLogging.Domain\Yi.Framework.AuditLogging.Domain.csproj", "{EFD13211-17B5-400A-B99A-9F6F4E520C1E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.AuditLogging.Domain.Shared", "module\audit-logging\Yi.Framework.AuditLogging.Domain.Shared\Yi.Framework.AuditLogging.Domain.Shared.csproj", "{9C8C3C53-3DCE-4516-867E-228858E61B26}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.TenantManagement.Application", "module\tenant-management\Yi.Framework.TenantManagement.Application\Yi.Framework.TenantManagement.Application.csproj", "{17816837-E53B-486B-B796-53C601FE6CD9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.TenantManagement.Application.Contracts", "module\tenant-management\Yi.Framework.TenantManagement.Application.Contracts\Yi.Framework.TenantManagement.Application.Contracts.csproj", "{FA735055-CBDD-4EFD-B84B-85810DA1425E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "code-gen", "code-gen", "{4FFE7212-21F2-476D-B628-3C65E6C5075E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.CodeGen.Application", "module\code-gen\Yi.Framework.CodeGen.Application\Yi.Framework.CodeGen.Application.csproj", "{97EC40D7-DBFA-467A-98CB-221AF27B14F2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.CodeGen.Application.Contracts", "module\code-gen\Yi.Framework.CodeGen.Application.Contracts\Yi.Framework.CodeGen.Application.Contracts.csproj", "{882BC563-2F75-4B95-AC96-F4BF23F5E69D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.CodeGen.Domain", "module\code-gen\Yi.Framework.CodeGen.Domain\Yi.Framework.CodeGen.Domain.csproj", "{85CB8517-2B80-42D8-B954-081079AC9BA0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.CodeGen.Domain.Shared", "module\code-gen\Yi.Framework.CodeGen.Domain.Shared\Yi.Framework.CodeGen.Domain.Shared.csproj", "{EEFF0F05-2709-4151-A8CE-667935CEAE0B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Caching.FreeRedis", "framework\Yi.Framework.Caching.FreeRedis\Yi.Framework.Caching.FreeRedis.csproj", "{862BB0EF-3D4E-44FF-AB15-0EB74CE553D3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.CodeGen.SqlSugarCore", "module\code-gen\Yi.Framework.CodeGen.SqlSugarCore\Yi.Framework.CodeGen.SqlSugarCore.csproj", "{FB09ACC2-A27D-4D87-8D85-1435FDED4D04}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{8B27846A-043D-4F2F-8140-5CEC9D1863B5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.HttpApi.Client", "client\Yi.Abp.HttpApi.Client\Yi.Abp.HttpApi.Client.csproj", "{6B554DCC-3A81-4624-9141-4E39365ADA35}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Client.Console", "client\Yi.Abp.Client.Console\Yi.Abp.Client.Console.csproj", "{2D23B44A-DFA3-4C36-8516-4F5AE442403C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Client.WebApi", "client\Yi.Abp.Client.WebApi\Yi.Abp.Client.WebApi.csproj", "{00E49781-C6A0-491C-86A1-46F685C90915}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "setting-management", "setting-management", "{8C68059E-F3B1-4D28-A1C9-A5830F53E5D3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.SettingManagement.Domain", "module\setting-management\Yi.Framework.SettingManagement.Domain\Yi.Framework.SettingManagement.Domain.csproj", "{6FEE0EB3-EAD2-47F8-B6FC-3D0FD3CCABFF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.SettingManagement.SqlSugarCore", "module\setting-management\Yi.Framework.SettingManagement.SqlSugarCore\Yi.Framework.SettingManagement.SqlSugarCore.csproj", "{495C4643-39D4-46E7-BDC8-237589627BE4}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "chat-hub", "chat-hub", "{D8CDDE99-3684-4EED-A5E5-87F2AF4C78AB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.ChatHub.Application.Contracts", "module\chat-hub\Yi.Framework.ChatHub.Application.Contracts\Yi.Framework.ChatHub.Application.Contracts.csproj", "{65D4D033-5504-44B9-B152-0172ACD64CE6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.ChatHub.Domain.Shared", "module\chat-hub\Yi.Framework.ChatHub.Domain.Shared\Yi.Framework.ChatHub.Domain.Shared.csproj", "{DEEC0B15-190C-4464-B469-C45C6563C592}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.ChatHub.SqlSugarCore", "module\chat-hub\Yi.Framework.ChatHub.SqlSugarCore\Yi.Framework.ChatHub.SqlSugarCore.csproj", "{E476D266-8FB2-4D6B-AE2B-F0D279D4264E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.ChatHub.Domain", "module\chat-hub\Yi.Framework.ChatHub.Domain\Yi.Framework.ChatHub.Domain.csproj", "{C2DCA2FD-BFB4-4E76-967B-0AF8CC4F4D47}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.ChatHub.Application", "module\chat-hub\Yi.Framework.ChatHub.Application\Yi.Framework.ChatHub.Application.csproj", "{B7A1A8F3-CFA6-4ECF-A707-0F33FE0A6F1D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Rbac.Test", "test\Yi.Framework.Rbac.Test\Yi.Framework.Rbac.Test.csproj", "{9ECF0841-53BE-4FD8-95D1-A7223C7F3A07}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tool", "tool", "{084CBEEC-5D37-4716-B9C7-D80D6960DFF4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Tool", "tool\Yi.Abp.Tool\Yi.Abp.Tool.csproj", "{4FEBBDD9-E4F4-4BAF-8599-E2D57C08A74F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Tool.Web", "tool\Yi.Abp.Tool.Web\Yi.Abp.Tool.Web.csproj", "{2CE51D4C-1EF9-462B-BA14-7EA01A7E4AF1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Tool.Application", "tool\Yi.Abp.Tool.Application\Yi.Abp.Tool.Application.csproj", "{776590BA-B900-4C8B-986A-5B721FA4B306}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Tool.Application.Contracts", "tool\Yi.Abp.Tool.Application.Contracts\Yi.Abp.Tool.Application.Contracts.csproj", "{3A3AF1ED-FC7F-48CF-8ACE-9D50426B4675}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Tool.Domain", "tool\Yi.Abp.Tool.Domain\Yi.Abp.Tool.Domain.csproj", "{68F73B7B-0F8A-41C1-8092-6D6FFAED32F8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Tool.Domain.Shared", "tool\Yi.Abp.Tool.Domain.Shared\Yi.Abp.Tool.Domain.Shared.csproj", "{4AE84CDE-2A47-4D68-8E93-86193F72E4E8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Tool.HttpApi.Client", "tool\Yi.Abp.Tool.HttpApi.Client\Yi.Abp.Tool.HttpApi.Client.csproj", "{C8F97775-D903-4365-A4FF-3DA97E318CD2}"
-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
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{15913E44-DA92-44B9-9AC5-E9457EA34BF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15913E44-DA92-44B9-9AC5-E9457EA34BF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15913E44-DA92-44B9-9AC5-E9457EA34BF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15913E44-DA92-44B9-9AC5-E9457EA34BF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC431ECC-C75D-4B01-8B79-4861948179BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC431ECC-C75D-4B01-8B79-4861948179BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC431ECC-C75D-4B01-8B79-4861948179BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC431ECC-C75D-4B01-8B79-4861948179BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9A7BBA40-28D6-4900-9E1D-D627A516EE72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A7BBA40-28D6-4900-9E1D-D627A516EE72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A7BBA40-28D6-4900-9E1D-D627A516EE72}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9A7BBA40-28D6-4900-9E1D-D627A516EE72}.Release|Any CPU.Build.0 = Release|Any CPU
-		{746DBBD6-23E8-4D5D-9D23-E2902BE338BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{746DBBD6-23E8-4D5D-9D23-E2902BE338BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{746DBBD6-23E8-4D5D-9D23-E2902BE338BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{746DBBD6-23E8-4D5D-9D23-E2902BE338BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{51EEBF59-3D37-4681-981D-56F8D8F8968D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{51EEBF59-3D37-4681-981D-56F8D8F8968D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{51EEBF59-3D37-4681-981D-56F8D8F8968D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{51EEBF59-3D37-4681-981D-56F8D8F8968D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B15C198-538A-44ED-A6AA-3A0FEAA1D2BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B15C198-538A-44ED-A6AA-3A0FEAA1D2BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B15C198-538A-44ED-A6AA-3A0FEAA1D2BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B15C198-538A-44ED-A6AA-3A0FEAA1D2BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4D5A496-BFBE-470B-A05B-CB5823B47E72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4D5A496-BFBE-470B-A05B-CB5823B47E72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4D5A496-BFBE-470B-A05B-CB5823B47E72}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4D5A496-BFBE-470B-A05B-CB5823B47E72}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD6D6860-3753-4747-8A26-977E4A3001F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD6D6860-3753-4747-8A26-977E4A3001F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD6D6860-3753-4747-8A26-977E4A3001F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD6D6860-3753-4747-8A26-977E4A3001F9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ECE874D4-F882-4EF4-84A6-A842D9B8FBC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ECE874D4-F882-4EF4-84A6-A842D9B8FBC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ECE874D4-F882-4EF4-84A6-A842D9B8FBC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ECE874D4-F882-4EF4-84A6-A842D9B8FBC5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1995A019-C8AE-467E-B427-ED57D6CBF44F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1995A019-C8AE-467E-B427-ED57D6CBF44F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1995A019-C8AE-467E-B427-ED57D6CBF44F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1995A019-C8AE-467E-B427-ED57D6CBF44F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5011C0D-209B-4A98-BBE3-68157503EEF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5011C0D-209B-4A98-BBE3-68157503EEF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5011C0D-209B-4A98-BBE3-68157503EEF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5011C0D-209B-4A98-BBE3-68157503EEF8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0A8296A3-C11F-4F13-8E49-6BC8188D4804}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A8296A3-C11F-4F13-8E49-6BC8188D4804}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A8296A3-C11F-4F13-8E49-6BC8188D4804}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0A8296A3-C11F-4F13-8E49-6BC8188D4804}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F0141C17-0EBD-4261-98D5-1C5B7BC1DFEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0141C17-0EBD-4261-98D5-1C5B7BC1DFEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0141C17-0EBD-4261-98D5-1C5B7BC1DFEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0141C17-0EBD-4261-98D5-1C5B7BC1DFEE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1C360956-8CD8-407E-B87F-D0BD57068EB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C360956-8CD8-407E-B87F-D0BD57068EB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C360956-8CD8-407E-B87F-D0BD57068EB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C360956-8CD8-407E-B87F-D0BD57068EB9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F02B08D-5FE2-460D-BCA5-DA565151AE30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4F02B08D-5FE2-460D-BCA5-DA565151AE30}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F02B08D-5FE2-460D-BCA5-DA565151AE30}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4F02B08D-5FE2-460D-BCA5-DA565151AE30}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C04D3F71-1557-46D0-B810-97B1FBB6AB73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C04D3F71-1557-46D0-B810-97B1FBB6AB73}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C04D3F71-1557-46D0-B810-97B1FBB6AB73}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C04D3F71-1557-46D0-B810-97B1FBB6AB73}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2BB899D-4F9A-4184-81BD-94B938E2AB03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2BB899D-4F9A-4184-81BD-94B938E2AB03}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2BB899D-4F9A-4184-81BD-94B938E2AB03}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2BB899D-4F9A-4184-81BD-94B938E2AB03}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4503A2F9-139D-4CBC-AF11-689C34F0D77B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4503A2F9-139D-4CBC-AF11-689C34F0D77B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4503A2F9-139D-4CBC-AF11-689C34F0D77B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4503A2F9-139D-4CBC-AF11-689C34F0D77B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB9349E2-256D-41EB-A345-21635A1361B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB9349E2-256D-41EB-A345-21635A1361B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB9349E2-256D-41EB-A345-21635A1361B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB9349E2-256D-41EB-A345-21635A1361B3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4EABBC84-BCED-46C1-8CF1-62A7B8081ED7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4EABBC84-BCED-46C1-8CF1-62A7B8081ED7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4EABBC84-BCED-46C1-8CF1-62A7B8081ED7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4EABBC84-BCED-46C1-8CF1-62A7B8081ED7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7E569FD9-B1AB-4848-8AB7-FD9EFA1DBA20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E569FD9-B1AB-4848-8AB7-FD9EFA1DBA20}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E569FD9-B1AB-4848-8AB7-FD9EFA1DBA20}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7E569FD9-B1AB-4848-8AB7-FD9EFA1DBA20}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD4EE9E6-F4A3-4139-AF05-71388167DE5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD4EE9E6-F4A3-4139-AF05-71388167DE5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD4EE9E6-F4A3-4139-AF05-71388167DE5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD4EE9E6-F4A3-4139-AF05-71388167DE5B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6C86BA71-9F87-4E2C-B467-2950D77DCDFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C86BA71-9F87-4E2C-B467-2950D77DCDFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C86BA71-9F87-4E2C-B467-2950D77DCDFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C86BA71-9F87-4E2C-B467-2950D77DCDFA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{48806510-8E18-4E1E-9BAF-5B97E88C5FC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48806510-8E18-4E1E-9BAF-5B97E88C5FC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48806510-8E18-4E1E-9BAF-5B97E88C5FC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48806510-8E18-4E1E-9BAF-5B97E88C5FC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{791AC2FA-50D3-4408-8D68-31DA72F608BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{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
-		{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
-		{68627BC2-F049-4C69-AD17-81DF9478E8CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA5BBAA1-08DC-472F-BB2C-5314E59D1556}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA5BBAA1-08DC-472F-BB2C-5314E59D1556}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA5BBAA1-08DC-472F-BB2C-5314E59D1556}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA5BBAA1-08DC-472F-BB2C-5314E59D1556}.Release|Any CPU.Build.0 = Release|Any CPU
-		{54D8E2BC-591C-4344-A58E-874D49C00B41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{54D8E2BC-591C-4344-A58E-874D49C00B41}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{54D8E2BC-591C-4344-A58E-874D49C00B41}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{54D8E2BC-591C-4344-A58E-874D49C00B41}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EFD13211-17B5-400A-B99A-9F6F4E520C1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EFD13211-17B5-400A-B99A-9F6F4E520C1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EFD13211-17B5-400A-B99A-9F6F4E520C1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EFD13211-17B5-400A-B99A-9F6F4E520C1E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9C8C3C53-3DCE-4516-867E-228858E61B26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C8C3C53-3DCE-4516-867E-228858E61B26}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C8C3C53-3DCE-4516-867E-228858E61B26}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9C8C3C53-3DCE-4516-867E-228858E61B26}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17816837-E53B-486B-B796-53C601FE6CD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17816837-E53B-486B-B796-53C601FE6CD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17816837-E53B-486B-B796-53C601FE6CD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17816837-E53B-486B-B796-53C601FE6CD9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA735055-CBDD-4EFD-B84B-85810DA1425E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA735055-CBDD-4EFD-B84B-85810DA1425E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA735055-CBDD-4EFD-B84B-85810DA1425E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA735055-CBDD-4EFD-B84B-85810DA1425E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{97EC40D7-DBFA-467A-98CB-221AF27B14F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{97EC40D7-DBFA-467A-98CB-221AF27B14F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{97EC40D7-DBFA-467A-98CB-221AF27B14F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{97EC40D7-DBFA-467A-98CB-221AF27B14F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{882BC563-2F75-4B95-AC96-F4BF23F5E69D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{882BC563-2F75-4B95-AC96-F4BF23F5E69D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{882BC563-2F75-4B95-AC96-F4BF23F5E69D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{882BC563-2F75-4B95-AC96-F4BF23F5E69D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85CB8517-2B80-42D8-B954-081079AC9BA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85CB8517-2B80-42D8-B954-081079AC9BA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85CB8517-2B80-42D8-B954-081079AC9BA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85CB8517-2B80-42D8-B954-081079AC9BA0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EEFF0F05-2709-4151-A8CE-667935CEAE0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EEFF0F05-2709-4151-A8CE-667935CEAE0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EEFF0F05-2709-4151-A8CE-667935CEAE0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EEFF0F05-2709-4151-A8CE-667935CEAE0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{862BB0EF-3D4E-44FF-AB15-0EB74CE553D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{862BB0EF-3D4E-44FF-AB15-0EB74CE553D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{862BB0EF-3D4E-44FF-AB15-0EB74CE553D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{862BB0EF-3D4E-44FF-AB15-0EB74CE553D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FB09ACC2-A27D-4D87-8D85-1435FDED4D04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB09ACC2-A27D-4D87-8D85-1435FDED4D04}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FB09ACC2-A27D-4D87-8D85-1435FDED4D04}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FB09ACC2-A27D-4D87-8D85-1435FDED4D04}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B554DCC-3A81-4624-9141-4E39365ADA35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B554DCC-3A81-4624-9141-4E39365ADA35}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B554DCC-3A81-4624-9141-4E39365ADA35}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B554DCC-3A81-4624-9141-4E39365ADA35}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D23B44A-DFA3-4C36-8516-4F5AE442403C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D23B44A-DFA3-4C36-8516-4F5AE442403C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D23B44A-DFA3-4C36-8516-4F5AE442403C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D23B44A-DFA3-4C36-8516-4F5AE442403C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{00E49781-C6A0-491C-86A1-46F685C90915}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{00E49781-C6A0-491C-86A1-46F685C90915}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{00E49781-C6A0-491C-86A1-46F685C90915}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{00E49781-C6A0-491C-86A1-46F685C90915}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6FEE0EB3-EAD2-47F8-B6FC-3D0FD3CCABFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6FEE0EB3-EAD2-47F8-B6FC-3D0FD3CCABFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6FEE0EB3-EAD2-47F8-B6FC-3D0FD3CCABFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6FEE0EB3-EAD2-47F8-B6FC-3D0FD3CCABFF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{495C4643-39D4-46E7-BDC8-237589627BE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{495C4643-39D4-46E7-BDC8-237589627BE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{495C4643-39D4-46E7-BDC8-237589627BE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{495C4643-39D4-46E7-BDC8-237589627BE4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{65D4D033-5504-44B9-B152-0172ACD64CE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{65D4D033-5504-44B9-B152-0172ACD64CE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{65D4D033-5504-44B9-B152-0172ACD64CE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{65D4D033-5504-44B9-B152-0172ACD64CE6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DEEC0B15-190C-4464-B469-C45C6563C592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DEEC0B15-190C-4464-B469-C45C6563C592}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DEEC0B15-190C-4464-B469-C45C6563C592}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DEEC0B15-190C-4464-B469-C45C6563C592}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E476D266-8FB2-4D6B-AE2B-F0D279D4264E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E476D266-8FB2-4D6B-AE2B-F0D279D4264E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E476D266-8FB2-4D6B-AE2B-F0D279D4264E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E476D266-8FB2-4D6B-AE2B-F0D279D4264E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C2DCA2FD-BFB4-4E76-967B-0AF8CC4F4D47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2DCA2FD-BFB4-4E76-967B-0AF8CC4F4D47}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2DCA2FD-BFB4-4E76-967B-0AF8CC4F4D47}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C2DCA2FD-BFB4-4E76-967B-0AF8CC4F4D47}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B7A1A8F3-CFA6-4ECF-A707-0F33FE0A6F1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7A1A8F3-CFA6-4ECF-A707-0F33FE0A6F1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B7A1A8F3-CFA6-4ECF-A707-0F33FE0A6F1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B7A1A8F3-CFA6-4ECF-A707-0F33FE0A6F1D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9ECF0841-53BE-4FD8-95D1-A7223C7F3A07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9ECF0841-53BE-4FD8-95D1-A7223C7F3A07}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9ECF0841-53BE-4FD8-95D1-A7223C7F3A07}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9ECF0841-53BE-4FD8-95D1-A7223C7F3A07}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4FEBBDD9-E4F4-4BAF-8599-E2D57C08A74F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FEBBDD9-E4F4-4BAF-8599-E2D57C08A74F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FEBBDD9-E4F4-4BAF-8599-E2D57C08A74F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4FEBBDD9-E4F4-4BAF-8599-E2D57C08A74F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2CE51D4C-1EF9-462B-BA14-7EA01A7E4AF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2CE51D4C-1EF9-462B-BA14-7EA01A7E4AF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CE51D4C-1EF9-462B-BA14-7EA01A7E4AF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2CE51D4C-1EF9-462B-BA14-7EA01A7E4AF1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{776590BA-B900-4C8B-986A-5B721FA4B306}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{776590BA-B900-4C8B-986A-5B721FA4B306}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{776590BA-B900-4C8B-986A-5B721FA4B306}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{776590BA-B900-4C8B-986A-5B721FA4B306}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A3AF1ED-FC7F-48CF-8ACE-9D50426B4675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3AF1ED-FC7F-48CF-8ACE-9D50426B4675}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A3AF1ED-FC7F-48CF-8ACE-9D50426B4675}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A3AF1ED-FC7F-48CF-8ACE-9D50426B4675}.Release|Any CPU.Build.0 = Release|Any CPU
-		{68F73B7B-0F8A-41C1-8092-6D6FFAED32F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68F73B7B-0F8A-41C1-8092-6D6FFAED32F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68F73B7B-0F8A-41C1-8092-6D6FFAED32F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{68F73B7B-0F8A-41C1-8092-6D6FFAED32F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4AE84CDE-2A47-4D68-8E93-86193F72E4E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4AE84CDE-2A47-4D68-8E93-86193F72E4E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4AE84CDE-2A47-4D68-8E93-86193F72E4E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4AE84CDE-2A47-4D68-8E93-86193F72E4E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C8F97775-D903-4365-A4FF-3DA97E318CD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C8F97775-D903-4365-A4FF-3DA97E318CD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C8F97775-D903-4365-A4FF-3DA97E318CD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C8F97775-D903-4365-A4FF-3DA97E318CD2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2A31D7CB-BDCC-4253-BA73-273B6B5E1956}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{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
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{15913E44-DA92-44B9-9AC5-E9457EA34BF5} = {B782C78B-6C17-49E6-A237-3383BA720766}
-		{DC431ECC-C75D-4B01-8B79-4861948179BB} = {77B949E9-530E-45A5-9657-20F7D5C6875C}
-		{9A7BBA40-28D6-4900-9E1D-D627A516EE72} = {B782C78B-6C17-49E6-A237-3383BA720766}
-		{746DBBD6-23E8-4D5D-9D23-E2902BE338BD} = {B782C78B-6C17-49E6-A237-3383BA720766}
-		{51EEBF59-3D37-4681-981D-56F8D8F8968D} = {B782C78B-6C17-49E6-A237-3383BA720766}
-		{7B15C198-538A-44ED-A6AA-3A0FEAA1D2BD} = {B782C78B-6C17-49E6-A237-3383BA720766}
-		{F4D5A496-BFBE-470B-A05B-CB5823B47E72} = {B782C78B-6C17-49E6-A237-3383BA720766}
-		{FD6D6860-3753-4747-8A26-977E4A3001F9} = {77B949E9-530E-45A5-9657-20F7D5C6875C}
-		{ECE874D4-F882-4EF4-84A6-A842D9B8FBC5} = {77B949E9-530E-45A5-9657-20F7D5C6875C}
-		{1995A019-C8AE-467E-B427-ED57D6CBF44F} = {77B949E9-530E-45A5-9657-20F7D5C6875C}
-		{F5011C0D-209B-4A98-BBE3-68157503EEF8} = {77B949E9-530E-45A5-9657-20F7D5C6875C}
-		{0A8296A3-C11F-4F13-8E49-6BC8188D4804} = {77B949E9-530E-45A5-9657-20F7D5C6875C}
-		{F0141C17-0EBD-4261-98D5-1C5B7BC1DFEE} = {77B949E9-530E-45A5-9657-20F7D5C6875C}
-		{9CC7A457-1236-40BA-B47B-E7B710A3F061} = {2317227D-7796-4E7B-BEDB-7CD1CAE7B853}
-		{1C360956-8CD8-407E-B87F-D0BD57068EB9} = {9CC7A457-1236-40BA-B47B-E7B710A3F061}
-		{4F02B08D-5FE2-460D-BCA5-DA565151AE30} = {9CC7A457-1236-40BA-B47B-E7B710A3F061}
-		{C04D3F71-1557-46D0-B810-97B1FBB6AB73} = {9CC7A457-1236-40BA-B47B-E7B710A3F061}
-		{A2BB899D-4F9A-4184-81BD-94B938E2AB03} = {9CC7A457-1236-40BA-B47B-E7B710A3F061}
-		{4503A2F9-139D-4CBC-AF11-689C34F0D77B} = {9CC7A457-1236-40BA-B47B-E7B710A3F061}
-		{E902A945-4F41-4E96-A0DA-9F66CDA22261} = {2317227D-7796-4E7B-BEDB-7CD1CAE7B853}
-		{EB9349E2-256D-41EB-A345-21635A1361B3} = {E902A945-4F41-4E96-A0DA-9F66CDA22261}
-		{4EABBC84-BCED-46C1-8CF1-62A7B8081ED7} = {E902A945-4F41-4E96-A0DA-9F66CDA22261}
-		{7E569FD9-B1AB-4848-8AB7-FD9EFA1DBA20} = {E902A945-4F41-4E96-A0DA-9F66CDA22261}
-		{AD4EE9E6-F4A3-4139-AF05-71388167DE5B} = {E902A945-4F41-4E96-A0DA-9F66CDA22261}
-		{6C86BA71-9F87-4E2C-B467-2950D77DCDFA} = {E902A945-4F41-4E96-A0DA-9F66CDA22261}
-		{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}
-		{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}
-		{54D8E2BC-591C-4344-A58E-874D49C00B41} = {499A8C71-7892-42D0-A77E-48756E1EFF16}
-		{EFD13211-17B5-400A-B99A-9F6F4E520C1E} = {73CCF2C4-B9FD-44AB-8D4B-0A421805B094}
-		{9C8C3C53-3DCE-4516-867E-228858E61B26} = {73CCF2C4-B9FD-44AB-8D4B-0A421805B094}
-		{17816837-E53B-486B-B796-53C601FE6CD9} = {499A8C71-7892-42D0-A77E-48756E1EFF16}
-		{FA735055-CBDD-4EFD-B84B-85810DA1425E} = {499A8C71-7892-42D0-A77E-48756E1EFF16}
-		{4FFE7212-21F2-476D-B628-3C65E6C5075E} = {2317227D-7796-4E7B-BEDB-7CD1CAE7B853}
-		{97EC40D7-DBFA-467A-98CB-221AF27B14F2} = {4FFE7212-21F2-476D-B628-3C65E6C5075E}
-		{882BC563-2F75-4B95-AC96-F4BF23F5E69D} = {4FFE7212-21F2-476D-B628-3C65E6C5075E}
-		{85CB8517-2B80-42D8-B954-081079AC9BA0} = {4FFE7212-21F2-476D-B628-3C65E6C5075E}
-		{EEFF0F05-2709-4151-A8CE-667935CEAE0B} = {4FFE7212-21F2-476D-B628-3C65E6C5075E}
-		{862BB0EF-3D4E-44FF-AB15-0EB74CE553D3} = {77B949E9-530E-45A5-9657-20F7D5C6875C}
-		{FB09ACC2-A27D-4D87-8D85-1435FDED4D04} = {4FFE7212-21F2-476D-B628-3C65E6C5075E}
-		{6B554DCC-3A81-4624-9141-4E39365ADA35} = {8B27846A-043D-4F2F-8140-5CEC9D1863B5}
-		{2D23B44A-DFA3-4C36-8516-4F5AE442403C} = {8B27846A-043D-4F2F-8140-5CEC9D1863B5}
-		{00E49781-C6A0-491C-86A1-46F685C90915} = {8B27846A-043D-4F2F-8140-5CEC9D1863B5}
-		{8C68059E-F3B1-4D28-A1C9-A5830F53E5D3} = {2317227D-7796-4E7B-BEDB-7CD1CAE7B853}
-		{6FEE0EB3-EAD2-47F8-B6FC-3D0FD3CCABFF} = {8C68059E-F3B1-4D28-A1C9-A5830F53E5D3}
-		{495C4643-39D4-46E7-BDC8-237589627BE4} = {8C68059E-F3B1-4D28-A1C9-A5830F53E5D3}
-		{D8CDDE99-3684-4EED-A5E5-87F2AF4C78AB} = {2317227D-7796-4E7B-BEDB-7CD1CAE7B853}
-		{65D4D033-5504-44B9-B152-0172ACD64CE6} = {D8CDDE99-3684-4EED-A5E5-87F2AF4C78AB}
-		{DEEC0B15-190C-4464-B469-C45C6563C592} = {D8CDDE99-3684-4EED-A5E5-87F2AF4C78AB}
-		{E476D266-8FB2-4D6B-AE2B-F0D279D4264E} = {D8CDDE99-3684-4EED-A5E5-87F2AF4C78AB}
-		{C2DCA2FD-BFB4-4E76-967B-0AF8CC4F4D47} = {D8CDDE99-3684-4EED-A5E5-87F2AF4C78AB}
-		{B7A1A8F3-CFA6-4ECF-A707-0F33FE0A6F1D} = {D8CDDE99-3684-4EED-A5E5-87F2AF4C78AB}
-		{9ECF0841-53BE-4FD8-95D1-A7223C7F3A07} = {0D10EEF2-FBAE-4C72-B816-A52823FC299B}
-		{4FEBBDD9-E4F4-4BAF-8599-E2D57C08A74F} = {084CBEEC-5D37-4716-B9C7-D80D6960DFF4}
-		{2CE51D4C-1EF9-462B-BA14-7EA01A7E4AF1} = {084CBEEC-5D37-4716-B9C7-D80D6960DFF4}
-		{776590BA-B900-4C8B-986A-5B721FA4B306} = {084CBEEC-5D37-4716-B9C7-D80D6960DFF4}
-		{3A3AF1ED-FC7F-48CF-8ACE-9D50426B4675} = {084CBEEC-5D37-4716-B9C7-D80D6960DFF4}
-		{68F73B7B-0F8A-41C1-8092-6D6FFAED32F8} = {084CBEEC-5D37-4716-B9C7-D80D6960DFF4}
-		{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}
-	EndGlobalSection
-EndGlobal

Yi.Abp.Net8/client/Yi.Abp.Client.Console/Program.cs

@@ -1,33 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Yi.Abp.Client.Console;
-using Yi.Framework.Rbac.Application.Contracts.IServices;
-
-try
-{
-    IHost host = Host.CreateDefaultBuilder()
-        .ConfigureServices(async (host, service) =>
-        {
-            await service.AddApplicationAsync<YiAbpClientConsoleModule>();
-        })
-        .UseAutofac()
-        .Build();
-
-    //控制台直接调用
-    var account = host.Services.GetRequiredService<IAccountService>();
-
-    //获取验证码
-    var data1 = await account.GetCaptchaImageAsync();
-
-    //登录
-    var data2 = await account.PostLoginAsync(new Yi.Framework.Rbac.Application.Contracts.Dtos.Account.LoginInputVo { UserName = "cc", Password = "123456", Code = string.Empty, Uuid = string.Empty });
-
-
-    host.Run();
-
-}
-catch (Exception ex)
-{
-    Console.WriteLine(ex.Message);
-    Console.WriteLine(ex.StackTrace);
-}

Yi.Abp.Net8/client/Yi.Abp.Client.Console/Yi.Abp.Client.Console.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="..\..\common.props" />
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-		<PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
-	</ItemGroup>
-	<ItemGroup>
-	  <ProjectReference Include="..\Yi.Abp.HttpApi.Client\Yi.Abp.HttpApi.Client.csproj" />
-	</ItemGroup>
-</Project>

Yi.Abp.Net8/client/Yi.Abp.Client.Console/YiAbpClientConsoleModule.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Modularity;
-using Yi.Abp.HttpApi.Client;
-
-namespace Yi.Abp.Client.Console
-{
-    [DependsOn(typeof(YiAbpHttpApiClientModule))]
-    public class YiAbpClientConsoleModule:AbpModule
-    {
-    }
-}

Yi.Abp.Net8/client/Yi.Abp.Client.WebApi/Controllers/AccountController.cs

@@ -1,37 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Yi.Framework.Rbac.Application.Contracts.Dtos.Account;
-using Yi.Framework.Rbac.Application.Contracts.IServices;
-
-namespace Yi.Abp.Client.WebApi.Controllers
-{
-    [ApiController]
-    [Route("[controller]")]
-    public class AccountController : ControllerBase
-    {
-
-
-        private readonly ILogger<AccountController> _logger;
-        private IAccountService _accountService;
-        public AccountController(ILogger<AccountController> logger, IAccountService accountService)
-        {
-            _logger = logger;
-            _accountService = accountService;
-        }
-
-        [HttpPost("my-login")]
-        public async Task<IActionResult> Login(LoginInputVo input)
-        {
-            await _accountService.PostLoginAsync(input);
-            return Ok();
-        }
-
-
-
-        [HttpGet("my-captcha-image")]
-        public async Task<IActionResult> CaptchaImageAsync()
-        {
-            var output = await _accountService.GetCaptchaImageAsync();
-            return Ok(output);
-        }
-    }
-}

Yi.Abp.Net8/client/Yi.Abp.Client.WebApi/Program.cs

@@ -1,28 +0,0 @@
-using Autofac.Core;
-using Yi.Abp.Client.WebApi;
-
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-builder.Host.UseAutofac();
-builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-await builder.Services.AddApplicationAsync<YiAbpClientWebApiModule>();
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
-
-app.UseHttpsRedirection();
-
-app.UseAuthorization();
-
-app.MapControllers();
-
-app.Run();

Yi.Abp.Net8/client/Yi.Abp.Client.WebApi/Properties/launchSettings.json

@@ -1,41 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:35597",
-      "sslPort": 44322
-    }
-  },
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5002",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7108;http://localhost:5002",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

Yi.Abp.Net8/client/Yi.Abp.Client.WebApi/Yi.Abp.Client.WebApi.csproj

@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-	<Import Project="..\..\common.props" />
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Yi.Abp.HttpApi.Client\Yi.Abp.HttpApi.Client.csproj" />
-  </ItemGroup>
-
-</Project>

Yi.Abp.Net8/client/Yi.Abp.Client.WebApi/Yi.Abp.Client.WebApi.http

@@ -1,6 +0,0 @@
-@Yi.Abp.Client.WebApi_HostAddress = http://localhost:5002
-
-GET {{Yi.Abp.Client.WebApi_HostAddress}}/weatherforecast/
-Accept: application/json
-
-###

Yi.Abp.Net8/client/Yi.Abp.Client.WebApi/YiAbpClientWebApiModule.cs

@@ -1,10 +0,0 @@
-using Volo.Abp.Modularity;
-using Yi.Abp.HttpApi.Client;
-
-namespace Yi.Abp.Client.WebApi
-{
-    [DependsOn(typeof(YiAbpHttpApiClientModule))]
-    public class YiAbpClientWebApiModule:AbpModule
-    {
-    }
-}

Yi.Abp.Net8/client/Yi.Abp.Client.WebApi/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

Yi.Abp.Net8/client/Yi.Abp.Client.WebApi/appsettings.json

@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}

Yi.Abp.Net8/client/Yi.Abp.HttpApi.Client/Yi.Abp.HttpApi.Client.csproj

@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="..\..\common.props" />
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <OutputType>Library</OutputType>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Http.Client" Version="$(AbpVersion)" />
-	  <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Yi.Abp.Application.Contracts\Yi.Abp.Application.Contracts.csproj" />
-  </ItemGroup>
-
-</Project>

Yi.Abp.Net8/client/Yi.Abp.HttpApi.Client/YiAbpHttpApiClientModule.cs

@@ -1,32 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Autofac;
-using Volo.Abp.Http.Client;
-using Volo.Abp.Modularity;
-using Yi.Framework.Rbac.Application.Contracts;
-
-namespace Yi.Abp.HttpApi.Client
-{
-    [DependsOn(typeof(AbpHttpClientModule),
-            typeof(AbpAutofacModule),
-
-
-        typeof(YiFrameworkRbacApplicationContractsModule))]
-    public class YiAbpHttpApiClientModule : AbpModule
-    {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            //创建动态客户端代理
-            context.Services.AddHttpClientProxies(
-                typeof(YiFrameworkRbacApplicationContractsModule).Assembly
-
-            );
-            Configure<AbpRemoteServiceOptions>(options =>
-            {
-                options.RemoteServices.Default =
-                    new RemoteServiceConfiguration("http://localhost:19001");
-            });
-        }
-
-
-    }
-}

Yi.Abp.Net8/common.props

@@ -1,39 +0,0 @@
-<Project>
-	<Import Project="usings.props" />
-	<Import Project="version.props" />
-
-
-
-
-	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<Nullable>enable</Nullable>
-		<ImplicitUsings>enable</ImplicitUsings>
-	</PropertyGroup>
-	
-  <PropertyGroup>
-    <LangVersion>latest</LangVersion>
-    <Version>1.0.0</Version>
-    <NoWarn>$(NoWarn);CS1591;CS8618;CS1998;CS8604;CS8620;CS8600;CS8602</NoWarn>
-	<AbpProjectType>app</AbpProjectType>
-
-	  <PublishDocumentationFiles>true</PublishDocumentationFiles>
-	  <GenerateDocumentationFile>true</GenerateDocumentationFile>
-	  
-  </PropertyGroup>
-
-  <Target Name="NoWarnOnRazorViewImportedTypeConflicts" BeforeTargets="RazorCoreCompile">
-    <PropertyGroup>
-      <NoWarn>$(NoWarn);0436</NoWarn>
-    </PropertyGroup>
-  </Target>
-
-  <ItemGroup>
-    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json" />
-  </ItemGroup>
-	
-	<ItemGroup>
-		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-	</ItemGroup>
-	
-</Project>

Yi.Abp.Net8/end.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-kill -9 $(lsof -t -i:19001)
-echo "Yi-进程已关闭"

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/AuthenticationConstants.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth
-{
-    public class AuthenticationConstants
-    {
-            public const string OpenId = "urn:openid";
-            public const string AccessToken = "urn:access_token";
-            public const string Name = "urn:name";
-
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/AuthenticationOAuthOptions.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authentication.OAuth;
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth
-{
-    public class AuthenticationOAuthOptions:OAuthOptions
-    {
-
-        public string RedirectUri { get; set; }
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/AuthticationErrCodeModel.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Yi.Framework.AspNetCore.Authentication.OAuth.Gitee;
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth
-{
-    public class AuthticationErrCodeModel
-    {
-        public string error { get; set; }
-
-        public string error_description { get; set; }
-
-        public static void VerifyErrResponse(string content)
-        {
-
-            var model = Newtonsoft.Json.JsonConvert.DeserializeObject<AuthticationErrCodeModel>(content);
-            if (model.error != null)
-            {
-
-                throw new Exception($"第三方授权返回错误，错误码：【{model.error}】，错误详情：【{model.error_description}】");
-            }
-        }
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/Gitee/GiteeAuthenticationConstants.cs

@@ -1,19 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- * See https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers
- * for more information concerning the license and the contributors participating to this project.
- */
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth.Gitee;
-
-/// <summary>
-/// Contains constants specific to the <see cref="GiteeAuthenticationHandler"/>.
-/// </summary>
-public static class GiteeAuthenticationConstants
-{
-    public static class Claims
-    {
-        public const string Url = "urn:gitee:url";
-        public const string AvatarUrl = "urn:gitee:avatarUrl";
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/Gitee/GiteeAuthenticationDefaults.cs

@@ -1,53 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- * See https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers
- * for more information concerning the license and the contributors participating to this project.
- */
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth.Gitee;
-
-/// <summary>
-/// Default values used by the Gitee authentication middleware.
-/// </summary>
-public static class GiteeAuthenticationDefaults
-{
-    /// <summary>
-    /// Default value for <see cref="AuthenticationScheme.Name"/>.
-    /// </summary>
-    public const string AuthenticationScheme = "Gitee";
-
-    /// <summary>
-    /// Default value for <see cref="AuthenticationScheme.DisplayName"/>.
-    /// </summary>
-    public static readonly string DisplayName = "Gitee";
-
-    /// <summary>
-    /// Default value for <see cref="AuthenticationSchemeOptions.ClaimsIssuer"/>.
-    /// </summary>
-    public static readonly string Issuer = "Gitee";
-
-    /// <summary>
-    /// Default value for <see cref="RemoteAuthenticationOptions.CallbackPath"/>.
-    /// </summary>
-    public static readonly string CallbackPath = "/signin-gitee";
-
-    /// <summary>
-    /// Default value for <see cref="OAuthOptions.AuthorizationEndpoint"/>.
-    /// </summary>
-    public static readonly string AuthorizationEndpoint = "https://gitee.com/oauth/authorize";
-
-    /// <summary>
-    /// Default value for <see cref="OAuthOptions.TokenEndpoint"/>.
-    /// </summary>
-    public static readonly string TokenEndpoint = "https://gitee.com/oauth/token";
-
-    /// <summary>
-    /// Default value for <see cref="OAuthOptions.UserInformationEndpoint"/>.
-    /// </summary>
-    public static readonly string UserInformationEndpoint = "https://gitee.com/api/v5/user";
-
-    /// <summary>
-    /// Default value for <see cref="GiteeAuthenticationOptions.UserEmailsEndpoint"/>.
-    /// </summary>
-    public static readonly string UserEmailsEndpoint = "https://gitee.com/api/v5/emails";
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/Gitee/GiteeAuthenticationExtensions.cs

@@ -1,75 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- * See https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers
- * for more information concerning the license and the contributors participating to this project.
- */
-
-using JetBrains.Annotations;
-using Microsoft.AspNetCore.Authentication;
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth.Gitee;
-
-/// <summary>
-/// Extension methods to add Gitee authentication capabilities to an HTTP application pipeline.
-/// </summary>
-public static class GiteeAuthenticationExtensions
-{
-    /// <summary>
-    /// Adds <see cref="GiteeAuthenticationHandler"/> to the specified
-    /// <see cref="AuthenticationBuilder"/>, which enables Gitee authentication capabilities.
-    /// </summary>
-    /// <param name="builder">The authentication builder.</param>
-    /// <returns>The <see cref="AuthenticationBuilder"/>.</returns>
-    public static AuthenticationBuilder AddGitee([NotNull] this AuthenticationBuilder builder)
-    {
-        return builder.AddGitee(GiteeAuthenticationDefaults.AuthenticationScheme, options => { });
-    }
-
-    /// <summary>
-    /// Adds <see cref="GiteeAuthenticationHandler"/> to the specified
-    /// <see cref="AuthenticationBuilder"/>, which enables Gitee authentication capabilities.
-    /// </summary>
-    /// <param name="builder">The authentication builder.</param>
-    /// <param name="configuration">The delegate used to configure the OpenID 2.0 options.</param>
-    /// <returns>The <see cref="AuthenticationBuilder"/>.</returns>
-    public static AuthenticationBuilder AddGitee(
-        [NotNull] this AuthenticationBuilder builder,
-        [NotNull] Action<GiteeAuthenticationOptions> configuration)
-    {
-        return builder.AddGitee(GiteeAuthenticationDefaults.AuthenticationScheme, configuration);
-    }
-
-    /// <summary>
-    /// Adds <see cref="GiteeAuthenticationHandler"/> to the specified
-    /// <see cref="AuthenticationBuilder"/>, which enables Gitee authentication capabilities.
-    /// </summary>
-    /// <param name="builder">The authentication builder.</param>
-    /// <param name="scheme">The authentication scheme associated with this instance.</param>
-    /// <param name="configuration">The delegate used to configure the Gitee options.</param>
-    /// <returns>The <see cref="AuthenticationBuilder"/>.</returns>
-    public static AuthenticationBuilder AddGitee(
-        [NotNull] this AuthenticationBuilder builder,
-        [NotNull] string scheme,
-        [NotNull] Action<GiteeAuthenticationOptions> configuration)
-    {
-        return builder.AddGitee(scheme, GiteeAuthenticationDefaults.DisplayName, configuration);
-    }
-
-    /// <summary>
-    /// Adds <see cref="GiteeAuthenticationHandler"/> to the specified
-    /// <see cref="AuthenticationBuilder"/>, which enables Gitee authentication capabilities.
-    /// </summary>
-    /// <param name="builder">The authentication builder.</param>
-    /// <param name="scheme">The authentication scheme associated with this instance.</param>
-    /// <param name="caption">The optional display name associated with this instance.</param>
-    /// <param name="configuration">The delegate used to configure the Gitee options.</param>
-    /// <returns>The <see cref="AuthenticationBuilder"/>.</returns>
-    public static AuthenticationBuilder AddGitee(
-        [NotNull] this AuthenticationBuilder builder,
-        [NotNull] string scheme,
-        [CanBeNull] string caption,
-        [NotNull] Action<GiteeAuthenticationOptions> configuration)
-    {
-        return builder.AddScheme<GiteeAuthenticationOptions, GiteeAuthenticationHandler>(scheme, caption, configuration);
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/Gitee/GiteeAuthenticationHandler.cs

@@ -1,49 +0,0 @@
-using System.Security.Claims;
-using System.Text.Encodings.Web;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using static Yi.Framework.AspNetCore.Authentication.OAuth.Gitee.GiteeAuthenticationConstants;
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth.Gitee
-{
-    public class GiteeAuthenticationHandler : OauthAuthenticationHandler<GiteeAuthenticationOptions>
-    {
-        public GiteeAuthenticationHandler(IOptionsMonitor<GiteeAuthenticationOptions> options, ILoggerFactory logger, UrlEncoder encoder, IHttpClientFactory httpClientFactory) : base(options, logger, encoder, httpClientFactory)
-        {
-        }
-
-        public override string AuthenticationSchemeNmae => GiteeAuthenticationDefaults.AuthenticationScheme;
-
-        protected override async Task<List<Claim>> GetAuthTicketAsync(string code)
-        {
-            //获取 accessToken
-            var tokenQueryKv = new List<KeyValuePair<string, string?>>()
-            {
-                new KeyValuePair<string, string?>("grant_type","authorization_code"),
-                new KeyValuePair<string, string?>("client_id",Options.ClientId),
-                new KeyValuePair<string, string?>("client_secret",Options.ClientSecret),
-                new KeyValuePair<string, string?>("redirect_uri",Options.RedirectUri),
-                new KeyValuePair<string, string?>("code",code)
-            };
-            var tokenModel = await SendHttpRequestAsync<GiteeAuthticationcationTokenResponse>(GiteeAuthenticationDefaults.TokenEndpoint, tokenQueryKv,HttpMethod.Post);
-
-            //获取 userInfo
-            var userInfoQueryKv = new List<KeyValuePair<string, string?>>()
-            {
-                new KeyValuePair<string, string?>("access_token",tokenModel.access_token),
-            };
-            var userInfoMdoel = await SendHttpRequestAsync<GiteeAuthticationcationUserInfoResponse>(GiteeAuthenticationDefaults.UserInformationEndpoint, userInfoQueryKv);
-
-            List<Claim> claims = new List<Claim>()
-            {
-                new Claim(Claims.AvatarUrl, userInfoMdoel.avatar_url),
-                new Claim(Claims.Url, userInfoMdoel.url),
-
-                new Claim(AuthenticationConstants.OpenId,userInfoMdoel.id.ToString()),
-                new Claim(AuthenticationConstants.Name, userInfoMdoel.name),
-                new Claim(AuthenticationConstants.AccessToken, tokenModel.access_token)
-            };
-            return claims;
-        }
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/Gitee/GiteeAuthenticationOptions.cs

@@ -1,44 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- * See https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers
- * for more information concerning the license and the contributors participating to this project.
- */
-
-using System.Security.Claims;
-using Microsoft.AspNetCore.Authentication;
-using static Yi.Framework.AspNetCore.Authentication.OAuth.Gitee.GiteeAuthenticationConstants;
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth.Gitee;
-
-/// <summary>
-/// Defines a set of options used by <see cref="GiteeAuthenticationHandler"/>.
-/// </summary>
-public class GiteeAuthenticationOptions : AuthenticationOAuthOptions
-{
-    public GiteeAuthenticationOptions()
-    {
-        ClaimsIssuer = GiteeAuthenticationDefaults.Issuer;
-
-        CallbackPath = GiteeAuthenticationDefaults.CallbackPath;
-
-        AuthorizationEndpoint = GiteeAuthenticationDefaults.AuthorizationEndpoint;
-        TokenEndpoint = GiteeAuthenticationDefaults.TokenEndpoint;
-        UserInformationEndpoint = GiteeAuthenticationDefaults.UserInformationEndpoint;
-        UserEmailsEndpoint = GiteeAuthenticationDefaults.UserEmailsEndpoint;
-
-        Scope.Add("user_info");
-        Scope.Add("emails");
-
-        ClaimActions.MapJsonKey(ClaimTypes.NameIdentifier, "id");
-        ClaimActions.MapJsonKey(ClaimTypes.Name, "login");
-        ClaimActions.MapJsonKey(ClaimTypes.Email, "email");
-        ClaimActions.MapJsonKey(ClaimTypes.Name, "name");
-        ClaimActions.MapJsonKey(Claims.Url, "url");
-    }
-
-    /// <summary>
-    /// Gets or sets the address of the endpoint exposing
-    /// the email addresses associated with the logged in user.
-    /// </summary>
-    public string UserEmailsEndpoint { get; set; }
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/Gitee/GiteeAuthticationcationHttpModel.cs

@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth.Gitee
-{
-    public class GiteeAuthticationcationTokenResponse
-    {
-        public string access_token { get; set; }
-        public string token_type { get; set; }
-        public int expires_in { get; set; }
-        public string refresh_token { get; set; }
-        public string scope { get; set; }
-        public long created_at { get; set; }
-    }
-
-
-    public class GiteeAuthticationcationOpenIdResponse
-    {
-        public string client_id { get; set; }
-
-        public string openid { get; set; }
-
-    }
-
-    public class GiteeAuthticationcationUserInfoResponse
-    {
-        /// <summary>
-        /// 也可以等于openId
-        /// </summary>
-        public int id { get; set; }
-        public string login { get; set; }
-        public string name { get; set; }
-        public string avatar_url { get; set; }
-        public string url { get; set; }
-        public string html_url { get; set; }
-        public string remark { get; set; }
-        public string followers_url { get; set; }
-        public string following_url { get; set; }
-        public string gists_url { get; set; }
-        public string starred_url { get; set; }
-        public string subscriptions_url { get; set; }
-        public string organizations_url { get; set; }
-        public string repos_url { get; set; }
-        public string events_url { get; set; }
-        public string received_events_url { get; set; }
-        public string type { get; set; }
-        public string blog { get; set; }
-        public string weibo { get; set; }
-        public string bio { get; set; }
-        public int public_repos { get; set; }
-        public int public_gists { get; set; }
-        public int followers { get; set; }
-        public int following { get; set; }
-        public int stared { get; set; }
-        public int watched { get; set; }
-        public DateTime created_at { get; set; }
-        public DateTime updated_at { get; set; }
-        public string email { get; set; }
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/OAuthAuthenticationHandler.cs

@@ -1,96 +0,0 @@
-using System.Security.Claims;
-using System.Text.Encodings.Web;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.WebUtilities;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth
-{
-    public abstract class OauthAuthenticationHandler<TOptions> : AuthenticationHandler<TOptions> where TOptions : AuthenticationSchemeOptions, new()
-    {
-        public abstract string AuthenticationSchemeNmae { get; }
-        private AuthenticationScheme _scheme;
-
-        public OauthAuthenticationHandler(IOptionsMonitor<TOptions> options, ILoggerFactory logger, UrlEncoder encoder, IHttpClientFactory httpClientFactory) : base(options, logger, encoder)
-        {
-            HttpClientFactory = httpClientFactory;
-            HttpClient = HttpClientFactory.CreateClient();
-        }
-
-
-        protected IHttpClientFactory HttpClientFactory { get; }
-
-        protected HttpClient HttpClient { get; }
-
-
-
-        /// <summary>
-        /// 生成认证票据
-        /// </summary>
-        /// <returns></returns>
-        private AuthenticationTicket TicketConver(List<Claim> claims)
-        {
-            var claimsIdentity = new ClaimsIdentity(claims.ToArray(), AuthenticationSchemeNmae);
-            var principal = new ClaimsPrincipal(claimsIdentity);
-            return new AuthenticationTicket(principal, AuthenticationSchemeNmae);
-        }
-
-        protected async Task<HttpModel> SendHttpRequestAsync<HttpModel>(string url, IEnumerable<KeyValuePair<string, string?>> query, HttpMethod? httpMethod = null)
-        {
-            httpMethod = httpMethod ?? HttpMethod.Get;
-
-            var queryUrl = QueryHelpers.AddQueryString(url, query);
-            HttpResponseMessage response = null;
-            if (httpMethod == HttpMethod.Get)
-            {
-                response = await HttpClient.GetAsync(queryUrl);
-            }
-            else if (httpMethod == HttpMethod.Post)
-            {
-                response = await HttpClient.PostAsync(queryUrl, null);
-            }
-
-            var content = await response.Content.ReadAsStringAsync();
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new Exception($"授权服务器请求错误,请求地址:{queryUrl},错误信息：{content}");
-            }
-            VerifyErrResponse(content);
-            var model = Newtonsoft.Json.JsonConvert.DeserializeObject<HttpModel>(content);
-            return model!;
-        }
-
-        protected virtual void VerifyErrResponse(string content)
-        {
-            AuthticationErrCodeModel.VerifyErrResponse(content);
-        }
-
-        protected abstract Task<List<Claim>> GetAuthTicketAsync(string code);
-
-
-        protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
-        {
-            if (!Context.Request.Query.ContainsKey("code"))
-            {
-                return AuthenticateResult.Fail("回调未包含code参数");
-            }
-            var code = Context.Request.Query["code"].ToString();
-
-            List<Claim> authTicket = null;
-            try
-            {
-                authTicket = await GetAuthTicketAsync(code);
-            }
-            catch (Exception ex)
-            {
-                return AuthenticateResult.Fail(ex.Message ?? "未知错误");
-            }
-            //成功
-            var result = AuthenticateResult.Success(TicketConver(authTicket));
-            return result;
-        }
-    }
-}
-
-

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/QQ/QQAuthenticationConstants.cs

@@ -1,23 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- * See https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers
- * for more information concerning the license and the contributors participating to this project.
- */
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth.QQ;
-
-/// <summary>
-/// Contains constants specific to the <see cref="QQAuthenticationHandler"/>.
-/// </summary>
-public static class QQAuthenticationConstants
-{
-    public static class Claims
-    {
-        public const string AvatarFullUrl = "urn:qq:avatar_full";
-        public const string AvatarUrl = "urn:qq:avatar";
-        public const string PictureFullUrl = "urn:qq:picture_full";
-        public const string PictureMediumUrl = "urn:qq:picture_medium";
-        public const string PictureUrl = "urn:qq:picture";
-        public const string UnionId = "urn:qq:unionid";
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/QQ/QQAuthenticationDefaults.cs

@@ -1,53 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- * See https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers
- * for more information concerning the license and the contributors participating to this project.
- */
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth.QQ;
-
-/// <summary>
-/// Default values for QQ authentication.
-/// </summary>
-public static class QQAuthenticationDefaults
-{
-    /// <summary>
-    /// Default value for <see cref="AuthenticationScheme.Name"/>.
-    /// </summary>
-    public const string AuthenticationScheme = "QQ";
-
-    /// <summary>
-    /// Default value for <see cref="AuthenticationScheme.DisplayName"/>.
-    /// </summary>
-    public static readonly string DisplayName = "QQ";
-
-    /// <summary>
-    /// Default value for <see cref="AuthenticationSchemeOptions.ClaimsIssuer"/>.
-    /// </summary>
-    public static readonly string Issuer = "QQ";
-
-    /// <summary>
-    /// Default value for <see cref="RemoteAuthenticationOptions.CallbackPath"/>.
-    /// </summary>
-    public static readonly string CallbackPath = "/signin-qq";
-
-    /// <summary>
-    /// Default value for <see cref="OAuthOptions.AuthorizationEndpoint"/>.
-    /// </summary>
-    public static readonly string AuthorizationEndpoint = "https://graph.qq.com/oauth2.0/authorize";
-
-    /// <summary>
-    /// Default value for <see cref="OAuthOptions.TokenEndpoint"/>.
-    /// </summary>
-    public static readonly string TokenEndpoint = "https://graph.qq.com/oauth2.0/token";
-
-    /// <summary>
-    /// Default value for <see cref="QQAuthenticationOptions.UserIdentificationEndpoint"/>.
-    /// </summary>
-    public static readonly string UserIdentificationEndpoint = "https://graph.qq.com/oauth2.0/me";
-
-    /// <summary>
-    /// Default value for <see cref="OAuthOptions.UserInformationEndpoint"/>.
-    /// </summary>
-    public static readonly string UserInformationEndpoint = "https://graph.qq.com/user/get_user_info";
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/QQ/QQAuthenticationExtensions.cs

@@ -1,77 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- * See https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers
- * for more information concerning the license and the contributors participating to this project.
- */
-
-using JetBrains.Annotations;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth.QQ;
-
-/// <summary>
-/// Extension methods to add QQ authentication capabilities to an HTTP application pipeline.
-/// </summary>
-public static class QQAuthenticationExtensions
-{
-    /// <summary>
-    /// Adds <see cref="QQAuthenticationHandler"/> to the specified
-    /// <see cref="AuthenticationBuilder"/>, which enables QQ authentication capabilities.
-    /// </summary>
-    /// <param name="builder">The authentication builder.</param>
-    /// <returns>The <see cref="AuthenticationBuilder"/>.</returns>
-    public static AuthenticationBuilder AddQQ([NotNull] this AuthenticationBuilder builder)
-    {
-        return builder.AddQQ(QQAuthenticationDefaults.AuthenticationScheme, options => { });
-    }
-
-    /// <summary>
-    /// Adds <see cref="QQAuthenticationHandler"/> to the specified
-    /// <see cref="AuthenticationBuilder"/>, which enables QQ authentication capabilities.
-    /// </summary>
-    /// <param name="builder">The authentication builder.</param>
-    /// <param name="configuration">The delegate used to configure the OpenID 2.0 options.</param>
-    /// <returns>The <see cref="AuthenticationBuilder"/>.</returns>
-    public static AuthenticationBuilder AddQQ(
-        [NotNull] this AuthenticationBuilder builder,
-        [NotNull] Action<QQAuthenticationOptions> configuration)
-    {
-        return builder.AddQQ(QQAuthenticationDefaults.AuthenticationScheme, configuration);
-    }
-
-    /// <summary>
-    /// Adds <see cref="QQAuthenticationHandler"/> to the specified
-    /// <see cref="AuthenticationBuilder"/>, which enables QQ authentication capabilities.
-    /// </summary>
-    /// <param name="builder">The authentication builder.</param>
-    /// <param name="scheme">The authentication scheme associated with this instance.</param>
-    /// <param name="configuration">The delegate used to configure the QQ options.</param>
-    /// <returns>The <see cref="AuthenticationBuilder"/>.</returns>
-    public static AuthenticationBuilder AddQQ(
-        [NotNull] this AuthenticationBuilder builder,
-        [NotNull] string scheme,
-        [NotNull] Action<QQAuthenticationOptions> configuration)
-    {
-        return builder.AddQQ(scheme, QQAuthenticationDefaults.DisplayName, configuration);
-    }
-
-    /// <summary>
-    /// Adds <see cref="QQAuthenticationHandler"/> to the specified
-    /// <see cref="AuthenticationBuilder"/>, which enables QQ authentication capabilities.
-    /// </summary>
-    /// <param name="builder">The authentication builder.</param>
-    /// <param name="scheme">The authentication scheme associated with this instance.</param>
-    /// <param name="caption">The optional display name associated with this instance.</param>
-    /// <param name="configuration">The delegate used to configure the QQ options.</param>
-    /// <returns>The <see cref="AuthenticationBuilder"/>.</returns>
-    public static AuthenticationBuilder AddQQ(
-        [NotNull] this AuthenticationBuilder builder,
-        [NotNull] string scheme,
-        [CanBeNull] string caption,
-        [NotNull] Action<QQAuthenticationOptions> configuration)
-    {
-        return builder.AddScheme<QQAuthenticationOptions, QQAuthenticationHandler>(scheme, caption, configuration);
-
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/QQ/QQAuthenticationHandler.cs

@@ -1,64 +0,0 @@
-using System.Security.Claims;
-using System.Text.Encodings.Web;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using static Yi.Framework.AspNetCore.Authentication.OAuth.QQ.QQAuthenticationConstants;
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth.QQ
-{
-    public class QQAuthenticationHandler : OauthAuthenticationHandler<QQAuthenticationOptions>
-    {
-        public QQAuthenticationHandler(IOptionsMonitor<QQAuthenticationOptions> options, ILoggerFactory logger, UrlEncoder encoder, IHttpClientFactory httpClientFactory) : base(options, logger, encoder, httpClientFactory)
-        {
-        }
-
-        public override string AuthenticationSchemeNmae => QQAuthenticationDefaults.AuthenticationScheme;
-
-        protected override async Task<List<Claim>> GetAuthTicketAsync(string code)
-        {
-
-            //获取 accessToken
-            var tokenQueryKv = new List<KeyValuePair<string, string?>>()
-            {
-                new KeyValuePair<string, string?>("grant_type","authorization_code"),
-                new KeyValuePair<string, string?>("client_id",Options.ClientId),
-                new KeyValuePair<string, string?>("client_secret",Options.ClientSecret),
-                new KeyValuePair<string, string?>("redirect_uri",Options.RedirectUri),
-                new KeyValuePair<string, string?>("fmt","json"),
-                new KeyValuePair<string, string?>("need_openid","1"),
-                new KeyValuePair<string, string?>("code",code)
-            };
-            var tokenModel = await SendHttpRequestAsync<QQAuthticationcationTokenResponse>(QQAuthenticationDefaults.TokenEndpoint, tokenQueryKv);
-
-
-
-            //获取 userInfo
-            var userInfoQueryKv = new List<KeyValuePair<string, string?>>()
-            {
-                new KeyValuePair<string, string?>("access_token",tokenModel.access_token),
-                new KeyValuePair<string, string?>("oauth_consumer_key",Options.ClientId),
-                new KeyValuePair<string, string?>("openid",tokenModel.openid),
-            };
-
-            var userInfoMdoel = await SendHttpRequestAsync<QQAuthticationcationUserInfoResponse>(QQAuthenticationDefaults.UserInformationEndpoint, userInfoQueryKv);
-
-
-            List<Claim> claims = new List<Claim>()
-            {
-
-                new Claim(Claims.AvatarFullUrl, userInfoMdoel.figureurl_qq_2),
-                new Claim(Claims.AvatarUrl, userInfoMdoel.figureurl_qq_1),
-                new Claim(Claims.PictureFullUrl, userInfoMdoel.figureurl_2),
-                new Claim(Claims.PictureMediumUrl, userInfoMdoel.figureurl_qq_1),
-                new Claim(Claims.PictureUrl, userInfoMdoel.figureurl),
-
-                new Claim(AuthenticationConstants.OpenId, tokenModel.openid),
-                new Claim(AuthenticationConstants.Name, userInfoMdoel.nickname),
-                new Claim(AuthenticationConstants.AccessToken, tokenModel.access_token),
-               
-            };
-            return claims;
-
-        }
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/QQ/QQAuthenticationOptions.cs

@@ -1,49 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- * See https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers
- * for more information concerning the license and the contributors participating to this project.
- */
-
-using System.Security.Claims;
-using Microsoft.AspNetCore.Authentication;
-using static Yi.Framework.AspNetCore.Authentication.OAuth.QQ.QQAuthenticationConstants;
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth.QQ;
-
-/// <summary>
-/// Defines a set of options used by <see cref="QQAuthenticationHandler"/>.
-/// </summary>
-public class QQAuthenticationOptions : AuthenticationOAuthOptions
-{
-    public QQAuthenticationOptions()
-    {
-        ClaimsIssuer = QQAuthenticationDefaults.Issuer;
-        CallbackPath = QQAuthenticationDefaults.CallbackPath;
-
-        AuthorizationEndpoint = QQAuthenticationDefaults.AuthorizationEndpoint;
-        TokenEndpoint = QQAuthenticationDefaults.TokenEndpoint;
-        UserIdentificationEndpoint = QQAuthenticationDefaults.UserIdentificationEndpoint;
-        UserInformationEndpoint = QQAuthenticationDefaults.UserInformationEndpoint;
-
-        Scope.Add("get_user_info");
-
-        ClaimActions.MapJsonKey(ClaimTypes.Name, "nickname");
-        ClaimActions.MapJsonKey(ClaimTypes.Gender, "gender");
-        ClaimActions.MapJsonKey(Claims.PictureUrl, "figureurl");
-        ClaimActions.MapJsonKey(Claims.PictureMediumUrl, "figureurl_1");
-        ClaimActions.MapJsonKey(Claims.PictureFullUrl, "figureurl_2");
-        ClaimActions.MapJsonKey(Claims.AvatarUrl, "figureurl_qq_1");
-        ClaimActions.MapJsonKey(Claims.AvatarFullUrl, "figureurl_qq_2");
-    }
-
-    /// <summary>
-    /// Gets or sets if the union Id (the primary key of an owner for different apps of the QQ platform) should be put into the user claims.
-    /// </summary>
-    public bool ApplyForUnionId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the URL of the user identification endpoint (a.k.a. the "OpenID endpoint").
-    /// </summary>
-    public string UserIdentificationEndpoint { get; set; }
-
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/QQ/QQAuthticationcationHttpModel.cs

@@ -1,89 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth.QQ
-{
-    public class QQAuthticationcationTokenResponse
-    {
-        public string access_token { get; set; }
-
-        public string expires_in { get; set; }
-
-        public string refresh_token { get; set; }
-
-        public string openid { get; set; }
-    }
-
-
-    public class QQAuthticationcationOpenIdResponse
-    {
-        public string client_id { get; set; }
-
-        public string openid { get; set; }
-
-    }
-
-    public class QQAuthticationcationUserInfoResponse
-    {
-        // 返回码
-        public int ret { get; set; }
-
-        // 如果ret<0，会有相应的错误信息提示
-        // 返回数据全部用UTF-8编码
-        public string msg { get; set; }
-
-        // 判断是否有数据丢失
-        // 0或者不返回：没有数据丢失，可以缓存
-        // 1：有部分数据丢失或错误，不要缓存
-        public int is_lost { get; set; }
-
-        // 用户在QQ空间的昵称
-        public string nickname { get; set; }
-
-        // 大小为30x30像素的QQ空间头像URL
-        public string figureurl { get; set; }
-
-        // 大小为50x50像素的QQ空间头像URL
-        public string figureurl_1 { get; set; }
-
-        // 大小为100x100像素的QQ空间头像URL
-        public string figureurl_2 { get; set; }
-
-        // 大小为40x40像素的QQ头像URL
-        public string figureurl_qq_1 { get; set; }
-
-        // 大小为100x100像素的QQ头像URL
-        // 需要注意，不是所有的用户都拥有QQ的100x100的头像，但40x40像素则是一定会有
-        public string figureurl_qq_2 { get; set; }
-
-        // 性别。如果获取不到则默认返回"男"
-        public string gender { get; set; }
-
-        // 性别类型。默认返回2
-        public int gender_type { get; set; }
-
-        // 省
-        public string province { get; set; }
-
-        // 市
-        public string city { get; set; }
-
-        // 年
-        public int year { get; set; }
-
-        // 星座
-        public string constellation { get; set; }
-
-        // 标识用户是否为黄钻用户
-        public int is_yellow_vip { get; set; }
-
-        // 黄钻等级
-        public int yellow_vip_level { get; set; }
-
-        // 是否为年费黄钻用户
-        public int is_yellow_year_vip { get; set; }
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/Yi.Framework.AspNetCore.Authentication.OAuth.csproj

@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="..\..\common.props" />
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Yi.Framework.AspNetCore\Yi.Framework.AspNetCore.csproj" />
-  </ItemGroup>
-
-</Project>

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore.Authentication.OAuth/YiFrameworkAspNetCoreAuthenticationOAuthModule.cs

@@ -1,20 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Modularity;
-using Yi.Framework.Core;
-
-
-namespace Yi.Framework.AspNetCore.Authentication.OAuth
-{
-    /// <summary>
-    /// 本模块轮子来自 AspNet.Security.OAuth.QQ;
-    /// </summary>
-    [DependsOn(typeof(YiFrameworkAspNetCoreModule))]
-    public class YiFrameworkAspNetCoreAuthenticationOAuthModule:AbpModule
-    {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            var service = context.Services;
-            service.AddHttpClient();
-        }
-    }
-}

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

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

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

@@ -1,105 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Volo.Abp.AspNetCore.Mvc;
-
-namespace Yi.Framework.AspNetCore.Microsoft.AspNetCore.Builder
-{
-    /// <summary>
-    /// Swagger构建器扩展类
-    /// </summary>
-    public static class SwaggerBuilderExtensions
-    {
-        /// <summary>
-        /// 配置并使用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)
-            {
-                throw new ArgumentNullException(nameof(app));
-            }
-
-            var mvcOptions = app.ApplicationServices
-                .GetRequiredService<IOptions<AbpAspNetCoreMvcOptions>>()
-                .Value;
-
-            // 启用Swagger中间件
-            app.UseSwagger();
-
-            // 配置SwaggerUI
-            app.UseSwaggerUI(options =>
-            {
-                // 添加约定控制器的Swagger终结点
-                var conventionalSettings = mvcOptions.ConventionalControllers.ConventionalControllerSettings;
-                foreach (var setting in conventionalSettings)
-                {
-                    options.SwaggerEndpoint(
-                        $"/swagger/{setting.RemoteServiceName}/swagger.json",
-                        setting.RemoteServiceName);
-                }
-
-                // 如果没有配置任何终结点，使用默认配置
-                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;
-        }
-    }
-
-    /// <summary>
-    /// Swagger配置模型
-    /// </summary>
-    public class SwaggerConfiguration
-    {
-        private const string DefaultSwaggerUrl = "/swagger/v1/swagger.json";
-
-        /// <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)
-        {
-        }
-
-        /// <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));
-            Name = name ?? throw new ArgumentNullException(nameof(name));
-        }
-    }
-}

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

@@ -1,61 +0,0 @@
-using System.Diagnostics;
-using Microsoft.AspNetCore.Http;
-using Volo.Abp.DependencyInjection;
-using Yi.Framework.Core.Extensions;
-
-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(() =>
-            {
-                HandleFileDownloadResponse(context);
-                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,229 +0,0 @@
-using System.ComponentModel;
-using System.Text;
-using Microsoft.AspNetCore.Mvc.Controllers;
-using Microsoft.Extensions.DependencyInjection;
-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>
-        /// 添加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 remoteServiceSettings = mvcOptions.ConventionalControllers
-                .ConventionalControllerSettings
-                .DistinctBy(x => x.RemoteServiceName);
-
-            services.AddAbpSwaggerGen(
-                options =>
-                {
-                    // 应用外部配置
-                    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))
-            {
-                if (!options.SwaggerGeneratorOptions.SwaggerDocs.ContainsKey(setting.RemoteServiceName))
-                {
-                    options.SwaggerDoc(setting.RemoteServiceName, new OpenApiInfo 
-                    { 
-                        Title = setting.RemoteServiceName, 
-                        Version = "v1" 
-                    });
-                }
-            }
-        }
-
-        /// <summary>
-        /// 配置API文档过滤器
-        /// </summary>
-        private static void ConfigureApiFilter(
-            SwaggerGenOptions options,
-            IEnumerable<ConventionalControllerSetting> settings)
-        {
-            options.DocInclusionPredicate((docName, apiDesc) =>
-            {
-                if (apiDesc.ActionDescriptor is ControllerActionDescriptor controllerDesc)
-                {
-                    var matchedSetting = settings
-                        .FirstOrDefault(x => x.Assembly == controllerDesc.ControllerTypeInfo.Assembly);
-                    return matchedSetting?.RemoteServiceName == docName;
-                }
-                return false;
-            });
-        }
-
-        /// <summary>
-        /// 包含XML注释文档
-        /// </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"))
-                {
-                    options.IncludeXmlComments(xmlFile, true);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 配置JWT认证
-        /// </summary>
-        private static void ConfigureJwtAuthentication(SwaggerGenOptions options)
-        {
-            options.AddSecurityDefinition("JwtBearer", new OpenApiSecurityScheme
-            {
-                Description = "请在此输入JWT Token",
-                Name = "Authorization",
-                In = ParameterLocation.Header,
-                Type = SecuritySchemeType.Http,
-                Scheme = "bearer"
-            });
-
-            var scheme = new OpenApiSecurityScheme
-            {
-                Reference = new OpenApiReference 
-                { 
-                    Type = ReferenceType.SecurityScheme, 
-                    Id = "JwtBearer" 
-                }
-            };
-
-            options.AddSecurityRequirement(new OpenApiSecurityRequirement
-            {
-                [scheme] = Array.Empty<string>()
-            });
-        }
-
-        /// <summary>
-        /// 配置自定义过滤器
-        /// </summary>
-        private static void ConfigureCustomFilters(SwaggerGenOptions options)
-        {
-            options.OperationFilter<TenantHeaderOperationFilter>();
-            options.SchemaFilter<EnumSchemaFilter>();
-        }
-    }
-
-    /// <summary>
-    /// Swagger文档枚举字段显示过滤器
-    /// </summary>
-    public class EnumSchemaFilter : ISchemaFilter
-    {
-        /// <summary>
-        /// 应用枚举架构过滤器
-        /// </summary>
-        /// <param name="schema">OpenAPI架构</param>
-        /// <param name="context">架构过滤器上下文</param>
-        public void Apply(OpenApiSchema schema, SchemaFilterContext context)
-        {
-            if (!context.Type.IsEnum) return;
-
-            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);
-                var description = GetEnumDescription(enumValue);
-                var enumIntValue = Convert.ToInt64(enumValue);
-
-                schema.Enum.Add(new OpenApiString(enumName));
-                enumDescriptions.AppendLine(
-                    $"【枚举：{enumName}{(description is null ? string.Empty : $"({description})")}={enumIntValue}】");
-            }
-            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>
-        /// 应用租户头部参数过滤器
-        /// </summary>
-        public void Apply(OpenApiOperation operation, OperationFilterContext context)
-        {
-            operation.Parameters ??= new List<OpenApiParameter>();
-            
-            operation.Parameters.Add(new OpenApiParameter
-            {
-                Name = TenantHeaderKey,
-                In = ParameterLocation.Header,
-                Required = false,
-                AllowEmptyValue = true,
-                Description = "租户ID或租户名称（留空表示默认租户）"
-            });
-        }
-    }
-}

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

@@ -1,137 +0,0 @@
-using JetBrains.Annotations;
-using Microsoft.AspNetCore.Mvc.ApplicationModels;
-using System.Reflection;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Volo.Abp.AspNetCore.Mvc.Conventions;
-using Volo.Abp.DependencyInjection;
-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>
-        /// 构造函数
-        /// </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,
-            ActionModel action,
-            string httpMethod,
-            [CanBeNull] ConventionalControllerSetting configuration)
-        {
-            // 获取API路由前缀
-            var apiRoutePrefix = GetApiRoutePrefix(action, configuration);
-            
-            // 规范化控制器名称
-            var normalizedControllerName = NormalizeUrlControllerName(
-                rootPath, 
-                controllerName, 
-                action, 
-                httpMethod, 
-                configuration);
-
-            // 构建基础URL
-            var url = $"{rootPath}/{NormalizeControllerNameCase(normalizedControllerName, configuration)}";
-
-            // 处理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 (idParameter == null)
-            {
-                return baseUrl;
-            }
-
-            // 处理原始类型ID
-            if (TypeHelper.IsPrimitiveExtended(idParameter.ParameterType, includeEnums: true))
-            {
-                return $"{baseUrl}/{{id}}";
-            }
-
-            // 处理复杂类型ID
-            var properties = idParameter.ParameterType
-                .GetProperties(BindingFlags.Instance | BindingFlags.Public);
-
-            foreach (var property in properties)
-            {
-                baseUrl += $"/{{{NormalizeIdPropertyNameCase(property, configuration)}}}";
-            }
-
-            return baseUrl;
-        }
-
-        /// <summary>
-        /// 构建Action名称路由部分
-        /// </summary>
-        private string BuildActionNameRoute(
-            string baseUrl,
-            string rootPath,
-            string controllerName,
-            ActionModel action,
-            string httpMethod,
-            ConventionalControllerSetting configuration)
-        {
-            var actionNameInUrl = NormalizeUrlActionName(
-                rootPath, 
-                controllerName, 
-                action, 
-                httpMethod, 
-                configuration);
-
-            if (actionNameInUrl.IsNullOrEmpty())
-            {
-                return baseUrl;
-            }
-
-            baseUrl += $"/{NormalizeActionNameCase(actionNameInUrl, configuration)}";
-
-            // 处理次要ID参数
-            var secondaryIds = action.Parameters
-                .Where(p => p.ParameterName.EndsWith("Id", StringComparison.Ordinal))
-                .ToList();
-
-            if (secondaryIds.Count == 1)
-            {
-                baseUrl += $"/{{{NormalizeSecondaryIdNameCase(secondaryIds[0], configuration)}}}";
-            }
-
-            return baseUrl;
-        }
-    }
-}

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

@@ -1,154 +0,0 @@
-using JetBrains.Annotations;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ActionConstraints;
-using Microsoft.AspNetCore.Mvc.ApplicationModels;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Volo.Abp;
-using Volo.Abp.AspNetCore;
-using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.AspNetCore.Mvc.Conventions;
-using Volo.Abp.DependencyInjection;
-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>
-        /// 初始化服务约定的新实例
-        /// </summary>
-        /// <param name="options">ABP AspNetCore MVC 配置选项</param>
-        /// <param name="conventionalRouteBuilder">约定路由构建器</param>
-        public YiServiceConvention(
-            IOptions<AbpAspNetCoreMvcOptions> options,
-            IConventionalRouteBuilder conventionalRouteBuilder) 
-            : base(options, conventionalRouteBuilder)
-        {
-        }
-
-        /// <summary>
-        /// 配置选择器,处理路由和HTTP方法约束
-        /// </summary>
-        protected override void ConfigureSelector(
-            string rootPath,
-            string controllerName,
-            ActionModel action,
-            ConventionalControllerSetting? configuration)
-        {
-            // 移除空选择器
-            RemoveEmptySelectors(action.Selectors);
-
-            // 检查远程服务特性
-            var remoteServiceAttr = ReflectionHelper
-                .GetSingleAttributeOrDefault<RemoteServiceAttribute>(action.ActionMethod);
-            if (remoteServiceAttr != null && !remoteServiceAttr.IsEnabledFor(action.ActionMethod))
-            {
-                return;
-            }
-
-            // 根据选择器是否存在执行不同的配置
-            if (!action.Selectors.Any())
-            {
-                AddAbpServiceSelector(rootPath, controllerName, action, configuration);
-            }
-            else
-            {
-                NormalizeSelectorRoutes(rootPath, controllerName, action, configuration);
-            }
-        }
-
-        /// <summary>
-        /// 规范化选择器路由
-        /// </summary>
-        protected override void NormalizeSelectorRoutes(
-            string rootPath,
-            string controllerName,
-            ActionModel action,
-            ConventionalControllerSetting? configuration)
-        {
-            foreach (var selector in action.Selectors)
-            {
-                // 获取HTTP方法约束
-                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()
-                ?? 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(
-                    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}";
-            }
-        }
-
-        /// <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

@@ -1,58 +0,0 @@
-using System.Net;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Volo.Abp.AspNetCore.WebClientInfo;
-
-namespace Yi.Framework.AspNetCore;
-
-/// <summary>
-/// 真实IP地址提供程序,支持代理服务器场景
-/// </summary>
-public class RealIpHttpContextWebClientInfoProvider : HttpContextWebClientInfoProvider
-{
-    private const string XForwardedForHeader = "X-Forwarded-For";
-
-    /// <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)
-            {
-                return null;
-            }
-
-            var headers = httpContext.Request?.Headers;
-            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地址时发生异常");
-            return null;
-        }
-    }
-}

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

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

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

@@ -1,46 +0,0 @@
-// MIT 许可证
-//
-// 版权 © 2020-present 百小僧, 百签科技（广东）有限公司 和所有贡献者
-//
-// 特此免费授予任何获得本软件副本和相关文档文件（下称“软件”）的人不受限制地处置该软件的权利，
-// 包括不受限制地使用、复制、修改、合并、发布、分发、转授许可和/或出售该软件副本，
-// 以及再授权被配发了本软件的人如上的权利，须在下列条件下：
-//
-// 上述版权声明和本许可声明应包含在该软件的所有副本或实质成分中。
-//
-// 本软件是“如此”提供的，没有任何形式的明示或暗示的保证，包括但不限于对适销性、特定用途的适用性和不侵权的保证。
-// 在任何情况下，作者或版权持有人都不对任何索赔、损害或其他责任负责，无论这些追责来自合同、侵权或其它行为中，
-// 还是产生于、源于或有关于本软件以及本软件的使用或其它处置。
-
-namespace Yi.Framework.AspNetCore.UnifyResult;
-
-/// <summary>
-/// 异常元数据
-/// </summary>
-public sealed class ExceptionMetadata
-{
-    /// <summary>
-    /// 状态码
-    /// </summary>
-    public int StatusCode { get; internal set; }
-
-    /// <summary>
-    /// 错误码
-    /// </summary>
-    public object ErrorCode { get; internal set; }
-
-    /// <summary>
-    /// 错误码（没被复写过的 ErrorCode ）
-    /// </summary>
-    public object OriginErrorCode { get; internal set; }
-
-    /// <summary>
-    /// 错误对象（信息）
-    /// </summary>
-    public object Errors { get; internal set; }
-
-    /// <summary>
-    /// 额外数据
-    /// </summary>
-    public object Data { get; internal set; }
-}

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

@@ -1,106 +0,0 @@
-// MIT 许可证
-//
-// 版权 © 2020-present 百小僧, 百签科技（广东）有限公司 和所有贡献者
-//
-// 特此免费授予任何获得本软件副本和相关文档文件（下称“软件”）的人不受限制地处置该软件的权利，
-// 包括不受限制地使用、复制、修改、合并、发布、分发、转授许可和/或出售该软件副本，
-// 以及再授权被配发了本软件的人如上的权利，须在下列条件下：
-//
-// 上述版权声明和本许可声明应包含在该软件的所有副本或实质成分中。
-//
-// 本软件是“如此”提供的，没有任何形式的明示或暗示的保证，包括但不限于对适销性、特定用途的适用性和不侵权的保证。
-// 在任何情况下，作者或版权持有人都不对任何索赔、损害或其他责任负责，无论这些追责来自合同、侵权或其它行为中，
-// 还是产生于、源于或有关于本软件以及本软件的使用或其它处置。
-
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.DependencyInjection;
-using Yi.Framework.Core.Extensions;
-
-namespace Yi.Framework.AspNetCore.UnifyResult.Fiters;
-
-/// <summary>
-/// 友好异常拦截器
-/// </summary>
-public sealed class FriendlyExceptionFilter : IAsyncExceptionFilter
-{
-    /// <summary>
-    /// 异常拦截
-    /// </summary>
-    /// <param name="context"></param>
-    /// <returns></returns>
-    public async Task OnExceptionAsync(ExceptionContext context)
-    {
-
-        // 排除 WebSocket 请求处理
-        if (context.HttpContext.IsWebSocketRequest()) return;
-
-        // 如果异常在其他地方被标记了处理，那么这里不再处理
-        if (context.ExceptionHandled) return;
-
-        // 解析异常信息
-        var exceptionMetadata = GetExceptionMetadata(context);
-        
-        IUnifyResultProvider unifyResult = context.GetRequiredService<IUnifyResultProvider>();
-        // 执行规范化异常处理
-        context.Result = unifyResult.OnException(context, exceptionMetadata);
-        
-        // 创建日志记录器
-        var logger = context.HttpContext.RequestServices.GetRequiredService<ILogger<FriendlyExceptionFilter>>();
-
-        // 记录拦截日常
-        logger.LogError(context.Exception, context.Exception.Message);
-    }
-
-    /// <summary>
-    /// 获取异常元数据
-    /// </summary>
-    /// <param name="context"></param>
-    /// <returns></returns>
-    public static ExceptionMetadata GetExceptionMetadata(ActionContext context)
-    {
-        object errorCode = default;
-        object originErrorCode = default;
-        object errors = default;
-        object data = default;
-        var statusCode = StatusCodes.Status500InternalServerError;
-        var isValidationException = false; // 判断是否是验证异常
-        var isFriendlyException = false;
-
-        // 判断是否是 ExceptionContext 或者 ActionExecutedContext
-        var exception = context is ExceptionContext exContext
-            ? exContext.Exception
-            : (
-                context is ActionExecutedContext edContext
-                    ? edContext.Exception
-                    : default
-            );
-
-        // 判断是否是友好异常
-        if (exception is UserFriendlyException friendlyException)
-        {
-            int statusCode2 = 500;
-            int.TryParse(friendlyException.Code, out statusCode2);
-            isFriendlyException = true;
-            errorCode = friendlyException.Code;
-            originErrorCode = friendlyException.Code;
-            statusCode = statusCode2==0?403:statusCode2;
-            isValidationException = false;
-            errors = friendlyException.Message;
-            data = friendlyException.Data;
-        }
-
-        return new ExceptionMetadata
-        {
-            StatusCode = statusCode,
-            ErrorCode = errorCode,
-            OriginErrorCode = originErrorCode,
-            Errors = errors,
-            Data = data
-        };
-    }
-}

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

@@ -1,276 +0,0 @@
-using System.Collections;
-using System.Reflection;
-using System.Text.Encodings.Web;
-using System.Text.Json;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ApiExplorer;
-using Microsoft.AspNetCore.Mvc.Controllers;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.DependencyInjection;
-using Yi.Framework.Core.Extensions;
-
-namespace Yi.Framework.AspNetCore.UnifyResult.Fiters;
-
-/// <summary>
-/// 规范化结构（请求成功）过滤器
-/// </summary>
-public class SucceededUnifyResultFilter : IAsyncActionFilter, IOrderedFilter
-{
-    /// <summary>
-    /// 过滤器排序
-    /// </summary>
-    private const int FilterOrder = 8888;
-
-    /// <summary>
-    /// 排序属性
-    /// </summary>
-    public int Order => FilterOrder;
-
-    /// <summary>
-    /// 处理规范化结果
-    /// </summary>
-    /// <param name="context"></param>
-    /// <param name="next"></param>
-    /// <returns></returns>
-    public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
-    {
-        // 执行 Action 并获取结果
-        var actionExecutedContext = await next();
-
-        // 排除 WebSocket 请求处理
-        if (actionExecutedContext.HttpContext.IsWebSocketRequest()) return;
-
-        // 处理已经含有状态码结果的 Result
-        if (actionExecutedContext.Result is IStatusCodeActionResult statusCodeResult &&
-            statusCodeResult.StatusCode != null)
-        {
-            // 小于 200 或者 大于 299 都不是成功值，直接跳过
-            if (statusCodeResult.StatusCode.Value < 200 || statusCodeResult.StatusCode.Value > 299)
-            {
-                // 处理规范化结果
-                if (!CheckStatusCodeNonUnify(context.HttpContext, out var unifyRes))
-                {
-                    var httpContext = context.HttpContext;
-                    var statusCode = statusCodeResult.StatusCode.Value;
-
-                    // 解决刷新 Token 时间和 Token 时间相近问题
-                    if (statusCodeResult.StatusCode.Value == StatusCodes.Status401Unauthorized
-                        && httpContext.Response.Headers.ContainsKey("access-token")
-                        && httpContext.Response.Headers.ContainsKey("x-access-token"))
-                    {
-                        httpContext.Response.StatusCode = statusCode = StatusCodes.Status403Forbidden;
-                    }
-
-                    // 如果 Response 已经完成输出，则禁止写入
-                    if (httpContext.Response.HasStarted) return;
-                    await unifyRes.OnResponseStatusCodes(httpContext, statusCode,
-                        httpContext.RequestServices.GetService<IOptions<UnifyResultSettingsOptions>>()?.Value);
-                }
-
-                return;
-            }
-        }
-
-        // 如果出现异常，则不会进入该过滤器
-        if (actionExecutedContext.Exception != null) return;
-
-        // 获取控制器信息
-        var actionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
-
-        // 判断是否支持 MVC 规范化处理，检测配置而已
-        // if (!UnifyContext.CheckSupportMvcController(context.HttpContext, actionDescriptor, out _)) return;
-
-        // 判断是否跳过规范化处理，检测NonUnifyAttribute而已
-        if (CheckSucceededNonUnify(actionDescriptor.MethodInfo))
-        {
-            return;
-        }
-        IUnifyResultProvider  unifyResult = context.GetRequiredService<IUnifyResultProvider>();
-        
-        // 处理 BadRequestObjectResult 类型规范化处理
-        if (actionExecutedContext.Result is BadRequestObjectResult badRequestObjectResult)
-        {
-            // 解析验证消息
-            var validationMetadata = GetValidationMetadata(badRequestObjectResult.Value);
-
-            var result = unifyResult.OnValidateFailed(context, validationMetadata);
-            if (result != null) actionExecutedContext.Result = result;
-        }
-        else
-        {
-            IActionResult result = default;
-
-            // 检查是否是有效的结果（可进行规范化的结果）
-            if (CheckVaildResult(actionExecutedContext.Result, out var data))
-            {
-                result = unifyResult.OnSucceeded(actionExecutedContext, data);
-            }
-
-            // 如果是不能规范化的结果类型，则跳过
-            if (result == null) return;
-
-            actionExecutedContext.Result = result;
-        }
-    }
-    
-        /// <summary>
-    /// 获取验证错误信息
-    /// </summary>
-    /// <param name="errors"></param>
-    /// <returns></returns>
-    private static ValidationMetadata GetValidationMetadata(object errors)
-    {
-        ModelStateDictionary _modelState = null;
-        object validationResults = null;
-        (string message, string firstErrorMessage, string firstErrorProperty) = (default, default, default);
-
-        // 判断是否是集合类型
-        if (errors is IEnumerable && errors is not string)
-        {
-            // 如果是模型验证字典类型
-            if (errors is ModelStateDictionary modelState)
-            {
-                _modelState = modelState;
-                // 将验证错误信息转换成字典并序列化成 Json
-                validationResults = modelState.Where(u => modelState[u.Key].ValidationState == ModelValidationState.Invalid)
-                        .ToDictionary(u => u.Key, u => modelState[u.Key].Errors.Select(c => c.ErrorMessage).ToArray());
-            }
-            // 如果是 ValidationProblemDetails 特殊类型
-            else if (errors is ValidationProblemDetails validation)
-            {
-                validationResults = validation.Errors
-                    .ToDictionary(u => u.Key, u => u.Value.ToArray());
-            }
-            // 如果是字典类型
-            else if (errors is Dictionary<string, string[]> dicResults)
-            {
-                validationResults = dicResults;
-            }
-
-            message = JsonSerializer.Serialize(validationResults, new JsonSerializerOptions
-            {
-                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-                WriteIndented = true
-            });
-            firstErrorMessage = (validationResults as Dictionary<string, string[]>).First().Value[0];
-            firstErrorProperty = (validationResults as Dictionary<string, string[]>).First().Key;
-        }
-        // 其他类型
-        else
-        {
-            validationResults = firstErrorMessage = message = errors?.ToString();
-        }
-
-        return new ValidationMetadata
-        {
-            ValidationResult = validationResults,
-            Message = message,
-            ModelState = _modelState,
-            FirstErrorProperty = firstErrorProperty,
-            FirstErrorMessage = firstErrorMessage
-        };
-    }
-        
-    /// <summary>
-    /// 检查是否是有效的结果（可进行规范化的结果）
-    /// </summary>
-    /// <param name="result"></param>
-    /// <param name="data"></param>
-    /// <returns></returns>
-    private bool CheckVaildResult(IActionResult result, out object data)
-    {
-        data = default;
-
-        // 排除以下结果，跳过规范化处理
-        var isDataResult = result switch
-        {
-            ViewResult => false,
-            PartialViewResult => false,
-            FileResult => false,
-            ChallengeResult => false,
-            SignInResult => false,
-            SignOutResult => false,
-            RedirectToPageResult => false,
-            RedirectToRouteResult => false,
-            RedirectResult => false,
-            RedirectToActionResult => false,
-            LocalRedirectResult => false,
-            ForbidResult => false,
-            ViewComponentResult => false,
-            PageResult => false,
-            NotFoundResult => false,
-            NotFoundObjectResult => false,
-            _ => true,
-        };
-
-        // 目前支持返回值 ActionResult
-        if (isDataResult) data = result switch
-        {
-            // 处理内容结果
-            ContentResult content => content.Content,
-            // 处理对象结果
-            ObjectResult obj => obj.Value,
-            // 处理 JSON 对象
-            JsonResult json => json.Value,
-            _ => null,
-        };
-
-        return isDataResult;
-    }
-    
-    
-    /// <summary>
-    /// 检查短路状态码（>=400）是否进行规范化处理
-    /// </summary>
-    /// <param name="context"></param>
-    /// <param name="unifyResult"></param>
-    /// <returns>返回 true 跳过处理，否则进行规范化处理</returns>
-    internal static bool CheckStatusCodeNonUnify(HttpContext context, out IUnifyResultProvider unifyResult)
-    {
-        // 获取终点路由特性
-        var endpointFeature = context.Features.Get<IEndpointFeature>();
-        if (endpointFeature == null) return (unifyResult = null) == null;
-
-        // 判断是否跳过规范化处理
-        var isSkip = context.GetEndpoint()?.Metadata?.GetMetadata<NonUnifyAttribute>()!= null
-                     || endpointFeature?.Endpoint?.Metadata?.GetMetadata<NonUnifyAttribute>() != null
-                     || context.Request.Headers["accept"].ToString().Contains("odata.metadata=", StringComparison.OrdinalIgnoreCase)
-                     || context.Request.Headers["accept"].ToString().Contains("odata.streaming=", StringComparison.OrdinalIgnoreCase);
-
-        if (isSkip == true) unifyResult = null;
-        else
-        {
-            unifyResult = context.RequestServices.GetRequiredService<IUnifyResultProvider>();
-        }
-
-        return unifyResult == null || isSkip;
-    }
-    
-    /// <summary>
-    /// 检查请求成功是否进行规范化处理
-    /// </summary>
-    /// <param name="method"></param>
-    /// <param name="isWebRequest"></param>
-    /// <returns>返回 true 跳过处理，否则进行规范化处理</returns>
-    private  bool CheckSucceededNonUnify(MethodInfo method, bool isWebRequest = true)
-    {
-        // 判断是否跳过规范化处理
-        var isSkip =  method.CustomAttributes.Any(x => typeof(NonUnifyAttribute).IsAssignableFrom(x.AttributeType) || typeof(ProducesResponseTypeAttribute).IsAssignableFrom(x.AttributeType) || typeof(IApiResponseMetadataProvider).IsAssignableFrom(x.AttributeType))
-                     || method.ReflectedType.IsDefined(typeof(NonUnifyAttribute), true)
-                     || method.DeclaringType.Assembly.GetName().Name.StartsWith("Microsoft.AspNetCore.OData");
-
-        if (!isWebRequest)
-        {
-            return isSkip;
-        }
-        return isSkip;
-    }
-}

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

@@ -1,58 +0,0 @@
-// MIT 许可证
-//
-// 版权 © 2020-present 百小僧, 百签科技（广东）有限公司 和所有贡献者
-//
-// 特此免费授予任何获得本软件副本和相关文档文件（下称“软件”）的人不受限制地处置该软件的权利，
-// 包括不受限制地使用、复制、修改、合并、发布、分发、转授许可和/或出售该软件副本，
-// 以及再授权被配发了本软件的人如上的权利，须在下列条件下：
-//
-// 上述版权声明和本许可声明应包含在该软件的所有副本或实质成分中。
-//
-// 本软件是“如此”提供的，没有任何形式的明示或暗示的保证，包括但不限于对适销性、特定用途的适用性和不侵权的保证。
-// 在任何情况下，作者或版权持有人都不对任何索赔、损害或其他责任负责，无论这些追责来自合同、侵权或其它行为中，
-// 还是产生于、源于或有关于本软件以及本软件的使用或其它处置。
-
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-
-namespace Yi.Framework.AspNetCore.UnifyResult;
-
-/// <summary>
-/// 规范化结果提供器
-/// </summary>
-public interface IUnifyResultProvider
-{
-    /// <summary>
-    /// 异常返回值
-    /// </summary>
-    /// <param name="context"></param>
-    /// <param name="metadata"></param>
-    /// <returns></returns>
-    IActionResult OnException(ExceptionContext context, ExceptionMetadata metadata);
-
-    /// <summary>
-    /// 成功返回值
-    /// </summary>
-    /// <param name="context"></param>
-    /// <param name="data"></param>
-    /// <returns></returns>
-    IActionResult OnSucceeded(ActionExecutedContext context, object data);
-
-    /// <summary>
-    /// 验证失败返回值
-    /// </summary>
-    /// <param name="context"></param>
-    /// <param name="metadata"></param>
-    /// <returns></returns>
-    IActionResult OnValidateFailed(ActionExecutingContext context, ValidationMetadata metadata);
-
-    /// <summary>
-    /// 拦截返回状态码
-    /// </summary>
-    /// <param name="context"></param>
-    /// <param name="statusCode"></param>
-    /// <param name="unifyResultSettings"></param>
-    /// <returns></returns>
-    Task OnResponseStatusCodes(HttpContext context, int statusCode, UnifyResultSettingsOptions unifyResultSettings = default);
-}

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

@@ -1,23 +0,0 @@
-// MIT 许可证
-//
-// 版权 © 2020-present 百小僧, 百签科技（广东）有限公司 和所有贡献者
-//
-// 特此免费授予任何获得本软件副本和相关文档文件（下称“软件”）的人不受限制地处置该软件的权利，
-// 包括不受限制地使用、复制、修改、合并、发布、分发、转授许可和/或出售该软件副本，
-// 以及再授权被配发了本软件的人如上的权利，须在下列条件下：
-//
-// 上述版权声明和本许可声明应包含在该软件的所有副本或实质成分中。
-//
-// 本软件是“如此”提供的，没有任何形式的明示或暗示的保证，包括但不限于对适销性、特定用途的适用性和不侵权的保证。
-// 在任何情况下，作者或版权持有人都不对任何索赔、损害或其他责任负责，无论这些追责来自合同、侵权或其它行为中，
-// 还是产生于、源于或有关于本软件以及本软件的使用或其它处置。
-
-namespace Yi.Framework.AspNetCore.UnifyResult;
-
-/// <summary>
-/// 禁止规范化处理
-/// </summary>
-[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
-public sealed class NonUnifyAttribute : Attribute
-{
-}

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/UnifyResult/Providers/RESTfulResultProvider.cs

@@ -1,136 +0,0 @@
-// MIT 许可证
-//
-// 版权 © 2020-present 百小僧, 百签科技（广东）有限公司 和所有贡献者
-//
-// 特此免费授予任何获得本软件副本和相关文档文件（下称“软件”）的人不受限制地处置该软件的权利，
-// 包括不受限制地使用、复制、修改、合并、发布、分发、转授许可和/或出售该软件副本，
-// 以及再授权被配发了本软件的人如上的权利，须在下列条件下：
-//
-// 上述版权声明和本许可声明应包含在该软件的所有副本或实质成分中。
-//
-// 本软件是“如此”提供的，没有任何形式的明示或暗示的保证，包括但不限于对适销性、特定用途的适用性和不侵权的保证。
-// 在任何情况下，作者或版权持有人都不对任何索赔、损害或其他责任负责，无论这些追责来自合同、侵权或其它行为中，
-// 还是产生于、源于或有关于本软件以及本软件的使用或其它处置。
-
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Volo.Abp.DependencyInjection;
-
-namespace Yi.Framework.AspNetCore.UnifyResult.Providers;
-
-/// <summary>
-/// RESTful 风格返回值
-/// </summary>
-[Dependency(TryRegister = true)]
-[ExposeServices(typeof(IUnifyResultProvider))]
-public class RESTfulResultProvider : IUnifyResultProvider,ITransientDependency
-{
-    /// <summary>
-    /// 设置响应状态码
-    /// </summary>
-    /// <param name="context"></param>
-    /// <param name="statusCode"></param>
-    /// <param name="unifyResultSettings"></param>
-    public  static void SetResponseStatusCodes(HttpContext context, int statusCode, UnifyResultSettingsOptions unifyResultSettings)
-    {
-        if (unifyResultSettings == null) return;
-
-        // 篡改响应状态码
-        if (unifyResultSettings.AdaptStatusCodes != null && unifyResultSettings.AdaptStatusCodes.Length > 0)
-        {
-            var adaptStatusCode = unifyResultSettings.AdaptStatusCodes.FirstOrDefault(u => u[0] == statusCode);
-            if (adaptStatusCode != null && adaptStatusCode.Length > 0 && adaptStatusCode[0] > 0)
-            {
-                context.Response.StatusCode = adaptStatusCode[1];
-                return;
-            }
-        }
-
-        // 如果为 null，则所有请求错误的状态码设置为 200
-        if (unifyResultSettings.Return200StatusCodes == null) context.Response.StatusCode = 200;
-        // 否则只有里面的才设置为 200
-        else if (unifyResultSettings.Return200StatusCodes.Contains(statusCode)) context.Response.StatusCode = 200;
-        else { }
-    }
-    
-    /// <summary>
-    /// 异常返回值
-    /// </summary>
-    /// <param name="context"></param>
-    /// <param name="metadata"></param>
-    /// <returns></returns>
-    public IActionResult OnException(ExceptionContext context, ExceptionMetadata metadata)
-    {
-        return new JsonResult(RESTfulResult(metadata.StatusCode, data: metadata.Data, errors: metadata.Errors));
-    }
-
-    /// <summary>
-    /// 成功返回值
-    /// </summary>
-    /// <param name="context"></param>
-    /// <param name="data"></param>
-    /// <returns></returns>
-    public IActionResult OnSucceeded(ActionExecutedContext context, object data)
-    {
-        return new JsonResult(RESTfulResult(StatusCodes.Status200OK, true, data));
-    }
-
-    /// <summary>
-    /// 验证失败/业务异常返回值
-    /// </summary>
-    /// <param name="context"></param>
-    /// <param name="metadata"></param>
-    /// <returns></returns>
-    public IActionResult OnValidateFailed(ActionExecutingContext context, ValidationMetadata metadata)
-    {
-        return new JsonResult(RESTfulResult(metadata.StatusCode ?? StatusCodes.Status400BadRequest, data: metadata.Data, errors: metadata.ValidationResult));
-    }
-
-    /// <summary>
-    /// 特定状态码返回值
-    /// </summary>
-    /// <param name="context"></param>
-    /// <param name="statusCode"></param>
-    /// <param name="unifyResultSettings"></param>
-    /// <returns></returns>
-    public async Task OnResponseStatusCodes(HttpContext context, int statusCode, UnifyResultSettingsOptions unifyResultSettings)
-    {
-        // 设置响应状态码
-        SetResponseStatusCodes(context, statusCode, unifyResultSettings);
-
-        switch (statusCode)
-        {
-            // 处理 401 状态码
-            case StatusCodes.Status401Unauthorized:
-                await context.Response.WriteAsJsonAsync(RESTfulResult(statusCode, errors: "401 Unauthorized"));
-                break;
-            // 处理 403 状态码
-            case StatusCodes.Status403Forbidden:
-                await context.Response.WriteAsJsonAsync(RESTfulResult(statusCode, errors: "403 Forbidden"));
-                break;
-
-            default: break;
-        }
-    }
-
-    /// <summary>
-    /// 返回 RESTful 风格结果集
-    /// </summary>
-    /// <param name="statusCode"></param>
-    /// <param name="succeeded"></param>
-    /// <param name="data"></param>
-    /// <param name="errors"></param>
-    /// <returns></returns>
-    public static RESTfulResult<object> RESTfulResult(int statusCode, bool succeeded = default, object data = default, object errors = default)
-    {
-        return new RESTfulResult<object>
-        {
-            StatusCode = statusCode,
-            Succeeded = succeeded,
-            Data = data,
-            Errors = errors,
-            Timestamp = DateTimeOffset.UtcNow.ToUnixTimeSeconds()
-        };
-    }
-}

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

@@ -1,52 +0,0 @@
-// MIT 许可证
-//
-// 版权 © 2020-present 百小僧, 百签科技（广东）有限公司 和所有贡献者
-//
-// 特此免费授予任何获得本软件副本和相关文档文件（下称“软件”）的人不受限制地处置该软件的权利，
-// 包括不受限制地使用、复制、修改、合并、发布、分发、转授许可和/或出售该软件副本，
-// 以及再授权被配发了本软件的人如上的权利，须在下列条件下：
-//
-// 上述版权声明和本许可声明应包含在该软件的所有副本或实质成分中。
-//
-// 本软件是“如此”提供的，没有任何形式的明示或暗示的保证，包括但不限于对适销性、特定用途的适用性和不侵权的保证。
-// 在任何情况下，作者或版权持有人都不对任何索赔、损害或其他责任负责，无论这些追责来自合同、侵权或其它行为中，
-// 还是产生于、源于或有关于本软件以及本软件的使用或其它处置。
-
-namespace Yi.Framework.AspNetCore.UnifyResult;
-
-/// <summary>
-/// RESTful 风格结果集
-/// </summary>
-/// <typeparam name="T"></typeparam>
-public class RESTfulResult<T>
-{
-    /// <summary>
-    /// 状态码
-    /// </summary>
-    public int? StatusCode { get; set; }
-
-    /// <summary>
-    /// 数据
-    /// </summary>
-    public T Data { get; set; }
-
-    /// <summary>
-    /// 执行成功
-    /// </summary>
-    public bool Succeeded { get; set; }
-
-    /// <summary>
-    /// 错误信息
-    /// </summary>
-    public object Errors { get; set; }
-
-    /// <summary>
-    /// 附加数据
-    /// </summary>
-    public object Extras { get; set; }
-
-    /// <summary>
-    /// 时间戳
-    /// </summary>
-    public long Timestamp { get; set; }
-}

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

@@ -1,29 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Swashbuckle.AspNetCore.SwaggerGen;
-using Volo.Abp.AspNetCore.Mvc.ExceptionHandling;
-using Yi.Framework.AspNetCore.UnifyResult.Fiters;
-
-namespace Yi.Framework.AspNetCore.UnifyResult;
-
-/// <summary>
-/// 规范化接口
-/// 由于太多人反应，想兼容一套类似furion的返回情况，200状态码包一层更符合国内习惯，既然如此，不如直接搬过来
-/// </summary>
-public static class UnifyResultExtensions
-{
-    public static IServiceCollection AddFurionUnifyResultApi(this IServiceCollection services)
-    {
-        //成功规范接口
-        services.AddTransient<SucceededUnifyResultFilter>();
-        //异常规范接口
-        services.AddTransient<FriendlyExceptionFilter>();
-        services.AddMvc(options =>
-        {
-            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/UnifyResult/UnifyResultSettingsOptions.cs

@@ -1,50 +0,0 @@
-// MIT 许可证
-//
-// 版权 © 2020-present 百小僧, 百签科技（广东）有限公司 和所有贡献者
-//
-// 特此免费授予任何获得本软件副本和相关文档文件（下称“软件”）的人不受限制地处置该软件的权利，
-// 包括不受限制地使用、复制、修改、合并、发布、分发、转授许可和/或出售该软件副本，
-// 以及再授权被配发了本软件的人如上的权利，须在下列条件下：
-//
-// 上述版权声明和本许可声明应包含在该软件的所有副本或实质成分中。
-//
-// 本软件是“如此”提供的，没有任何形式的明示或暗示的保证，包括但不限于对适销性、特定用途的适用性和不侵权的保证。
-// 在任何情况下，作者或版权持有人都不对任何索赔、损害或其他责任负责，无论这些追责来自合同、侵权或其它行为中，
-// 还是产生于、源于或有关于本软件以及本软件的使用或其它处置。
-
-using Microsoft.Extensions.Configuration;
-
-namespace Yi.Framework.AspNetCore.UnifyResult;
-
-/// <summary>
-/// 规范化配置选项
-/// </summary>
-public sealed class UnifyResultSettingsOptions 
-{
-    /// <summary>
-    /// 设置返回 200 状态码列表
-    /// <para>默认：401，403，如果设置为 null，则标识所有状态码都返回 200 </para>
-    /// </summary>
-    public int[] Return200StatusCodes { get; set; }
-
-    /// <summary>
-    /// 适配（篡改）Http 状态码（只支持短路状态码，比如 401，403，500 等）
-    /// </summary>
-    public int[][] AdaptStatusCodes { get; set; }
-
-    /// <summary>
-    /// 是否支持 MVC 控制台规范化处理
-    /// </summary>
-    public bool? SupportMvcController { get; set; }
-
-    /// <summary>
-    /// 选项后期配置
-    /// </summary>
-    /// <param name="options"></param>
-    /// <param name="configuration"></param>
-    public void PostConfigure(UnifyResultSettingsOptions options, IConfiguration configuration)
-    {
-        options.Return200StatusCodes ??= new[] { 401, 403 };
-        options.SupportMvcController ??= false;
-    }
-}

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

@@ -1,69 +0,0 @@
-// MIT 许可证
-//
-// 版权 © 2020-present 百小僧, 百签科技（广东）有限公司 和所有贡献者
-//
-// 特此免费授予任何获得本软件副本和相关文档文件（下称“软件”）的人不受限制地处置该软件的权利，
-// 包括不受限制地使用、复制、修改、合并、发布、分发、转授许可和/或出售该软件副本，
-// 以及再授权被配发了本软件的人如上的权利，须在下列条件下：
-//
-// 上述版权声明和本许可声明应包含在该软件的所有副本或实质成分中。
-//
-// 本软件是“如此”提供的，没有任何形式的明示或暗示的保证，包括但不限于对适销性、特定用途的适用性和不侵权的保证。
-// 在任何情况下，作者或版权持有人都不对任何索赔、损害或其他责任负责，无论这些追责来自合同、侵权或其它行为中，
-// 还是产生于、源于或有关于本软件以及本软件的使用或其它处置。
-
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-
-namespace Yi.Framework.AspNetCore.UnifyResult;
-
-/// <summary>
-/// 验证信息元数据
-/// </summary>
-public sealed class ValidationMetadata
-{
-    /// <summary>
-    /// 验证结果
-    /// </summary>
-    /// <remarks>返回字典或字符串类型</remarks>
-    public object ValidationResult { get; internal set; }
-
-    /// <summary>
-    /// 异常消息
-    /// </summary>
-    public string Message { get; internal set; }
-
-    /// <summary>
-    /// 验证状态
-    /// </summary>
-    public ModelStateDictionary ModelState { get; internal set; }
-
-    /// <summary>
-    /// 错误码
-    /// </summary>
-    public object ErrorCode { get; internal set; }
-
-    /// <summary>
-    /// 错误码（没被复写过的 ErrorCode ）
-    /// </summary>
-    public object OriginErrorCode { get; internal set; }
-
-    /// <summary>
-    /// 状态码
-    /// </summary>
-    public int? StatusCode { get; internal set; }
-
-    /// <summary>
-    /// 首个错误属性
-    /// </summary>
-    public string FirstErrorProperty { get; internal set; }
-
-    /// <summary>
-    /// 首个错误消息
-    /// </summary>
-    public string FirstErrorMessage { get; internal set; }
-
-    /// <summary>
-    /// 额外数据
-    /// </summary>
-    public object Data { get; internal set; }
-}

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

@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="..\..\common.props" />
-
-  <ItemGroup>
-    <Compile Remove="Cors\**" />
-    <EmbeddedResource Remove="Cors\**" />
-    <None Remove="Cors\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Json" Version="$(AbpVersion)" />
-    <PackageReference Include="Volo.Abp.Swashbuckle" Version="$(AbpVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Yi.Framework.Core\Yi.Framework.Core.csproj" />
-  </ItemGroup>
-
-</Project>

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

@@ -1,37 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Volo.Abp.AspNetCore.WebClientInfo;
-using Yi.Framework.AspNetCore.Microsoft.AspNetCore.Authentication;
-using Yi.Framework.Core;
-using Yi.Framework.Core.Authentication;
-
-namespace Yi.Framework.AspNetCore
-{
-    /// <summary>
-    /// Yi框架ASP.NET Core模块
-    /// </summary>
-    [DependsOn(typeof(YiFrameworkCoreModule))]
-    public class YiFrameworkAspNetCoreModule : AbpModule
-    {
-        /// <summary>
-        /// 配置服务后的处理
-        /// </summary>
-        public override void PostConfigureServices(ServiceConfigurationContext context)
-        {
-            var services = context.Services;
-
-            // 替换默认的WebClientInfoProvider为支持代理的实现
-            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/FreeSqlOptions.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using FreeRedis;
-
-namespace Yi.Framework.Caching.FreeRedis
-{
-    /// <summary>
-    /// 便于转到定义
-    /// </summary>
-    public class FreeSqlOptions: ConnectionStringBuilder
-    {
-
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.Caching.FreeRedis/Yi.Framework.Caching.FreeRedis.csproj

@@ -1,16 +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="FreeRedis" Version="1.2.14" />
-    <PackageReference Include="FreeRedis.DistributedCache" Version="1.2.5" />
-    <PackageReference Include="Volo.Abp.Caching" Version="$(AbpVersion)" />
-  </ItemGroup>
-
-</Project>

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

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

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

@@ -1,64 +0,0 @@
-using FreeRedis;
-using Microsoft.Extensions.Caching.Distributed;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Volo.Abp.Caching;
-
-namespace Yi.Framework.Caching.FreeRedis
-{
-    /// <summary>
-    /// FreeRedis缓存模块
-    /// 提供基于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是否启用
-            if (!IsRedisEnabled(configuration))
-            {
-                return;
-            }
-
-            // 注册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>(
-                new 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

@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-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

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

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

@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Yi.Framework.Core.Enums
-{
-    /// <summary>
-    /// 文件类型枚举
-    /// </summary>
-    /// <remarks>
-    /// 用于定义系统支持的文件类型分类
-    /// 主要用于文件上传和存储时的类型区分
-    /// </remarks>
-    public enum FileTypeEnum
-    {
-        /// <summary>
-        /// 普通文件
-        /// </summary>
-        file = 0,
-
-        /// <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

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

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

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

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

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-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>
-        NoPermission = 401,
-
-        /// <summary>
-        /// 访问被拒绝
-        /// </summary>
-        Denied = 403,
-
-        /// <summary>
-        /// 操作失败
-        /// </summary>
-        NotSuccess = 500
-    }
-}

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

@@ -1,134 +0,0 @@
-using System.Text;
-using System.Text.RegularExpressions;
-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="fileName">文件名</param>
-        public static void FileInlineHandle(this HttpContext httpContext, string fileName)
-        {
-            var encodeFilename = System.Web.HttpUtility.UrlEncode(fileName, Encoding.UTF8);
-            httpContext.Response.Headers.Add("Content-Disposition", $"inline;filename={encodeFilename}");
-        }
-
-        /// <summary>
-        /// 设置附件下载响应头
-        /// </summary>
-        /// <param name="httpContext">HTTP上下文</param>
-        /// <param name="fileName">文件名</param>
-        public static void FileAttachmentHandle(this HttpContext httpContext, string fileName)
-        {
-            var encodeFilename = System.Web.HttpUtility.UrlEncode(fileName, Encoding.UTF8);
-            httpContext.Response.Headers.Add("Content-Disposition", $"attachment;filename={encodeFilename}");
-        }
-
-        /// <summary>
-        /// 获取客户端首选语言
-        /// </summary>
-        /// <param name="httpContext">HTTP上下文</param>
-        /// <returns>语言代码,默认返回zh-CN</returns>
-        public static string GetLanguage(this HttpContext httpContext)
-        {
-            const string defaultLanguage = "zh-CN";
-            var acceptLanguage = httpContext.Request.Headers["Accept-Language"].FirstOrDefault();
-            
-            return string.IsNullOrEmpty(acceptLanguage) 
-                ? defaultLanguage 
-                : acceptLanguage.Split(',')[0];
-        }
-
-        /// <summary>
-        /// 判断是否为Ajax请求
-        /// </summary>
-        /// <param name="request">HTTP请求</param>
-        /// <returns>是否为Ajax请求</returns>
-        public static bool IsAjaxRequest(this HttpRequest request)
-        {
-            const string ajaxHeader = "XMLHttpRequest";
-            return ajaxHeader.Equals(request.Headers["X-Requested-With"], 
-                StringComparison.OrdinalIgnoreCase);
-        }
-
-        /// <summary>
-        /// 获取客户端IP地址
-        /// </summary>
-        /// <param name="context">HTTP上下文</param>
-        /// <returns>客户端IP地址</returns>
-        public static string GetClientIp(this HttpContext context)
-        {
-            const string localhost = "127.0.0.1";
-            if (context == null) return string.Empty;
-
-            // 尝试获取X-Forwarded-For头
-            var ip = context.Request.Headers["X-Forwarded-For"].FirstOrDefault();
-            
-            // 如果没有代理头,则获取远程IP
-            if (string.IsNullOrEmpty(ip))
-            {
-                ip = context.Connection.RemoteIpAddress?.ToString();
-            }
-
-            // 处理特殊IP
-            if (string.IsNullOrEmpty(ip) || ip.Contains("::1"))
-            {
-                return localhost;
-            }
-
-            // 清理IPv6格式
-            ip = ip.Replace("::ffff:", localhost);
-            
-            // 移除端口号
-            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>
-        /// <returns>User-Agent字符串</returns>
-        public static string GetUserAgent(this HttpContext context)
-        {
-            return context.Request.Headers["User-Agent"].ToString();
-        }
-
-        /// <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
-                .Where(x => x.Type == permissionsName)
-                .Select(x => x.Value)
-                .ToArray();
-        }
-        
-        /// <summary>
-        /// 判断是否为WebSocket请求
-        /// </summary>
-        /// <param name="context">HTTP上下文</param>
-        /// <returns>是否为WebSocket请求</returns>
-        public static bool IsWebSocketRequest(this HttpContext context)
-        {
-            return context.WebSockets.IsWebSocketRequest || 
-                   context.Request.Path == "/ws";
-        }
-    }
-}

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

@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Yi.Framework.Core.Helper
-{
-    public static class AssemblyHelper
-    {
-
-        /// <summary>
-        /// 此处统一获取程序集，排除微软内部相关
-        /// </summary>
-        /// <returns></returns>
-        public static Assembly[] GetAllLoadAssembly()
-        {
-            return AppDomain.CurrentDomain.GetAssemblies();
-        }
-
-        public static List<Assembly> GetReferanceAssemblies(this AppDomain domain)
-        {
-            var list = new List<Assembly>();
-            domain.GetAssemblies().ToList().ForEach(i =>
-            {
-                GetReferanceAssemblies(i, list);
-            });
-            return list;
-        }
-        private static void GetReferanceAssemblies(Assembly assembly, List<Assembly> list)
-        {
-            assembly.GetReferencedAssemblies().ToList().ForEach(i =>
-            {
-                var ass = Assembly.Load(i);
-                if (!list.Contains(ass))
-                {
-                    list.Add(ass);
-                    GetReferanceAssemblies(ass, list);
-                }
-            });
-        }
-
-        public static List<Type> GetClass(string assemblyFile, string? className = null, string? spaceName = null)
-        {
-            Assembly assembly = Assembly.Load(assemblyFile);
-            return assembly.GetTypes().Where(m => m.IsClass
-            && className == null ? true : m.Name == className
-            && spaceName == null ? true : m.Namespace == spaceName
-            && !m.Name.StartsWith("<>")
-             ).ToList();
-        }
-
-        public static List<Type> GetClassByParentClass(string assemblyFile, Type type)
-        {
-            Assembly assembly = Assembly.Load(assemblyFile);
-
-            List<Type> resList = new List<Type>();
-
-            List<Type> typeList = assembly.GetTypes().Where(m => m.IsClass).ToList();
-            foreach (var t in typeList)
-            {
-                var data = t.BaseType;
-                if (data == type)
-                {
-                    resList.Add(t);
-                }
-
-            }
-            return resList;
-        }
-
-
-        public static List<Type> GetClassByInterfaces(string assemblyFile, Type type)
-        {
-            Assembly assembly = Assembly.Load(assemblyFile);
-
-            List<Type> resList = new List<Type>();
-
-            List<Type> typeList = assembly.GetTypes().Where(m => m.IsClass).ToList();
-            foreach (var t in typeList)
-            {
-                var data = t.GetInterfaces();
-                if (data.Contains(type))
-                {
-                    resList.Add(t);
-                }
-
-            }
-            return resList;
-        }
-
-    }
-}

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

@@ -1,405 +0,0 @@
-using System.Runtime.InteropServices;
-using Newtonsoft.Json;
-
-namespace Yi.Framework.Core.Helper
-{
-    public class ComputerHelper
-    {
-
-        /// <summary>
-        /// 将object转换为long，若转换失败，则返回0。不抛出异常。  
-        /// </summary>
-        /// <param name="str"></param>
-        /// <returns></returns>
-        private static long ParseToLong( object obj)
-        {
-            try
-            {
-                return long.Parse(obj.ToString());
-            }
-            catch
-            {
-                return 0L;
-            }
-        }
-
-        /// <summary>
-        /// 将string转换为DateTime，若转换失败，则返回日期最小值。不抛出异常。  
-        /// </summary>
-        /// <param name="str"></param>
-        /// <returns></returns>
-        private static DateTime ParseToDateTime( string str)
-        {
-            try
-            {
-                if (string.IsNullOrWhiteSpace(str))
-                {
-                    return DateTime.MinValue;
-                }
-                if (str.Contains("-") || str.Contains("/"))
-                {
-                    return DateTime.Parse(str);
-                }
-                else
-                {
-                    int length = str.Length;
-                    switch (length)
-                    {
-                        case 4:
-                            return DateTime.ParseExact(str, "yyyy", System.Globalization.CultureInfo.CurrentCulture);
-                        case 6:
-                            return DateTime.ParseExact(str, "yyyyMM", System.Globalization.CultureInfo.CurrentCulture);
-                        case 8:
-                            return DateTime.ParseExact(str, "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture);
-                        case 10:
-                            return DateTime.ParseExact(str, "yyyyMMddHH", System.Globalization.CultureInfo.CurrentCulture);
-                        case 12:
-                            return DateTime.ParseExact(str, "yyyyMMddHHmm", System.Globalization.CultureInfo.CurrentCulture);
-                        case 14:
-                            return DateTime.ParseExact(str, "yyyyMMddHHmmss", System.Globalization.CultureInfo.CurrentCulture);
-                        default:
-                            return DateTime.ParseExact(str, "yyyyMMddHHmmss", System.Globalization.CultureInfo.CurrentCulture);
-                    }
-                }
-            }
-            catch
-            {
-                return DateTime.MinValue;
-            }
-        }
-        private static double ParseToDouble(object obj)
-        {
-            try
-            {
-                return double.Parse(obj.ToString());
-            }
-            catch
-            {
-                return 0;
-            }
-        }
-        /// <summary>
-        /// CPU使用情况
-        /// </summary>
-        /// <returns></returns>
-        public static CPUMetrics GetCPUMetrics()
-        {
-            CPUMetrics cpuMetrics = new CPUMetrics();
-           var cpudetail =  GetCPUDetails();
-            cpuMetrics.CoreTotal = cpudetail.Cores;
-            cpuMetrics.LogicalProcessors =cpudetail.LogicalProcessors;
-            cpuMetrics.CPURate = Math.Ceiling(ParseToDouble(GetCPURate()));
-            cpuMetrics.FreeRate = 1 - cpuMetrics.CPURate;
-            return cpuMetrics;
-        }
-        /// <summary>
-        /// 内存使用情况
-        /// </summary>
-        /// <returns></returns>
-        public static MemoryMetrics GetMemoryMetrics()
-        {
-            try
-            {
-                MemoryMetricsClient client = new();
-                MemoryMetrics memoryMetrics = IsUnix() ? client.GetUnixMetrics() : client.GetWindowsMetrics();
-
-                memoryMetrics.FreeRam = Math.Round(memoryMetrics.Free / 1024, 2) + "GB";
-                memoryMetrics.UsedRam = Math.Round(memoryMetrics.Used / 1024, 2) + "GB";
-                memoryMetrics.TotalRAM = Math.Round(memoryMetrics.Total / 1024, 2) + "GB";
-                memoryMetrics.RAMRate = Math.Ceiling(100 * memoryMetrics.Used / memoryMetrics.Total).ToString() + "%";
-  
-                return memoryMetrics;
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("获取内存使用出错，msg=" + ex.Message + "," + ex.StackTrace);
-            }
-            return new MemoryMetrics();
-        }
-
-        /// <summary>
-        /// 获取磁盘信息
-        /// </summary>
-        /// <returns></returns>
-        public static List<DiskInfo> GetDiskInfos()
-        {
-            List<DiskInfo> diskInfos = new();
-
-            if (IsUnix())
-            {
-                try
-                {
-                    string output = ShellHelper.Bash("df -m / | awk '{print $2,$3,$4,$5,$6}'");
-                    var arr = output.Split('\n', StringSplitOptions.RemoveEmptyEntries);
-                    if (arr.Length == 0) return diskInfos;
-
-                    var rootDisk = arr[1].Split(' ', (char)StringSplitOptions.RemoveEmptyEntries);
-                    if (rootDisk == null || rootDisk.Length == 0)
-                    {
-                        return diskInfos;
-                    }
-                    DiskInfo diskInfo = new()
-                    {
-                        DiskName = "/",
-                        TotalSize = long.Parse(rootDisk[0]) / 1024,
-                        Used = long.Parse(rootDisk[1]) / 1024,
-                        AvailableFreeSpace = long.Parse(rootDisk[2]) / 1024,
-                        AvailablePercent = decimal.Parse(rootDisk[3].Replace("%", ""))
-                    };
-                    diskInfos.Add(diskInfo);
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine("获取磁盘信息出错了" + ex.Message);
-                }
-            }
-            else
-            {
-                var driv = DriveInfo.GetDrives();
-                foreach (var item in driv)
-                {
-                    try
-                    {
-                        var obj = new DiskInfo()
-                        {
-                            DiskName = item.Name,
-                            TypeName = item.DriveType.ToString(),
-                            TotalSize = item.TotalSize / 1024 / 1024 / 1024,
-                            AvailableFreeSpace = item.AvailableFreeSpace / 1024 / 1024 / 1024,
-                        };
-                        obj.Used = obj.TotalSize - obj.AvailableFreeSpace;
-                        obj.AvailablePercent = decimal.Ceiling(obj.Used / (decimal)obj.TotalSize * 100);
-                        diskInfos.Add(obj);
-                    }
-                    catch (Exception ex)
-                    {
-                        Console.WriteLine("获取磁盘信息出错了" + ex.Message);
-                        continue;
-                    }
-                }
-            }
-
-            return diskInfos;
-        }
-
-        public static bool IsUnix()
-        {
-            var isUnix = RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
-            return isUnix;
-        }
-        
-        public static string GetCPURate()
-        {
-            string cpuRate;
-            if (IsUnix())
-            {
-                string output = ShellHelper.Bash("top -b -n1 | grep \"Cpu(s)\" | awk '{print $2 + $4}'");
-                cpuRate = output.Trim();
-            }
-            else
-            {
-                string output = ShellHelper.Cmd("wmic", "cpu get LoadPercentage");
-                cpuRate = output.Replace("LoadPercentage", string.Empty).Trim();
-            }
-            return cpuRate;
-        }
-
-        /// <summary>
-        /// 获取系统运行时间
-        /// </summary>
-        /// <returns></returns>
-        public static string GetRunTime()
-        {
-            string runTime = string.Empty;
-            try
-            {
-                if (IsUnix())
-                {
-                    string output = ShellHelper.Bash("uptime -s").Trim();
-                    runTime = DateTimeHelper.FormatTime(ParseToLong((DateTime.Now - ParseToDateTime(output)).TotalMilliseconds.ToString().Split('.')[0]));
-                }
-                else
-                {
-                    string output = ShellHelper.Cmd("wmic", "OS get LastBootUpTime/Value");
-                    string[] outputArr = output.Split('=', (char)StringSplitOptions.RemoveEmptyEntries);
-                    if (outputArr.Length == 2)
-                    {
-                        runTime = DateTimeHelper.FormatTime(ParseToLong((DateTime.Now - ParseToDateTime( outputArr[1].Split('.')[0])).TotalMilliseconds.ToString().Split('.')[0]));
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("获取runTime出错" + ex.Message);
-            }
-            return runTime;
-        }
-        
-
-
-        public static CPUInfo GetCPUDetails()
-        {
-            int logicalProcessors = 0;
-            int cores = 0;
-
-            if (IsUnix())
-            {
-                string logicalOutput = ShellHelper.Bash("lscpu | grep '^CPU(s):' | awk '{print $2}'");
-                logicalProcessors = int.Parse(logicalOutput.Trim());
-
-                string coresOutput = ShellHelper.Bash("lscpu | grep 'Core(s) per socket:' | awk '{print $4}'");
-                string socketsOutput = ShellHelper.Bash("lscpu | grep 'Socket(s):' | awk '{print $2}'");
-                cores = int.Parse(coresOutput.Trim()) * int.Parse(socketsOutput.Trim());
-            }
-            else
-            {
-                string output = ShellHelper.Cmd("wmic", "cpu get NumberOfCores,NumberOfLogicalProcessors /format:csv");
-                var lines = output.Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
-
-                if (lines.Length > 1)
-                {
-                    var values = lines[1].Split(',');
-                  
-                    cores =  int.Parse(values[1].Trim());
-                    logicalProcessors =int.Parse(values[2].Trim());
-                }
-            }
-
-            return new CPUInfo
-            {
-                LogicalProcessors = logicalProcessors,
-                Cores = cores
-            };
-        }
-    }
-    public class CPUInfo
-    {
-        public int LogicalProcessors { get; set; }
-        public int Cores { get; set; }
-    }
-    public class CPUMetrics
-    {
-        /// <summary>
-        /// 内核数
-        /// </summary>
-        public int CoreTotal { get; set; }
-        /// <summary>
-        /// 逻辑处理器数
-        /// </summary>
-        public int LogicalProcessors { get; set; }
-        /// <summary>
-        /// CPU使用率%
-        /// </summary>
-        public double CPURate { get; set; }
-        /// <summary>
-        /// CPU空闲率%
-        /// </summary>
-        public double FreeRate { get; set; }
-    }
-    
-    /// <summary>
-    /// 内存信息
-    /// </summary>
-    public class MemoryMetrics
-    {
-        [JsonIgnore]
-        public double Total { get; set; }
-        [JsonIgnore]
-        public double Used { get; set; }
-        [JsonIgnore]
-        public double Free { get; set; }
-
-        public string UsedRam { get; set; }
-   
-        /// <summary>
-        /// 总内存 GB
-        /// </summary>
-        public string TotalRAM { get; set; }
-        /// <summary>
-        /// 内存使用率 %
-        /// </summary>
-        public string RAMRate { get; set; }
-        /// <summary>
-        /// 空闲内存
-        /// </summary>
-        public string FreeRam { get; set; }
-    }
-
-    public class DiskInfo
-    {
-        /// <summary>
-        /// 磁盘名
-        /// </summary>
-        public string DiskName { get; set; }
-        public string TypeName { get; set; }
-        public long TotalFree { get; set; }
-        public long TotalSize { get; set; }
-        /// <summary>
-        /// 已使用
-        /// </summary>
-        public long Used { get; set; }
-        /// <summary>
-        /// 可使用
-        /// </summary>
-        public long AvailableFreeSpace { get; set; }
-        public decimal AvailablePercent { get; set; }
-    }
-
-    public class MemoryMetricsClient
-    {
-        #region 获取内存信息
-
-        /// <summary>
-        /// windows系统获取内存信息
-        /// </summary>
-        /// <returns></returns>
-        public MemoryMetrics GetWindowsMetrics()
-        {
-            string output = ShellHelper.Cmd("wmic", "OS get FreePhysicalMemory,TotalVisibleMemorySize /Value");
-            var metrics = new MemoryMetrics();
-            var lines = output.Trim().Split('\n', (char)StringSplitOptions.RemoveEmptyEntries);
-
-            if (lines.Length <= 0) return metrics;
-
-            var freeMemoryParts = lines[0].Split('=', (char)StringSplitOptions.RemoveEmptyEntries);
-            var totalMemoryParts = lines[1].Split('=', (char)StringSplitOptions.RemoveEmptyEntries);
-
-            metrics.Total = Math.Round(double.Parse(totalMemoryParts[1]) / 1024, 0);
-            metrics.Free = Math.Round(double.Parse(freeMemoryParts[1]) / 1024, 0);//m
-            metrics.Used = metrics.Total - metrics.Free;
-
-            return metrics;
-        }
-
-        /// <summary>
-        /// Unix系统获取
-        /// </summary>
-        /// <returns></returns>
-        public MemoryMetrics GetUnixMetrics()
-        {
-            string output = ShellHelper.Bash(@"
-# 从 /proc/meminfo 文件中提取总内存
- total_mem=$(cat /proc/meminfo | grep -i ""MemTotal"" | awk '{print $2}')
- # 从 /proc/meminfo 文件中提取剩余内存
-free_mem=$(cat /proc/meminfo | grep -i ""MemFree"" | awk '{print $2}')
-# 显示提取的信息
-echo $total_mem $used_mem $free_mem
- ");
-            var metrics = new MemoryMetrics();
- 
-            if (!string.IsNullOrWhiteSpace(output))
-            {
-                var memory = output.Split(' ', (char)StringSplitOptions.RemoveEmptyEntries);
-                if (memory.Length >= 2)
-                {
-                    metrics.Total =  Math.Round(double.Parse(memory[0]) / 1024, 0);
-               
-                    metrics.Free = Math.Round(double.Parse(memory[1])/ 1024, 0);//m
-                    metrics.Used =   metrics.Total   - metrics.Free;
-                }
-            }
-            return metrics;
-        }
-        #endregion
-    }
-}

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

@@ -1,139 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Yi.Framework.Core.Helper
-{
-    public class DateTimeHelper
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="dateTime"></param>
-        /// <returns></returns>
-        public static DateTime GetBeginTime(DateTime? dateTime, int days = 0)
-        {
-            if (dateTime == DateTime.MinValue || dateTime == null)
-            {
-                return DateTime.Now.AddDays(days);
-            }
-            return dateTime ?? DateTime.Now;
-        }
-        #region 时间戳转换
-
-        /// <summary>
-        ///  时间戳转本地时间-时间戳精确到秒
-        /// </summary> 
-        public static DateTime ToLocalTimeDateBySeconds(long unix)
-        {
-            var dto = DateTimeOffset.FromUnixTimeSeconds(unix);
-            return dto.ToLocalTime().DateTime;
-        }
-
-        /// <summary>
-        ///  时间转时间戳Unix-时间戳精确到秒
-        /// </summary> 
-        public static long ToUnixTimestampBySeconds(DateTime dt)
-        {
-            DateTimeOffset dto = new DateTimeOffset(dt);
-            return dto.ToUnixTimeSeconds();
-        }
-
-        /// <summary>
-        ///  时间戳转本地时间-时间戳精确到毫秒
-        /// </summary> 
-        public static DateTime ToLocalTimeDateByMilliseconds(long unix)
-        {
-            var dto = DateTimeOffset.FromUnixTimeMilliseconds(unix);
-            return dto.ToLocalTime().DateTime;
-        }
-
-        /// <summary>
-        ///  时间转时间戳Unix-时间戳精确到毫秒
-        /// </summary> 
-        public static long ToUnixTimestampByMilliseconds(DateTime dt)
-        {
-            DateTimeOffset dto = new DateTimeOffset(dt);
-            return dto.ToUnixTimeMilliseconds();
-        }
-
-        #endregion
-
-        #region 毫秒转天时分秒
-        /// <summary>
-        /// 毫秒转天时分秒
-        /// </summary>
-        /// <param name="ms"></param>
-        /// <returns></returns>
-        public static string FormatTime(long ms)
-        {
-            int ss = 1000;
-            int mi = ss * 60;
-            int hh = mi * 60;
-            int dd = hh * 24;
-
-            long day = ms / dd;
-            long hour = (ms - day * dd) / hh;
-            long minute = (ms - day * dd - hour * hh) / mi;
-            long second = (ms - day * dd - hour * hh - minute * mi) / ss;
-            long milliSecond = ms - day * dd - hour * hh - minute * mi - second * ss;
-
-            string sDay = day < 10 ? "0" + day : "" + day; //天
-            string sHour = hour < 10 ? "0" + hour : "" + hour;//小时
-            string sMinute = minute < 10 ? "0" + minute : "" + minute;//分钟
-            string sSecond = second < 10 ? "0" + second : "" + second;//秒
-            string sMilliSecond = milliSecond < 10 ? "0" + milliSecond : "" + milliSecond;//毫秒
-            sMilliSecond = milliSecond < 100 ? "0" + sMilliSecond : "" + sMilliSecond;
-
-            return string.Format("{0} 天 {1} 小时 {2} 分 {3} 秒", sDay, sHour, sMinute, sSecond);
-        }
-        #endregion
-
-        #region 获取unix时间戳
-        /// <summary>
-        /// 获取unix时间戳
-        /// </summary>
-        /// <param name="dt"></param>
-        /// <returns></returns>
-        public static long GetUnixTimeStamp(DateTime dt)
-        {
-            long unixTime = ((DateTimeOffset)dt).ToUnixTimeMilliseconds();
-            return unixTime;
-        }
-        #endregion
-
-        #region 获取日期天的最小时间
-        public static DateTime GetDayMinDate(DateTime dt)
-        {
-            DateTime min = new DateTime(dt.Year, dt.Month, dt.Day, 0, 0, 0);
-            return min;
-        }
-        #endregion
-
-        #region 获取日期天的最大时间
-        public static DateTime GetDayMaxDate(DateTime dt)
-        {
-            DateTime max = new DateTime(dt.Year, dt.Month, dt.Day, 23, 59, 59);
-            return max;
-        }
-        #endregion
-
-        #region 获取日期天的最大时间
-        public static string FormatDateTime(DateTime? dt)
-        {
-            if (dt != null)
-            {
-                if (dt.Value.Year == DateTime.Now.Year)
-                {
-                    return dt.Value.ToString("MM-dd HH:mm");
-                }
-                else
-                {
-                    return dt.Value.ToString("yyyy-MM-dd HH:mm");
-                }
-            }
-            return string.Empty;
-        }
-        #endregion
-    }
-}

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

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Yi.Framework.Core.Helper
-{
-    public static class EnumHelper
-    {
-        public static New EnumToEnum<New>(this object oldEnum)
-        {
-            if (oldEnum is null)
-            {
-                throw new ArgumentNullException(nameof(oldEnum));
-            }
-            return (New)Enum.ToObject(typeof(New), oldEnum.GetHashCode());
-        }
-
-        public static TEnum StringToEnum<TEnum>(this string str)
-        {
-            return (TEnum)Enum.Parse(typeof(TEnum), str);
-        }
-    }
-}

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

@@ -1,98 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Yi.Framework.Core.Helper
-{
-    public static class ExpressionHelper
-    {
-
-
-        /// <summary>
-        /// Expression表达式树lambda参数拼接组合
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="first"></param>
-        /// <param name="second"></param>
-        /// <param name="merge"></param>
-        /// <returns></returns>
-        public static Expression<T> Compose<T>(this Expression<T> first, Expression<T> second, Func<Expression, Expression, Expression> merge)
-        {
-            var parameterMap = first.Parameters.Select((f, i) => new { f, s = second.Parameters[i] }).ToDictionary(p => p.s, p => p.f);
-            var secondBody = LambdaParameteRebinder.ReplaceParameter(parameterMap, second.Body);
-            return Expression.Lambda<T>(merge(first.Body, secondBody), first.Parameters);
-        }
-
-        /// <summary>
-        /// Expression表达式树lambda参数拼接--false
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
-        public static Expression<Func<T, bool>> False<T>() => f => false;
-
-        /// <summary>
-        /// Expression表达式树lambda参数拼接-true
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
-        public static Expression<Func<T, bool>> True<T>() => f => true;
-
-        /// <summary>
-        /// Expression表达式树lambda参数拼接--and
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="first"></param>
-        /// <param name="second"></param>
-        /// <returns></returns>
-        public static Expression<Func<T, bool>> And<T>(this Expression<Func<T, bool>> first, Expression<Func<T, bool>> second) => first.Compose(second, Expression.And);
-
-        /// <summary>
-        /// Expression表达式树lambda参数拼接--or
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="first"></param>
-        /// <param name="second"></param>
-        /// <returns></returns>
-        public static Expression<Func<T, bool>> Or<T>(this Expression<Func<T, bool>> first, Expression<Func<T, bool>> second) => first.Compose(second, Expression.Or);
-    }
-
-    public class LambdaParameteRebinder : ExpressionVisitor
-    {
-        /// <summary>
-        /// 存放表达式树的参数的字典
-        /// </summary>
-        private readonly Dictionary<ParameterExpression, ParameterExpression> map;
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        /// <param name="map"></param>
-        public LambdaParameteRebinder(Dictionary<ParameterExpression, ParameterExpression> map)
-        {
-            this.map = map ?? new Dictionary<ParameterExpression, ParameterExpression>();
-        }
-
-        /// <summary>
-        /// 重载参数访问的方法，访问表达式树参数，如果字典中包含，则取出
-        /// </summary>
-        /// <param name="node">表达式树参数</param>
-        /// <returns></returns>
-        protected override Expression VisitParameter(ParameterExpression node)
-        {
-            if (map.TryGetValue(node, out ParameterExpression expression))
-            {
-                node = expression;
-            }
-            return base.VisitParameter(node);
-        }
-
-        public static Expression ReplaceParameter(Dictionary<ParameterExpression, ParameterExpression> map, Expression exp)
-        {
-            return new LambdaParameteRebinder(map).Visit(exp);
-        }
-    }
-
-}

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

@@ -1,122 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Mime;
-using System.Text;
-using System.Text.Json;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-
-namespace Yi.Framework.Core.Helper
-{
-    public static class HttpHelper
-    {
-
-        public static HttpClient Client { get; set; } = new HttpClient();
-
-        public static async Task<string> Get(string url)
-        {
-            return await Client.GetStringAsync(url);
-        }
-
-        public static async Task<Stream> GetIO(string url)
-        {
-            return await Client.GetStreamAsync(url);
-        }
-
-
-        public static async Task<string> Post(string url, object? item = null, Dictionary<string, string>? head = null)
-        {
-
-            using StringContent json = new(JsonSerializer.Serialize(item), Encoding.UTF8, MediaTypeNames.Application.Json);
-
-
-            if (head is not null)
-            {
-                foreach (var d in head)
-                {
-                    json.Headers.Add(d.Key, d.Value);
-                }
-            }
-
-            var httpResponse = await Client.PostAsync(url, json);
-
-            httpResponse.EnsureSuccessStatusCode();
-
-            var content = httpResponse.Content;
-
-            return await content.ReadAsStringAsync();
-        }
-
-
-        //        public static string HttpGet(string Url, string postDataStr="")
-        //        {
-        //#pragma warning disable SYSLIB0014 // 类型或成员已过时
-        //            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(Url + (postDataStr == "" ? "" : "?") + postDataStr);
-        //#pragma warning restore SYSLIB0014 // 类型或成员已过时
-        //            request.Method = "GET";
-        //            request.ContentType = "text/html;charset=UTF-8";
-
-        //            HttpWebResponse response = (HttpWebResponse)request.GetResponse();
-        //            Stream myResponseStream = response.GetResponseStream();
-        //            StreamReader myStreamReader = new StreamReader(myResponseStream, Encoding.GetEncoding("utf-8"));
-        //            string retString = myStreamReader.ReadToEnd();
-        //            myStreamReader.Close();
-        //            myResponseStream.Close();
-
-        //            return retString;
-        //        }
-
-        //        public static bool HttpIOGet(string Url, string file, string postDataStr="")
-        //        {
-        //            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(Url + (postDataStr == "" ? "" : "?") + postDataStr);
-        //            request.Method = "GET";
-        //            request.ContentType = "text/html;charset=UTF-8";
-
-        //            HttpWebResponse response = (HttpWebResponse)request.GetResponse();
-        //            Stream myResponseStream = response.GetResponseStream();
-        //            FileStream writer = new FileStream(file, FileMode.OpenOrCreate, FileAccess.Write);
-        //            byte[] buffer = new byte[1024];
-        //            int c;
-        //            while ((c = myResponseStream.Read(buffer, 0, buffer.Length)) > 0)
-        //            {
-        //                writer.Write(buffer, 0, c);
-        //            }
-        //            writer.Close();
-        //            myResponseStream.Close();
-
-        //            return true;
-        //        }
-
-        //        public static string HttpPost(string Url, string postDataStr="")
-        //        {
-        //            CookieContainer cookie = new CookieContainer();
-        //#pragma warning disable SYSLIB0014 // 类型或成员已过时
-        //            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(Url);
-        //#pragma warning restore SYSLIB0014 // 类型或成员已过时
-        //            request.Method = "POST";
-        //            request.ContentType = "application/x-www-form-urlencoded";
-        //            request.ContentLength = Encoding.UTF8.GetByteCount(postDataStr);
-        //            request.CookieContainer = cookie;
-
-        //            Stream myRequestStream = request.GetRequestStream();
-        //            StreamWriter myStreamWriter = new StreamWriter(myRequestStream, Encoding.GetEncoding("gb2312"));
-        //            myStreamWriter.Write(postDataStr);
-        //            myStreamWriter.Close();
-
-        //            HttpWebResponse response = (HttpWebResponse)request.GetResponse();
-
-        //            response.Cookies = cookie.GetCookies(response.ResponseUri);
-        //            Stream myResponseStream = response.GetResponseStream();
-        //            StreamReader myStreamReader = new StreamReader(myResponseStream, Encoding.GetEncoding("utf-8"));
-        //            string retString = myStreamReader.ReadToEnd();
-        //            myStreamReader.Close();
-        //            myResponseStream.Close();
-
-        //            return retString;
-        //        }
-    }
-}

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

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Yi.Framework.Core.Helper
-{
-    public static class IdHelper
-    {
-        public static dynamic[] ToDynamicArray(this IEnumerable<long> ids)
-        {
-            return ids.Select(id => (dynamic)id).ToArray();
-        }
-    }
-}

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

@@ -1,260 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Yi.Framework.Core.Enums;
-
-namespace Yi.Framework.Core.Helper
-{
-    public static class MimeHelper
-    {
-        // 通过自己定义一个静态类
-        // 将所有的Content Type都扔进去吧
-        // 调用的时候直接调用静态方法即可。
-
-        public static List<string> ImageType { get; set; } = new List<string>
-        {
-            ".jpg",".png",".jpeg"
-        };
-
-        private static Hashtable _mimeMappingTable;
-
-        private static void AddMimeMapping(string extension, string MimeType)
-        {
-            _mimeMappingTable.Add(extension, MimeType);
-        }
-
-        public static string GetMimeMapping(string FileName)
-        {
-            string text = null!;
-            int num = FileName.LastIndexOf('.');
-            if (0 < num && num > FileName.LastIndexOf('\\'))
-            {
-                text = (string)_mimeMappingTable[FileName.Substring(num)]!;
-            }
-            if (text == null)
-            {
-                text = (string)_mimeMappingTable[".*"]!;
-            }
-            return text;
-        }
-
-        public static FileTypeEnum GetFileType(string fileName)
-        {
-            var extension = Path.GetExtension(fileName);
-            if (ImageType.Contains(extension.ToLower()))
-                return FileTypeEnum.image;
-            return FileTypeEnum.file;
-
-
-        }
-
-        static MimeHelper()
-        {
-            _mimeMappingTable = new Hashtable(190, StringComparer.CurrentCultureIgnoreCase);
-            AddMimeMapping(".323", "text/h323");
-            AddMimeMapping(".asx", "video/x-ms-asf");
-            AddMimeMapping(".acx", "application/internet-property-stream");
-            AddMimeMapping(".ai", "application/postscript");
-            AddMimeMapping(".aif", "audio/x-aiff");
-            AddMimeMapping(".aiff", "audio/aiff");
-            AddMimeMapping(".axs", "application/olescript");
-            AddMimeMapping(".aifc", "audio/aiff");
-            AddMimeMapping(".asr", "video/x-ms-asf");
-            AddMimeMapping(".avi", "video/x-msvideo");
-            AddMimeMapping(".asf", "video/x-ms-asf");
-            AddMimeMapping(".au", "audio/basic");
-            AddMimeMapping(".application", "application/x-ms-application");
-            AddMimeMapping(".bin", "application/octet-stream");
-            AddMimeMapping(".bas", "text/plain");
-            AddMimeMapping(".bcpio", "application/x-bcpio");
-            AddMimeMapping(".bmp", "image/bmp");
-            AddMimeMapping(".cdf", "application/x-cdf");
-            AddMimeMapping(".cat", "application/vndms-pkiseccat");
-            AddMimeMapping(".crt", "application/x-x509-ca-cert");
-            AddMimeMapping(".c", "text/plain");
-            AddMimeMapping(".css", "text/css");
-            AddMimeMapping(".cer", "application/x-x509-ca-cert");
-            AddMimeMapping(".crl", "application/pkix-crl");
-            AddMimeMapping(".cmx", "image/x-cmx");
-            AddMimeMapping(".csh", "application/x-csh");
-            AddMimeMapping(".cod", "image/cis-cod");
-            AddMimeMapping(".cpio", "application/x-cpio");
-            AddMimeMapping(".clp", "application/x-msclip");
-            AddMimeMapping(".crd", "application/x-mscardfile");
-            AddMimeMapping(".deploy", "application/octet-stream");
-            AddMimeMapping(".dll", "application/x-msdownload");
-            AddMimeMapping(".dot", "application/msword");
-            AddMimeMapping(".doc", "application/msword");
-            AddMimeMapping(".dvi", "application/x-dvi");
-            AddMimeMapping(".dir", "application/x-director");
-            AddMimeMapping(".dxr", "application/x-director");
-            AddMimeMapping(".der", "application/x-x509-ca-cert");
-            AddMimeMapping(".dib", "image/bmp");
-            AddMimeMapping(".dcr", "application/x-director");
-            AddMimeMapping(".disco", "text/xml");
-            AddMimeMapping(".exe", "application/octet-stream");
-            AddMimeMapping(".etx", "text/x-setext");
-            AddMimeMapping(".evy", "application/envoy");
-            AddMimeMapping(".eml", "message/rfc822");
-            AddMimeMapping(".eps", "application/postscript");
-            AddMimeMapping(".flr", "x-world/x-vrml");
-            AddMimeMapping(".fif", "application/fractals");
-            AddMimeMapping(".gtar", "application/x-gtar");
-            AddMimeMapping(".gif", "image/gif");
-            AddMimeMapping(".gz", "application/x-gzip");
-            AddMimeMapping(".hta", "application/hta");
-            AddMimeMapping(".htc", "text/x-component");
-            AddMimeMapping(".htt", "text/webviewhtml");
-            AddMimeMapping(".h", "text/plain");
-            AddMimeMapping(".hdf", "application/x-hdf");
-            AddMimeMapping(".hlp", "application/winhlp");
-            AddMimeMapping(".html", "text/html");
-            AddMimeMapping(".htm", "text/html");
-            AddMimeMapping(".hqx", "application/mac-binhex40");
-            AddMimeMapping(".isp", "application/x-internet-signup");
-            AddMimeMapping(".iii", "application/x-iphone");
-            AddMimeMapping(".ief", "image/ief");
-            AddMimeMapping(".ivf", "video/x-ivf");
-            AddMimeMapping(".ins", "application/x-internet-signup");
-            AddMimeMapping(".ico", "image/x-icon");
-            AddMimeMapping(".jpg", "image/jpeg");
-            AddMimeMapping(".jfif", "image/pjpeg");
-            AddMimeMapping(".jpe", "image/jpeg");
-            AddMimeMapping(".jpeg", "image/jpeg");
-            AddMimeMapping(".js", "application/x-javascript");
-            AddMimeMapping(".lsx", "video/x-la-asf");
-            AddMimeMapping(".latex", "application/x-latex");
-            AddMimeMapping(".lsf", "video/x-la-asf");
-            AddMimeMapping(".manifest", "application/x-ms-manifest");
-            AddMimeMapping(".mhtml", "message/rfc822");
-            AddMimeMapping(".mny", "application/x-msmoney");
-            AddMimeMapping(".mht", "message/rfc822");
-            AddMimeMapping(".mid", "audio/mid");
-            AddMimeMapping(".mpv2", "video/mpeg");
-            AddMimeMapping(".man", "application/x-troff-man");
-            AddMimeMapping(".mvb", "application/x-msmediaview");
-            AddMimeMapping(".mpeg", "video/mpeg");
-            AddMimeMapping(".m3u", "audio/x-mpegurl");
-            AddMimeMapping(".mdb", "application/x-msaccess");
-            AddMimeMapping(".mpp", "application/vnd.ms-project");
-            AddMimeMapping(".m1v", "video/mpeg");
-            AddMimeMapping(".mpa", "video/mpeg");
-            AddMimeMapping(".me", "application/x-troff-me");
-            AddMimeMapping(".m13", "application/x-msmediaview");
-            AddMimeMapping(".movie", "video/x-sgi-movie");
-            AddMimeMapping(".m14", "application/x-msmediaview");
-            AddMimeMapping(".mpe", "video/mpeg");
-            AddMimeMapping(".mp2", "video/mpeg");
-            AddMimeMapping(".mov", "video/quicktime");
-            AddMimeMapping(".mp3", "audio/mpeg");
-            AddMimeMapping(".mpg", "video/mpeg");
-            AddMimeMapping(".ms", "application/x-troff-ms");
-            AddMimeMapping(".nc", "application/x-netcdf");
-            AddMimeMapping(".nws", "message/rfc822");
-            AddMimeMapping(".oda", "application/oda");
-            AddMimeMapping(".ods", "application/oleobject");
-            AddMimeMapping(".pmc", "application/x-perfmon");
-            AddMimeMapping(".p7r", "application/x-pkcs7-certreqresp");
-            AddMimeMapping(".p7b", "application/x-pkcs7-certificates");
-            AddMimeMapping(".p7s", "application/pkcs7-signature");
-            AddMimeMapping(".pmw", "application/x-perfmon");
-            AddMimeMapping(".ps", "application/postscript");
-            AddMimeMapping(".p7c", "application/pkcs7-mime");
-            AddMimeMapping(".pbm", "image/x-portable-bitmap");
-            AddMimeMapping(".ppm", "image/x-portable-pixmap");
-            AddMimeMapping(".pub", "application/x-mspublisher");
-            AddMimeMapping(".pnm", "image/x-portable-anymap");
-            AddMimeMapping(".png", "image/png");
-            AddMimeMapping(".pml", "application/x-perfmon");
-            AddMimeMapping(".p10", "application/pkcs10");
-            AddMimeMapping(".pfx", "application/x-pkcs12");
-            AddMimeMapping(".p12", "application/x-pkcs12");
-            AddMimeMapping(".pdf", "application/pdf");
-            AddMimeMapping(".pps", "application/vnd.ms-powerpoint");
-            AddMimeMapping(".p7m", "application/pkcs7-mime");
-            AddMimeMapping(".pko", "application/vndms-pkipko");
-            AddMimeMapping(".ppt", "application/vnd.ms-powerpoint");
-            AddMimeMapping(".pmr", "application/x-perfmon");
-            AddMimeMapping(".pma", "application/x-perfmon");
-            AddMimeMapping(".pot", "application/vnd.ms-powerpoint");
-            AddMimeMapping(".prf", "application/pics-rules");
-            AddMimeMapping(".pgm", "image/x-portable-graymap");
-            AddMimeMapping(".qt", "video/quicktime");
-            AddMimeMapping(".ra", "audio/x-pn-realaudio");
-            AddMimeMapping(".rgb", "image/x-rgb");
-            AddMimeMapping(".ram", "audio/x-pn-realaudio");
-            AddMimeMapping(".rmi", "audio/mid");
-            AddMimeMapping(".ras", "image/x-cmu-raster");
-            AddMimeMapping(".roff", "application/x-troff");
-            AddMimeMapping(".rtf", "application/rtf");
-            AddMimeMapping(".rtx", "text/richtext");
-            AddMimeMapping(".sv4crc", "application/x-sv4crc");
-            AddMimeMapping(".spc", "application/x-pkcs7-certificates");
-            AddMimeMapping(".setreg", "application/set-registration-initiation");
-            AddMimeMapping(".snd", "audio/basic");
-            AddMimeMapping(".stl", "application/vndms-pkistl");
-            AddMimeMapping(".setpay", "application/set-payment-initiation");
-            AddMimeMapping(".stm", "text/html");
-            AddMimeMapping(".shar", "application/x-shar");
-            AddMimeMapping(".sh", "application/x-sh");
-            AddMimeMapping(".sit", "application/x-stuffit");
-            AddMimeMapping(".spl", "application/futuresplash");
-            AddMimeMapping(".sct", "text/scriptlet");
-            AddMimeMapping(".scd", "application/x-msschedule");
-            AddMimeMapping(".sst", "application/vndms-pkicertstore");
-            AddMimeMapping(".src", "application/x-wais-source");
-            AddMimeMapping(".sv4cpio", "application/x-sv4cpio");
-            AddMimeMapping(".tex", "application/x-tex");
-            AddMimeMapping(".tgz", "application/x-compressed");
-            AddMimeMapping(".t", "application/x-troff");
-            AddMimeMapping(".tar", "application/x-tar");
-            AddMimeMapping(".tr", "application/x-troff");
-            AddMimeMapping(".tif", "image/tiff");
-            AddMimeMapping(".txt", "text/plain");
-            AddMimeMapping(".texinfo", "application/x-texinfo");
-            AddMimeMapping(".trm", "application/x-msterminal");
-            AddMimeMapping(".tiff", "image/tiff");
-            AddMimeMapping(".tcl", "application/x-tcl");
-            AddMimeMapping(".texi", "application/x-texinfo");
-            AddMimeMapping(".tsv", "text/tab-separated-values");
-            AddMimeMapping(".ustar", "application/x-ustar");
-            AddMimeMapping(".uls", "text/iuls");
-            AddMimeMapping(".vcf", "text/x-vcard");
-            AddMimeMapping(".wps", "application/vnd.ms-works");
-            AddMimeMapping(".wav", "audio/wav");
-            AddMimeMapping(".wrz", "x-world/x-vrml");
-            AddMimeMapping(".wri", "application/x-mswrite");
-            AddMimeMapping(".wks", "application/vnd.ms-works");
-            AddMimeMapping(".wmf", "application/x-msmetafile");
-            AddMimeMapping(".wcm", "application/vnd.ms-works");
-            AddMimeMapping(".wrl", "x-world/x-vrml");
-            AddMimeMapping(".wdb", "application/vnd.ms-works");
-            AddMimeMapping(".wsdl", "text/xml");
-            AddMimeMapping(".xap", "application/x-silverlight-app");
-            AddMimeMapping(".xml", "text/xml");
-            AddMimeMapping(".xlm", "application/vnd.ms-excel");
-            AddMimeMapping(".xaf", "x-world/x-vrml");
-            AddMimeMapping(".xla", "application/vnd.ms-excel");
-            AddMimeMapping(".xls", "application/vnd.ms-excel");
-            AddMimeMapping(".xlsx", "application/vnd.ms-excel");
-            AddMimeMapping(".xof", "x-world/x-vrml");
-            AddMimeMapping(".xlt", "application/vnd.ms-excel");
-            AddMimeMapping(".xlc", "application/vnd.ms-excel");
-            AddMimeMapping(".xsl", "text/xml");
-            AddMimeMapping(".xbm", "image/x-xbitmap");
-            AddMimeMapping(".xlw", "application/vnd.ms-excel");
-            AddMimeMapping(".xpm", "image/x-xpixmap");
-            AddMimeMapping(".xwd", "image/x-xwindowdump");
-            AddMimeMapping(".xsd", "text/xml");
-            AddMimeMapping(".z", "application/x-compress");
-            AddMimeMapping(".zip", "application/x-zip-compressed");
-            AddMimeMapping(".*", "application/octet-stream");
-        }
-    }
-
-
-
-}

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

@@ -1,390 +0,0 @@
-using System;
-using System.IO;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace Yi.Framework.Core.Helper
-{
-    /// <summary>
-    /// RSA加解密 使用OpenSSL的公钥加密/私钥解密 
-    /// 公私钥请使用openssl生成
-    /// </summary>
-    public class RSAHelper
-    {
-        public readonly RSA? _privateKeyRsaProvider;
-        public readonly RSA? _publicKeyRsaProvider;
-        private readonly HashAlgorithmName _hashAlgorithmName;
-        private readonly Encoding _encoding;
-
-        /// <summary>
-        /// 实例化RSAHelper
-        /// </summary>
-        /// <param name="rsaType">加密算法类型 RSA SHA1;RSA2 SHA256 密钥长度至少为2048</param>
-        /// <param name="encoding">编码类型</param>
-        /// <param name="privateKey">私钥</param>
-        /// <param name="publicKey">公钥</param>
-        public RSAHelper(RSAType rsaType, Encoding encoding, string privateKey, string? publicKey = null)
-        {
-            _encoding = encoding;
-            if (!string.IsNullOrEmpty(privateKey))
-            {
-                _privateKeyRsaProvider = CreateRsaProviderFromPrivateKey(privateKey);
-            }
-
-            if (!string.IsNullOrEmpty(publicKey))
-            {
-                _publicKeyRsaProvider = CreateRsaProviderFromPublicKey(publicKey);
-            }
-
-            _hashAlgorithmName = rsaType == RSAType.RSA ? HashAlgorithmName.SHA1 : HashAlgorithmName.SHA256;
-        }
-
-        #region 使用私钥签名
-
-        /// <summary>
-        /// 使用私钥签名
-        /// </summary>
-        /// <param name="data">原始数据</param>
-        /// <returns></returns>
-        public string Sign(string data)
-        {
-            byte[] dataBytes = _encoding.GetBytes(data);
-
-            var signatureBytes = _privateKeyRsaProvider!.SignData(dataBytes, _hashAlgorithmName, RSASignaturePadding.Pkcs1);
-
-            return Convert.ToBase64String(signatureBytes);
-        }
-
-        #endregion
-
-        #region 使用公钥验签
-
-        /// <summary>
-        /// 使用公钥验签
-        /// </summary>
-        /// <param name="data">原始数据</param>
-        /// <param name="sign">签名</param>
-        /// <returns></returns>
-        public bool Verify(string data, string sign)
-        {
-            byte[] dataBytes = _encoding.GetBytes(data);
-            byte[] signBytes = Convert.FromBase64String(sign);
-
-            var verify = _publicKeyRsaProvider!.VerifyData(dataBytes, signBytes, _hashAlgorithmName, RSASignaturePadding.Pkcs1);
-
-            return verify;
-        }
-
-        #endregion
-
-        #region 解密
-        /// <summary>
-        /// 私钥解密(原)
-        /// </summary>
-        /// <param name="cipherText">解密字符串(base64)</param>
-        /// <returns></returns>
-
-        //public string Decrypt(string cipherText)
-        //{
-        //	if (_privateKeyRsaProvider == null)
-        //	{
-        //		throw new Exception("_privateKeyRsaProvider is null");
-        //	}
-        //	return _encoding.GetString(_privateKeyRsaProvider.Decrypt(Convert.FromBase64String(cipherText), RSAEncryptionPadding.Pkcs1));
-        //} 
-        /// <summary>
-        /// 私钥解密(支持大量数据)
-        /// </summary>
-        /// <param name="cipherText"></param>
-        /// <returns></returns>
-        public string Decrypt(string cipherText)
-        {
-            if (_privateKeyRsaProvider == null)
-            {
-                throw new Exception("_privateKeyRsaProvider is null");
-            }
-            var bufferSize = _privateKeyRsaProvider.KeySize / 8;
-            byte[] buffer = new byte[bufferSize];//待解密块  
-            using (MemoryStream msInput = new MemoryStream(Convert.FromBase64String(cipherText)))
-            {
-                using (MemoryStream msOutput = new MemoryStream())
-                {
-                    int readLen; while ((readLen = msInput.Read(buffer, 0, bufferSize)) > 0)
-                    {
-                        byte[] dataToEnc = new byte[readLen];
-                        Array.Copy(buffer, 0, dataToEnc, 0, readLen); byte[] encData = _privateKeyRsaProvider.Decrypt(dataToEnc, RSAEncryptionPadding.Pkcs1);
-                        msOutput.Write(encData, 0, encData.Length);
-                    }
-                    byte[] result = msOutput.ToArray();
-                    return _encoding.GetString(result);
-                }
-            }
-        }
-
-        #endregion
-
-        #region 加密
-
-        /// <summary>
-        /// 公钥加密(原)
-        /// </summary>
-        /// <param name="text"></param>
-        /// <returns></returns>
-        //public string Encrypt(string text)
-        //{
-        //	if (_publicKeyRsaProvider == null)
-        //	{
-        //		throw new Exception("_publicKeyRsaProvider is null");
-        //	}
-        //	return Convert.ToBase64String(_publicKeyRsaProvider.Encrypt(Encoding.UTF8.GetBytes(text), RSAEncryptionPadding.Pkcs1));
-        //} 
-        /// <summary>
-        /// 公钥加密(支持大量数据)
-        /// </summary>
-        /// <param name="text"></param>
-        /// <returns></returns>
-        public string Encrypt(string text)
-        {
-            if (_publicKeyRsaProvider == null)
-            {
-                throw new Exception("_publicKeyRsaProvider is null");
-            }
-            var bufferSize = _publicKeyRsaProvider.KeySize / 8 - 11;
-            byte[] buffer = new byte[bufferSize];//待加密块
-
-            using (MemoryStream msInput = new MemoryStream(_encoding.GetBytes(text)))
-            {
-                using (MemoryStream msOutput = new MemoryStream())
-                {
-                    int readLen; while ((readLen = msInput.Read(buffer, 0, bufferSize)) > 0)
-                    {
-                        byte[] dataToEnc = new byte[readLen];
-                        Array.Copy(buffer, 0, dataToEnc, 0, readLen); byte[] encData = _publicKeyRsaProvider.Encrypt(dataToEnc, RSAEncryptionPadding.Pkcs1);
-                        msOutput.Write(encData, 0, encData.Length);
-                    }
-                    byte[] result = msOutput.ToArray();
-                    return Convert.ToBase64String(result);
-                }
-            }
-        }
-
-        #endregion
-
-        #region 使用私钥创建RSA实例
-        /// <summary>
-        /// 使用私钥创建RSA实例
-        /// </summary>
-        /// <param name="privateKey"></param>
-        /// <returns></returns>
-        private RSA CreateRsaProviderFromPrivateKey(string privateKey)
-        {
-            var privateKeyBits = Convert.FromBase64String(privateKey);
-
-            var rsa = RSA.Create();
-            var rsaParameters = new RSAParameters();
-
-            using (BinaryReader binr = new BinaryReader(new MemoryStream(privateKeyBits)))
-            {
-                byte bt = 0;
-                ushort twobytes = 0;
-                twobytes = binr.ReadUInt16();
-                if (twobytes == 0x8130)
-                    binr.ReadByte();
-                else if (twobytes == 0x8230)
-                    binr.ReadInt16();
-                else
-                    throw new Exception("Unexpected value read binr.ReadUInt16()");
-
-                twobytes = binr.ReadUInt16();
-                if (twobytes != 0x0102)
-                    throw new Exception("Unexpected version");
-
-                bt = binr.ReadByte();
-                if (bt != 0x00)
-                    throw new Exception("Unexpected value read binr.ReadByte()");
-
-                rsaParameters.Modulus = binr.ReadBytes(GetIntegerSize(binr));
-                rsaParameters.Exponent = binr.ReadBytes(GetIntegerSize(binr));
-                rsaParameters.D = binr.ReadBytes(GetIntegerSize(binr));
-                rsaParameters.P = binr.ReadBytes(GetIntegerSize(binr));
-                rsaParameters.Q = binr.ReadBytes(GetIntegerSize(binr));
-                rsaParameters.DP = binr.ReadBytes(GetIntegerSize(binr));
-                rsaParameters.DQ = binr.ReadBytes(GetIntegerSize(binr));
-                rsaParameters.InverseQ = binr.ReadBytes(GetIntegerSize(binr));
-            }
-
-            rsa.ImportParameters(rsaParameters);
-            return rsa;
-        }
-
-        #endregion
-
-        #region 使用公钥创建RSA实例
-        /// <summary>
-        /// 使用公钥创建RSA实例
-        /// </summary>
-        /// <param name="publicKeyString"></param>
-        /// <returns></returns>
-        public RSA? CreateRsaProviderFromPublicKey(string publicKeyString)
-        {
-            // encoded OID sequence for  PKCS #1 rsaEncryption szOID_RSA_RSA = "1.2.840.113549.1.1.1"
-            byte[] seqOid = { 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x01, 0x05, 0x00 };
-            byte[] seq = new byte[15];
-
-            var x509Key = Convert.FromBase64String(publicKeyString);
-
-            // ---------  Set up stream to read the asn.1 encoded SubjectPublicKeyInfo blob  ------
-            using (MemoryStream mem = new MemoryStream(x509Key))
-            {
-                using (BinaryReader binr = new BinaryReader(mem))  //wrap Memory Stream with BinaryReader for easy reading
-                {
-                    byte bt = 0;
-                    ushort twobytes = 0;
-
-                    twobytes = binr.ReadUInt16();
-                    if (twobytes == 0x8130) //data read as little endian order (actual data order for Sequence is 30 81)
-                        binr.ReadByte();    //advance 1 byte
-                    else if (twobytes == 0x8230)
-                        binr.ReadInt16();   //advance 2 bytes
-                    else
-                        return null;
-
-                    seq = binr.ReadBytes(15);       //read the Sequence OID
-                    if (!CompareBytearrays(seq, seqOid))    //make sure Sequence for OID is correct
-                        return null;
-
-                    twobytes = binr.ReadUInt16();
-                    if (twobytes == 0x8103) //data read as little endian order (actual data order for Bit String is 03 81)
-                        binr.ReadByte();    //advance 1 byte
-                    else if (twobytes == 0x8203)
-                        binr.ReadInt16();   //advance 2 bytes
-                    else
-                        return null;
-
-                    bt = binr.ReadByte();
-                    if (bt != 0x00)     //expect null byte next
-                        return null;
-
-                    twobytes = binr.ReadUInt16();
-                    if (twobytes == 0x8130) //data read as little endian order (actual data order for Sequence is 30 81)
-                        binr.ReadByte();    //advance 1 byte
-                    else if (twobytes == 0x8230)
-                        binr.ReadInt16();   //advance 2 bytes
-                    else
-                        return null;
-
-                    twobytes = binr.ReadUInt16();
-                    byte lowbyte = 0x00;
-                    byte highbyte = 0x00;
-
-                    if (twobytes == 0x8102) //data read as little endian order (actual data order for Integer is 02 81)
-                        lowbyte = binr.ReadByte();  // read next bytes which is bytes in modulus
-                    else if (twobytes == 0x8202)
-                    {
-                        highbyte = binr.ReadByte(); //advance 2 bytes
-                        lowbyte = binr.ReadByte();
-                    }
-                    else
-                        return null;
-                    byte[] modint = { lowbyte, highbyte, 0x00, 0x00 };   //reverse byte order since asn.1 key uses big endian order
-                    int modsize = BitConverter.ToInt32(modint, 0);
-
-                    int firstbyte = binr.PeekChar();
-                    if (firstbyte == 0x00)
-                    {   //if first byte (highest order) of modulus is zero, don't include it
-                        binr.ReadByte();    //skip this null byte
-                        modsize -= 1;   //reduce modulus buffer size by 1
-                    }
-
-                    byte[] modulus = binr.ReadBytes(modsize);   //read the modulus bytes
-
-                    if (binr.ReadByte() != 0x02)            //expect an Integer for the exponent data
-                        return null;
-                    int expbytes = binr.ReadByte();        // should only need one byte for actual exponent data (for all useful values)
-                    byte[] exponent = binr.ReadBytes(expbytes);
-
-                    // ------- create RSACryptoServiceProvider instance and initialize with public key -----
-                    var rsa = RSA.Create();
-                    RSAParameters rsaKeyInfo = new RSAParameters
-                    {
-                        Modulus = modulus,
-                        Exponent = exponent
-                    };
-                    rsa.ImportParameters(rsaKeyInfo);
-
-                    return rsa;
-                }
-
-            }
-        }
-
-        #endregion
-
-        #region 导入密钥算法
-
-        private int GetIntegerSize(BinaryReader binr)
-        {
-            byte bt = 0;
-            int count = 0;
-            bt = binr.ReadByte();
-            if (bt != 0x02)
-                return 0;
-            bt = binr.ReadByte();
-
-            if (bt == 0x81)
-                count = binr.ReadByte();
-            else
-            if (bt == 0x82)
-            {
-                var highbyte = binr.ReadByte();
-                var lowbyte = binr.ReadByte();
-                byte[] modint = { lowbyte, highbyte, 0x00, 0x00 };
-                count = BitConverter.ToInt32(modint, 0);
-            }
-            else
-            {
-                count = bt;
-            }
-
-            while (binr.ReadByte() == 0x00)
-            {
-                count -= 1;
-            }
-            binr.BaseStream.Seek(-1, SeekOrigin.Current);
-            return count;
-        }
-
-        private bool CompareBytearrays(byte[] a, byte[] b)
-        {
-            if (a.Length != b.Length)
-                return false;
-            int i = 0;
-            foreach (byte c in a)
-            {
-                if (c != b[i])
-                    return false;
-                i++;
-            }
-            return true;
-        }
-
-        #endregion
-
-    }
-
-    /// <summary>
-    /// RSA算法类型
-    /// </summary>
-    public enum RSAType
-    {
-        /// <summary>
-        /// SHA1
-        /// </summary>
-        RSA = 0,
-        /// <summary>
-        /// RSA2 密钥长度至少为2048
-        /// SHA256
-        /// </summary>
-        RSA2
-    }
-}

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

@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Yi.Framework.Core.Helper
-{
-    public static class ReflexHelper
-    {
-
-        #region 对象相关 
-        /// <summary>
-        /// 取对象属性值
-        /// </summary>
-        /// <param name="FieldName"></param>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public static string GetModelValue(string FieldName, object obj)
-        {
-            try
-            {
-                Type Ts = obj.GetType();
-                object o = Ts.GetProperty(FieldName).GetValue(obj, null);
-                if (null == o)
-                    return null;
-                string Value = Convert.ToString(o);
-                if (string.IsNullOrEmpty(Value))
-                    return null;
-                return Value;
-            }
-            catch (Exception ex)
-            {
-                throw ex;
-            }
-            return null;
-        }
-
-
-        /// <summary>
-        /// 设置对象属性值
-        /// </summary>
-        /// <param name="FieldName"></param>
-        /// <param name="Value"></param>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public static bool SetModelValue(string FieldName, object Value, object obj)
-        {
-            try
-            {
-                Type Ts = obj.GetType();
-                Ts.GetProperty(FieldName).SetValue(obj, Value, null);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                throw ex;
-            }
-            return false;
-        }
-        #endregion
-    }
-}

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

@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text;
-
-namespace Yi.Framework.Core.Helper
-{
-    public class ShellHelper
-    {
-        /// <summary>
-        /// linux 系统命令
-        /// </summary>
-        /// <param name="command"></param>
-        /// <returns></returns>
-        public static string Bash(string command)
-        {
-            var escapedArgs = command.Replace("\"", "\\\"");
-            var process = new Process()
-            {
-                StartInfo = new ProcessStartInfo
-                {
-                    FileName = "/bin/bash",
-                    Arguments = $"-c \"{escapedArgs}\"",
-                    RedirectStandardOutput = true,
-                    UseShellExecute = false,
-                    CreateNoWindow = true,
-                }
-            };
-            process.Start();
-            string result = process.StandardOutput.ReadToEnd();
-            process.WaitForExit();
-            process.Dispose();
-            return result;
-        }
-
-        /// <summary>
-        /// windows系统命令
-        /// </summary>
-        /// <param name="fileName"></param>
-        /// <param name="args"></param>
-        /// <returns></returns>
-        public static string Cmd(string fileName, string args)
-        {
-            string output = string.Empty;
-
-            var info = new ProcessStartInfo();
-            info.FileName = fileName;
-            info.Arguments = args;
-            info.RedirectStandardOutput = true;
-
-            using (var process = Process.Start(info))
-            {
-                output = process.StandardOutput.ReadToEnd();
-            }
-            return output;
-        }
-    }
-}

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

@@ -1,88 +0,0 @@
-using System.Diagnostics;
-using System.Text;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Modularity;
-
-namespace Yi.Framework.Core.Modularity;
-
-/// <summary>
-/// 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>
-    /// 初始化模块管理器
-    /// </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
-            .Select(serviceProvider.GetRequiredService)
-            .Cast<IModuleLifecycleContributor>()
-            .ToArray();
-    }
-
-    /// <summary>
-    /// 初始化所有模块
-    /// </summary>
-    /// <param name="context">应用程序初始化上下文</param>
-    public override async Task InitializeModulesAsync(ApplicationInitializationContext context)
-    {
-        _logger.LogDebug("==========模块Initialize初始化统计-跳过0ms模块==========");
-        
-        var moduleCount = 0;
-        var stopwatch = new Stopwatch();
-        var totalTime = 0L;
-
-        foreach (var contributor in _lifecycleContributors)
-        {
-            foreach (var module in _moduleContainer.Modules)
-            {
-                try
-                {
-                    stopwatch.Restart();
-                    await contributor.InitializeAsync(context, module.Instance);
-                    stopwatch.Stop();
-                    
-                    totalTime += stopwatch.ElapsedMilliseconds;
-                    moduleCount++;
-
-                    // 仅记录耗时超过1ms的模块
-                    if (stopwatch.ElapsedMilliseconds > 1)
-                    {
-                        _logger.LogDebug(
-                            "耗时-{Time}ms,已加载模块-{ModuleName}", 
-                            stopwatch.ElapsedMilliseconds,
-                            module.Assembly.GetName().Name);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    throw new AbpInitializationException(
-                        $"模块 {module.Type.AssemblyQualifiedName} 在 {contributor.GetType().FullName} 阶段初始化失败: {ex.Message}",
-                        ex);
-                }
-            }
-        }
-
-        _logger.LogInformation(
-            "==========【{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/Yi.Framework.Core.csproj

@@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="..\..\common.props" />
-
-
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Volo.Abp.Core" Version="$(AbpVersion)" />
-  </ItemGroup>
-
-</Project>

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

@@ -1,29 +0,0 @@
-using Volo.Abp.Modularity;
-
-namespace Yi.Framework.Core
-{
-    /// <summary>
-    /// 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

@@ -1,19 +0,0 @@
-using Volo.Abp;
-using Volo.Abp.Application.Services;
-
-namespace Yi.Framework.Ddd.Application.Contracts
-{
-    /// <summary>
-    /// 批量删除服务接口
-    /// </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

@@ -1,20 +0,0 @@
-using Volo.Abp.Application.Dtos;
-
-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

@@ -1,11 +0,0 @@
-using Volo.Abp.Application.Dtos;
-
-namespace Yi.Framework.Ddd.Application.Contracts
-{
-    /// <summary>
-    /// 分页查询请求接口，包含时间范围和排序功能
-    /// </summary>
-    public interface IPagedAllResultRequestDto : IPageTimeResultRequestDto, IPagedAndSortedResultRequest
-    {
-    }
-}