chore(release): 2.1.0

[skip ci]

Co-authored-by: tk <fiyne1a@dingtalk.com>

.github/workflows/nightly-build.yml

@@ -37,8 +37,8 @@ jobs:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
           restore-keys: ${{ runner.os }}-nuget
-      - working-directory: ./src/backend/NetAdmin.AdmServer.Host
+      - working-directory: ./src/backend/YourSolution.AdmServer.Host
-        run: dotnet publish NetAdmin.AdmServer.Host.csproj -c Release
+        run: dotnet publish YourSolution.AdmServer.Host.csproj -c Release
       - run: docker build -t nsnail/netadmin:nightly .
       - uses: docker/login-action@v3
         with:

.github/workflows/release.yml

@@ -37,8 +37,8 @@ jobs:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
           restore-keys: ${{ runner.os }}-nuget
-      - working-directory: ./src/backend/NetAdmin.AdmServer.Host
+      - working-directory: ./src/backend/YourSolution.AdmServer.Host
-        run: dotnet publish NetAdmin.AdmServer.Host.csproj -c Release
+        run: dotnet publish YourSolution.AdmServer.Host.csproj -c Release
       - uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.1.0](https://github.com/nsnail/NetAdmin/compare/v2.0.0...v2.1.0) (2024-11-15)
+
+
+### Features
+
+* ✨ 首页仪表板自定义布局 ([#201](https://github.com/nsnail/NetAdmin/issues/201)) ([2f30028](https://github.com/nsnail/NetAdmin/commit/2f300285aa2afbfaea1fd9ffe299cc2badf98e0f))
+* ✨ 用户选择器 ([#189](https://github.com/nsnail/NetAdmin/issues/189)) ([8479f69](https://github.com/nsnail/NetAdmin/commit/8479f69bdccac93a497e039dd01e18333ec2bbdc))
+
+
+### Bug Fixes
+
+* 🐛 --el-color-primary 变量有闪烁现象 ([#194](https://github.com/nsnail/NetAdmin/issues/194)) ([26e3698](https://github.com/nsnail/NetAdmin/commit/26e3698f57a2986f3b727fa38f293ca40c89f3ab))
+* 🐛 404 ([#198](https://github.com/nsnail/NetAdmin/issues/198)) ([d8dbb28](https://github.com/nsnail/NetAdmin/commit/d8dbb28cfc8ad427062eb8d81be67cc25ded6fb6))
+* 🐛 module name ([#193](https://github.com/nsnail/NetAdmin/issues/193)) ([3069b8f](https://github.com/nsnail/NetAdmin/commit/3069b8fbc451c4c257becf0523ab6ea6cc9af7e2))
+
 ## [2.0.0](https://github.com/nsnail/NetAdmin/compare/v1.6.0...v2.0.0) (2024-11-04)
 
 

Directory.Build.props

@@ -32,6 +32,6 @@
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-        <Compile Include="../GlobalUsings.cs" Link="GlobalUsings.cs" />
+        <Compile Include="$(SolutionDir)/src/backend/GlobalUsings.cs" Link="GlobalUsings.cs" />
     </ItemGroup>
 </Project>

Dockerfile

@@ -3,5 +3,5 @@ WORKDIR /app
 EXPOSE 8080
 RUN apt update
 RUN apt install -y redis
-COPY ./dist/backend/NetAdmin.AdmServer.Host/bin/Release/net9.0/publish .
+COPY ./dist/backend/YourSolution.AdmServer.Host/bin/Release/net9.0/publish .
-ENTRYPOINT redis-server --daemonize yes && dotnet NetAdmin.AdmServer.Host.dll -is
+ENTRYPOINT redis-server --daemonize yes && dotnet YourSolution.AdmServer.Host.dll -is

NetAdmin.sln

@@ -44,10 +44,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BB0B
         install.as.tpl.ps1 = scripts/install.as.tpl.ps1
         rename.csx = scripts/rename.csx
         resharper.full.ps1 = scripts/resharper.full.ps1
-        switcher.freesql.json = scripts/switcher.freesql.json
+        switch.nuget.or.project.csx = scripts/switch.nuget.or.project.csx
-        switcher.gurion.json = scripts/switcher.gurion.json
-        switcher.nsext.json = scripts/switcher.nsext.json
-        switcher.ps1 = scripts/switcher.ps1
         sync.sln.files.csx = scripts/sync.sln.files.csx
         wait.server.stop.sh = scripts/wait.server.stop.sh
     EndProjectSection
@@ -70,29 +67,29 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{8E4C93BA
         stylecop.analyzers.ruleset = build/stylecop.analyzers.ruleset
     EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Infrastructure", "src\backend\NetAdmin.Infrastructure\NetAdmin.Infrastructure.csproj", "{1E62C322-EE42-4699-A6F1-791C53EFA62D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Infrastructure", "src\backend\NetAdmin\NetAdmin.Infrastructure\NetAdmin.Infrastructure.csproj", "{1E62C322-EE42-4699-A6F1-791C53EFA62D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Application", "src\backend\NetAdmin.AdmServer.Application\NetAdmin.AdmServer.Application.csproj", "{E38B2EB4-D7A5-4777-9236-3B348919DF23}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YourSolution.AdmServer.Application", "src\backend\YourSolution.AdmServer.Application\YourSolution.AdmServer.Application.csproj", "{E38B2EB4-D7A5-4777-9236-3B348919DF23}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Host", "src\backend\NetAdmin.AdmServer.Host\NetAdmin.AdmServer.Host.csproj", "{CE895E44-EEC3-4ECE-A56A-8A82E7D863E3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YourSolution.AdmServer.Host", "src\backend\YourSolution.AdmServer.Host\YourSolution.AdmServer.Host.csproj", "{CE895E44-EEC3-4ECE-A56A-8A82E7D863E3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "03.hosted-servers", "03.hosted-servers", "{12AE5B4B-CB1A-498E-83B8-04E201E31D86}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Domain", "src\backend\NetAdmin.Domain\NetAdmin.Domain.csproj", "{58509C57-09FA-4E3C-BC07-78E786A2A326}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Domain", "src\backend\NetAdmin\NetAdmin.Domain\NetAdmin.Domain.csproj", "{58509C57-09FA-4E3C-BC07-78E786A2A326}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Application", "src\backend\NetAdmin.Application\NetAdmin.Application.csproj", "{70C54E1B-2083-4196-AB68-34CAF0075D82}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Application", "src\backend\NetAdmin\NetAdmin.Application\NetAdmin.Application.csproj", "{70C54E1B-2083-4196-AB68-34CAF0075D82}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Host", "src\backend\NetAdmin.Host\NetAdmin.Host.csproj", "{91839A15-D08F-4848-A301-F793412BC688}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Host", "src\backend\NetAdmin\NetAdmin.Host\NetAdmin.Host.csproj", "{91839A15-D08F-4848-A301-F793412BC688}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Cache", "src\backend\NetAdmin.Cache\NetAdmin.Cache.csproj", "{91452C22-4B57-4F16-9AF6-42C7BF830504}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Cache", "src\backend\NetAdmin\NetAdmin.Cache\NetAdmin.Cache.csproj", "{91452C22-4B57-4F16-9AF6-42C7BF830504}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Cache", "src\backend\NetAdmin.AdmServer.Cache\NetAdmin.AdmServer.Cache.csproj", "{7CB632D3-3635-4F8D-AFE7-F496D37D422B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YourSolution.AdmServer.Cache", "src\backend\YourSolution.AdmServer.Cache\YourSolution.AdmServer.Cache.csproj", "{7CB632D3-3635-4F8D-AFE7-F496D37D422B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Host", "src\backend\NetAdmin.SysComponent.Host\NetAdmin.SysComponent.Host.csproj", "{C2CC1596-3BEE-43EA-A9BE-4EDE5716296C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Host", "src\backend\NetAdmin\NetAdmin.SysComponent.Host\NetAdmin.SysComponent.Host.csproj", "{C2CC1596-3BEE-43EA-A9BE-4EDE5716296C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Cache", "src\backend\NetAdmin.SysComponent.Cache\NetAdmin.SysComponent.Cache.csproj", "{19872A4C-3C9A-4C62-A33B-74F5B8D6F77C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Cache", "src\backend\NetAdmin\NetAdmin.SysComponent.Cache\NetAdmin.SysComponent.Cache.csproj", "{19872A4C-3C9A-4C62-A33B-74F5B8D6F77C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Application", "src\backend\NetAdmin.SysComponent.Application\NetAdmin.SysComponent.Application.csproj", "{34650E82-D257-46DA-BD6B-DE307113347B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Application", "src\backend\NetAdmin\NetAdmin.SysComponent.Application\NetAdmin.SysComponent.Application.csproj", "{34650E82-D257-46DA-BD6B-DE307113347B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02.components", "02.components", "{3F23258D-8299-4992-9F51-2EE9B52CF9D2}"
 EndProject
@@ -104,21 +101,29 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "05.tools", "05.tools", "{79
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "src\backend\UnitTests\UnitTests.csproj", "{C7F27698-DA05-4ACD-B0D7-4791B3972002}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Tests", "src\backend\NetAdmin.Tests\NetAdmin.Tests.csproj", "{00604162-C444-478B-B773-3AB23C856CA7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Tests", "src\backend\NetAdmin\NetAdmin.Tests\NetAdmin.Tests.csproj", "{00604162-C444-478B-B773-3AB23C856CA7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker", "docker", "{E80A1018-C354-4A26-9029-8847BB9DA864}"
     ProjectSection(SolutionItems) = preProject
         README.md = docker/README.md
     EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Domain", "src\backend\NetAdmin.SysComponent.Domain\NetAdmin.SysComponent.Domain.csproj", "{51D6E603-0749-4A11-A78C-9E5BB127E03A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Domain", "src\backend\NetAdmin\NetAdmin.SysComponent.Domain\NetAdmin.SysComponent.Domain.csproj", "{51D6E603-0749-4A11-A78C-9E5BB127E03A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Domain", "src\backend\NetAdmin.AdmServer.Domain\NetAdmin.AdmServer.Domain.csproj", "{932520DF-D312-415A-A128-1117F8221D68}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YourSolution.AdmServer.Domain", "src\backend\YourSolution.AdmServer.Domain\YourSolution.AdmServer.Domain.csproj", "{932520DF-D312-415A-A128-1117F8221D68}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Infrastructure", "src\backend\NetAdmin.AdmServer.Infrastructure\NetAdmin.AdmServer.Infrastructure.csproj", "{C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YourSolution.AdmServer.Infrastructure", "src\backend\YourSolution.AdmServer.Infrastructure\YourSolution.AdmServer.Infrastructure.csproj", "{C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Infrastructure", "src\backend\NetAdmin.SysComponent.Infrastructure\NetAdmin.SysComponent.Infrastructure.csproj", "{48EE6FC4-B64A-40D3-B889-36837E067880}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Infrastructure", "src\backend\NetAdmin\NetAdmin.SysComponent.Infrastructure\NetAdmin.SysComponent.Infrastructure.csproj", "{48EE6FC4-B64A-40D3-B889-36837E067880}"
 EndProject
+##Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gurion", "refs\Gurion\src\Gurion\Gurion.csproj", "{CCD098FE-4F95-4FA4-8CC0-9A6DE921FBAE}"#refs
+##EndProject#refs
+##Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSql", "refs\FreeSql\FreeSql\FreeSql.csproj", "{3C65DA42-877D-46FF-B754-C12214302A29}"#refs
+##EndProject#refs
+##Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSql.Provider.Sqlite", "refs\FreeSql\Providers\FreeSql.Provider.Sqlite\FreeSql.Provider.Sqlite.csproj", "{CF5EFA63-4631-4A64-B4F3-98A7DD532F68}"#refs
+##EndProject#refs
+##Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSql.DbContext", "refs\FreeSql\FreeSql.DbContext\FreeSql.DbContext.csproj", "{FE03DF27-EC56-48DB-81B0-F99947259A7C}"#refs
+##EndProject#refs
 Global
     GlobalSection(SolutionConfigurationPlatforms) = preSolution
         Debug|Any CPU = Debug|Any CPU
@@ -196,6 +201,22 @@ Global
         {48EE6FC4-B64A-40D3-B889-36837E067880}.Debug|Any CPU.Build.0 = Debug|Any CPU
         {48EE6FC4-B64A-40D3-B889-36837E067880}.Release|Any CPU.ActiveCfg = Release|Any CPU
         {48EE6FC4-B64A-40D3-B889-36837E067880}.Release|Any CPU.Build.0 = Release|Any CPU
+        ##{CCD098FE-4F95-4FA4-8CC0-9A6DE921FBAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        ##{CCD098FE-4F95-4FA4-8CC0-9A6DE921FBAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        ##{CCD098FE-4F95-4FA4-8CC0-9A6DE921FBAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        ##{CCD098FE-4F95-4FA4-8CC0-9A6DE921FBAE}.Release|Any CPU.Build.0 = Release|Any CPU
+        ##{3C65DA42-877D-46FF-B754-C12214302A29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        ##{3C65DA42-877D-46FF-B754-C12214302A29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        ##{3C65DA42-877D-46FF-B754-C12214302A29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        ##{3C65DA42-877D-46FF-B754-C12214302A29}.Release|Any CPU.Build.0 = Release|Any CPU
+        ##{CF5EFA63-4631-4A64-B4F3-98A7DD532F68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        ##{CF5EFA63-4631-4A64-B4F3-98A7DD532F68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        ##{CF5EFA63-4631-4A64-B4F3-98A7DD532F68}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        ##{CF5EFA63-4631-4A64-B4F3-98A7DD532F68}.Release|Any CPU.Build.0 = Release|Any CPU
+        ##{FE03DF27-EC56-48DB-81B0-F99947259A7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        ##{FE03DF27-EC56-48DB-81B0-F99947259A7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        ##{FE03DF27-EC56-48DB-81B0-F99947259A7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        ##{FE03DF27-EC56-48DB-81B0-F99947259A7C}.Release|Any CPU.Build.0 = Release|Any CPU
     EndGlobalSection
     GlobalSection(NestedProjects) = preSolution
         {4DAF9366-855F-46BB-AE4C-660C92FA0697} = {C84EB5A0-37AD-4B17-A51E-E36888C4441E}

README.md

@@ -14,7 +14,7 @@ https://na.tools92.top
 
 ```shell
 docker run -p 8080:8080 nsnail/netadmin
-# 需翻墙
+# 需魔法上网
 ```
 
 ## 构建步骤
@@ -27,14 +27,17 @@ dotnet --list-sdks
 # 2. 克隆代码仓库
 git clone https://github.com/nsnail/NetAdmin.git && cd ./NetAdmin
 
-# 3. 检查本机 redis 运行状态
+# 3. 确认本机 redis 处于运行状态
-redis-cli dbsize
+redis-server # 启动
+redis-cli    # 连接测试
 # 下载 redis for windows：https://github.com/redis-windows/redis-windows/releases
 # 下载 redis for linux/mac：https://redis.io/download
 
 # 4. 运行后端 WebApi
-dotnet run --project ./src/backend/NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj --urls http://[::]:5010 -is
+dotnet run --project ./src/backend/YourSolution.AdmServer.Host/YourSolution.AdmServer.Host.csproj --urls http://[::]:5010 -is
-# 浏览器打开 http://localhost:5010 ，将看到Swagger（Knife4jUI）界面
+# -i 插入种子数据
+# -s 同步数据库结构
+# 浏览器访问 http://localhost:5010 ，将看到Swagger（Knife4jUI）界面
 
 # 5. 检查 nodejs 版本 >=20
 node -v
@@ -45,42 +48,54 @@ cd ./src/frontend/admin && npm install
 
 # 7. 运行前端项目
 npm run dev
-# 浏览器打开 http://localhost:5020 ，将看到管理界面（默认用户名：root，密码：1234qwer）
+# 浏览器访问 http://localhost:5020 ，将看到管理界面（默认用户名密码：root 1234qwer）
 ```
 
-## 文件目录树
+## 文件目录
 
 ```
++---.github                  # github 工程文件目录
 +---.template.config         # dotnet 项目模板配置目录
 +---assets                   # 项目资源文件目录
 +---build                    # 构建相关的工程文件目录
 +---dist                     # 编译生成的二进制文件目录
++---docker                   # docker 镜像构建文件目录
 +---docs                     # 项目开发文档目录
 +---refs                     # 引用的第三方包的仓库目录
 +---scripts                  # 各种工具脚本文件目录
 +---src                      # 项目源码文件目录
 ```
 
-## 后端项目架构
+## 项目架构
 
 ```mermaid
 flowchart TD
-H["NetAdmin.Host\n公共主机层\n（.Net自托管主机程序）\n（输入输出格式化）\n（数据校验、鉴权）\n（...所有HTTP管道过滤器中间件）"] --> C["NetAdmin.Cache\n公共缓存层\n（基于Redis或MemoryCache的缓存策略实现）"]
+sys-host["NetAdmin.SysComponent.Host\n（系统组件：主机层）"]
-C --> A["NetAdmin.Application\n公共业务逻辑层\n（内部服务增删改查）\n（外部服务增删改查）\n（...所有业务用例的计算与组合逻辑的模块化）"]
+sys-cache["NetAdmin.SysComponent.Cache\n（系统组件：缓存层）"]
-A --> D["NetAdmin.Domain\n数据实体层\n（数据库关系实体映射）\n（DTO数据传输对象）\n（...所有数据模型的抽象与封装）"]
+sys-app["NetAdmin.SysComponent.Application\n（系统组件：应用层）"]
-D --> I["NetAdmin.Infrastructure\n基础设施层\n（第三方组件和Nuget包引用）\n（公共构建和程序运行配置）\n（公共常量枚举异常定义）\n（全球化化和多语言）\n（...所有公共Utility工具）"]
+sys-domain["NetAdmin.SysComponent.Domain\n（系统组件：数据实体层）"]
-
+sys-infra["NetAdmin.SysComponent.Infrastructure\n（系统组件：基础设施层）"]
-XH["NetAdmin.XXX.Host\n（WebApi）"]-->H
+host["NetAdmin.Host\n框架：主机层\n（.Net自托管主机程序）\n（输入输出格式化）\n（数据校验、鉴权）\n（...所有HTTP管道过滤器中间件）"]
-XS["NetAdmin.XXXService\n（常驻内存服务）"]-->H
+cache["NetAdmin.Cache\n框架：缓存层\n（基于Redis或MemoryCache的缓存策略实现）"]
-XS["NetAdmin.XXXService\n（常驻内存服务）"]-->XC
+app["NetAdmin.Application\n框架：业务应用层\n（内部服务增删改查）\n（外部服务增删改查）\n（...所有业务用例的计算与组合逻辑的模块化）"]
-XC["NetAdmin.XXX.Cache\n（缓存层实例）"]-->C
+domain["NetAdmin.Domain\n框架：数据实体层\n（数据库关系实体映射）\n（DTO数据传输对象）\n（...所有数据模型的抽象与封装）"]
-XA["NetAdmin.XXX.Application\n（业务逻辑层实例）"]-->A
+infra["NetAdmin.Infrastructure\n框架：基础设施层\n（第三方组件和Nuget包引用）\n（公共构建和程序运行配置）\n（公共常量枚举异常定义）\n（全球化化和多语言）\n（...所有公共Utility工具）"]
-
+biz-host["YourSolution.XXX.Host\n（业务实例：主机层）"]
-XH-->XC
+biz-cache["YourSolution.XXX.Cache\n（业务实例：缓存层）"]
-XC-->XA
+biz-app["YourSolution.XXX.Application\n（业务实例：应用层）"]
+biz-domain["YourSolution.XXX.Domain\n（业务实例：数据实体层）"]
+biz-infra["YourSolution.XXX.Infrastructure\n（业务实例：基础设施层）"]
+biz-host-->biz-cache-->biz-app-->biz-domain-->biz-infra
+sys-host-->sys-cache-->sys-app-->sys-domain-->sys-infra
+host-->cache-->app-->domain-->infra
+biz-host-->sys-host-->host
+biz-cache-->sys-cache-->cache
+biz-app-->sys-app-->app
+biz-domain-->sys-domain-->domain
+biz-infra-->sys-infra-->infra
 ```
 
-## 引用的开源代码 / 特别鸣谢
+## 特别鸣谢
 
 | 语言         | 集成领域          | 开源库                                                                                                                                                                                                                   |
 |------------|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -88,7 +103,6 @@ XC-->XA
 | C#         | 数据库关系映射       | [FreeSql](https://github.com/dotnetcore/FreeSql)                                                                                                                                                                      |
 | C#         | 代码质量检查        | [Roslynator.Analyzers](https://github.com/josefpihrt/roslynator) \| [SonarAnalyzer.CSharp](https://github.com/SonarSource/sonar-dotnet) \| [StyleCop.Analyzers](https://github.com/DotNetAnalyzers/StyleCopAnalyzers) |
 | C#         | 单元测试框架        | [xunit](https://github.com/xunit/xunit)  \| [coverlet.collector](https://github.com/coverlet-coverage/coverlet)                                                                                                       |
-| C#         | 分布式锁          | [RedLock.net](https://github.com/samcook/RedLock.net)                                                                                                                                                                 |
 | C#         | 控制台终端界面库      | [Spectre.Console](https://github.com/spectreconsole/spectre.console)                                                                                                                                                  |
 | C#         | 扩展函数库         | [NSExt](https://github.com/nsnail/ns-ext.git)                                                                                                                                                                         |
 | C#         | 图形处理库         | [SixLabors.ImageSharp](https://github.com/SixLabors/ImageSharp)                                                                                                                                                       |
@@ -96,8 +110,6 @@ XC-->XA
 | C#         | 性能监控采集        | [prometheus-net.AspNetCore](https://github.com/prometheus-net/prometheus-net)                                                                                                                                         |
 | C#         | 雪花ID生成器       | [Yitter.IdGenerator](https://github.com/yitter/idgenerator)                                                                                                                                                           |
 | C#         | 自动化版本管理       | [MinVer](https://github.com/adamralph/minver)                                                                                                                                                                         |
-| C#         | JavaScript引擎  | [MsieJavaScriptEngine](https://github.com/Taritsyn/MsieJavaScriptEngine)                                                                                                                                              |
-| C#         | WebApi图形界面    | [IGeekFan.AspNetCore.Knife4jUI](https://github.com/luoyunchong/IGeekFan.AspNetCore.Knife4jUI)                                                                                                                         |
 | TypeScript | SPA基础框架       | [Vue](https://github.com/vuejs/core)                                                                                                                                                                                  |
 | TypeScript | 前端构建工具        | [Vite](https://github.com/vitejs/vite)                                                                                                                                                                                |
 | TypeScript | UI控件库         | [Element Plus](https://github.com/element-plus/element-plus)                                                                                                                                                          |

assets/res/NetAdmin.Statements.ln

@@ -15,6 +15,8 @@ XML注释文件不存在
 时间表达式
 用户名不能是手机号码
 用户名长度4位以上
+种子数据插入完成
+记录已存在
 请求对象不能为空
 邀请码不正确
 配置文件初始化完毕

build/code.quality.props

@@ -15,7 +15,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20">
+        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

package.json

@@ -1,7 +1,7 @@
 {
-  "version": "2.0.0",
+  "version": "2.1.0",
   "devDependencies": {
-    "cz-git": "^1.10.1",
+    "cz-git": "^1.11.0",
     "commitizen": "^4.3.1",
     "prettier": "^3.3.3",
     "standard-version": "^9.5.0"

scripts/switch.nuget.or.project.csx

@@ -0,0 +1,42 @@
+using System.Text.RegularExpressions;
+string input = string.Empty;
+while (!new[] { "1", "2" }.Contains(input))
+{
+    Console.WriteLine("1.nuget 2.project");
+    input = Console.ReadLine();
+}
+var slnFile = Directory.GetFiles(@"../", "*.sln").First();
+var csprojFiles = Directory.GetFiles(@"../src", "*.csproj", new EnumerationOptions { RecurseSubdirectories = true });
+var slnContent = File.ReadAllText(slnFile);
+
+if (input == "1")
+{
+    slnContent = Regex.Replace(slnContent, "\\nProject\\((.*)#refs", "\n##Project($1#refs");
+    slnContent = Regex.Replace(slnContent, "\\nEndProject#refs", "\n##EndProject#refs");
+    foreach (Match m in Regex.Matches(slnContent, "\"(\\{[A-Z0-9]{8}-[A-Z0-9]{4}-[A-Z0-9]{4}-[A-Z0-9]{4}-[A-Z0-9]{12}\\})\"#refs"))
+    {
+        slnContent = slnContent.Replace($" {m.Groups[1].Value}.", $" ##{m.Groups[1].Value}.");
+    }
+    foreach (var csprojFile in csprojFiles)
+    {
+        var csprojContent = File.ReadAllText(csprojFile);
+        csprojContent = Regex.Replace(csprojContent," <ProjectReference(.*)Label=\"refs\"(.*)>", " <!--<ProjectReference$1Label=\"refs\"$2>-->");
+        csprojContent = Regex.Replace(csprojContent," <!--<PackageReference(.*)Label=\"refs\"(.*)>-->", " <PackageReference$1Label=\"refs\"$2>");
+        File.WriteAllText(csprojFile, csprojContent);
+    }
+}
+else
+{
+    slnContent = Regex.Replace(slnContent, "##", "");
+    foreach (var csprojFile in csprojFiles)
+    {
+        var csprojContent = File.ReadAllText(csprojFile);
+        csprojContent = Regex.Replace(csprojContent," <!--<ProjectReference(.*)Label=\"refs\"(.*)>-->", " <ProjectReference$1Label=\"refs\"$2>");
+        csprojContent = Regex.Replace(csprojContent," <PackageReference(.*)Label=\"refs\"(.*)>", " <!--<PackageReference$1Label=\"refs\"$2>-->");
+        File.WriteAllText(csprojFile, csprojContent);
+    }
+}
+
+
+Console.WriteLine(slnContent);
+File.WriteAllText(slnFile, slnContent);

scripts/switcher.freesql.json

@@ -1,22 +0,0 @@
-{
-  "solution": "NetAdmin.sln",
-  "mappings": {
-    "FreeSql.NS": "../refs/FreeSql/FreeSql/FreeSql.csproj",
-    "FreeSql.DbContext.NS": "../refs/FreeSql/FreeSql.DbContext/FreeSql.DbContext.csproj"
-  },
-  "restore": [
-    {
-      "name": "NetAdmin.Infrastructure",
-      "packages": [
-        {
-          "packageName": "FreeSql.NS",
-          "version": "3.2.833-ns4"
-        },
-        {
-          "packageName": "FreeSql.DbContext.NS",
-          "version": "3.2.833-ns4"
-        }
-      ]
-    }
-  ]
-}

scripts/switcher.gurion.json

@@ -1,17 +0,0 @@
-{
-  "solution": "NetAdmin.sln",
-  "mappings": {
-    "Gurion": "../refs/Gurion/src/Gurion.csproj"
-  },
-  "restore": [
-    {
-      "name": "NetAdmin.Infrastructure",
-      "packages": [
-        {
-          "packageName": "Gurion",
-          "version": "1.1.0"
-        }
-      ]
-    }
-  ]
-}

scripts/switcher.nsext.json

@@ -1,17 +0,0 @@
-{
-  "solution": "NetAdmin.sln",
-  "mappings": {
-    "NSExt": "../refs/ns-ext/src/NSExt/NSExt.csproj"
-  },
-  "restore": [
-    {
-      "name": "NetAdmin.Infrastructure",
-      "packages": [
-        {
-          "packageName": "NSExt",
-          "version": "2.2.0"
-        }
-      ]
-    }
-  ]
-}

scripts/switcher.ps1

@@ -1,27 +0,0 @@
-# https://github.com/RicoSuter/DNT#switch-to-projects
-$targets = @{
-    '1' = 'switch-to-projects'
-    '2' = 'switch-to-packages'
-}
-$key = ''
-while ($null -eq $targets[$key])
-{
-    $key = Read-Host '请选择：1（切换到项目引用） 2（切换到Nuget包引用）'
-}
-$files = Get-ChildItem Switcher.*.json
-$file = 9999
-while ($null -eq $files[[int]$file - 1])
-{
-    $i = 0
-    Write-Host '请选择要切换的配置文件文件'
-    foreach ($file in $files)
-    {
-        $i++
-        Write-Host $i $file.Name
-    }
-    $file = Read-Host
-}
-$file = [int]$file - 1
-Copy-Item $files[$file] 'switcher.json' -Force
-dnt $targets[$key] ../NetAdmin.sln
-Remove-Item switcher.json

src/backend/NetAdmin.AdmServer.Cache/NetAdmin.AdmServer.Cache.csproj

@@ -1,7 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="$(SolutionDir)/build/code.quality.props"/>
-    <ItemGroup>
-        <ProjectReference Include="../NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj"/>
-        <ProjectReference Include="../NetAdmin.SysComponent.Cache/NetAdmin.SysComponent.Cache.csproj"/>
-    </ItemGroup>
-</Project>

src/backend/NetAdmin.AdmServer.Infrastructure/NetAdmin.AdmServer.Infrastructure.csproj

@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="$(SolutionDir)/build/code.quality.props"/>
-    <ItemGroup>
-        <ProjectReference Include="../NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj"/>
-    </ItemGroup>
-    <ItemGroup>
-        <None Include="$(SolutionDir)/assets/res/NetAdmin.AdmServer.Statements.ln">
-            <Link>Languages/NetAdmin.AdmServer.Statements.ln</Link>
-        </None>
-        <None Include="$(SolutionDir)/assets/res/NetAdmin.AdmServer.Fields.ln">
-            <Link>Languages/NetAdmin.AdmServer.Fields.ln</Link>
-        </None>
-    </ItemGroup>
-    <ItemGroup>
-        <None Update="*.json">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-</Project>

src/backend/NetAdmin.Infrastructure/NetAdminSettings.Development.json

@@ -1,6 +0,0 @@
-{
-  "AppSettings": {
-    "InjectSpecificationDocument": true,
-    "InjectMiniProfiler": true
-  }
-}

src/backend/NetAdmin.Infrastructure/NetAdminSettings.Remote.json

@@ -1,6 +0,0 @@
-{
-  "AppSettings": {
-    "InjectSpecificationDocument": true,
-    "InjectMiniProfiler": true
-  }
-}

src/backend/NetAdmin.Infrastructure/NetAdminSettings.Test.json

@@ -1,6 +0,0 @@
-{
-  "AppSettings": {
-    "InjectSpecificationDocument": true,
-    "InjectMiniProfiler": true
-  }
-}

src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs

@@ -51,10 +51,10 @@ public abstract class RepositoryService<TEntity, TPrimary, TLogger>(BasicReposit
         where TQuery : DataAbstraction, new()
     {
         var select = selector(query)
-            #if DBTYPE_SQLSERVER
+                     #if DBTYPE_SQLSERVER
                      .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait)
-            #endif
+                     #endif
-            .Take(Numbers.MAX_LIMIT_EXPORT);
+                     .Take(Numbers.MAX_LIMIT_EXPORT);
 
         object list = listExp == null ? await select.ToListAsync().ConfigureAwait(false) : await select.ToListAsync(listExp).ConfigureAwait(false);
 

src/backend/NetAdmin/NetAdmin.Domain/Dto/DynamicFilterInfo.cs

@@ -38,7 +38,9 @@ public sealed record DynamicFilterInfo : DataAbstraction
     public static implicit operator FreeSql.Internal.Model.DynamicFilterInfo(DynamicFilterInfo d)
     {
         var ret = d.Adapt<FreeSql.Internal.Model.DynamicFilterInfo>();
-        ProcessDynamicFilter(ret);
+        #pragma warning disable VSTHRD002
+        ProcessDynamicFilterAsync(ret).ConfigureAwait(false).GetAwaiter().GetResult();
+        #pragma warning restore VSTHRD002
         return ret;
     }
 
@@ -79,35 +81,27 @@ public sealed record DynamicFilterInfo : DataAbstraction
         return !condition ? this : Add(df);
     }
 
-    private static void ParseDateExp(FreeSql.Internal.Model.DynamicFilterInfo d)
+    private static async Task ParseDateExpAsync(FreeSql.Internal.Model.DynamicFilterInfo d)
     {
         var values = ((JsonElement)d.Value).Deserialize<string[]>();
         if (!DateTime.TryParse(values[0], CultureInfo.InvariantCulture, out _)) {
-            var result = values[0]
+            var result = await values[0].ExecuteCSharpCodeAsync<DateTime>([typeof(DateTime).Assembly], nameof(System)).ConfigureAwait(false);
-                         .ExecuteCSharpCodeAsync<DateTime>([typeof(DateTime).Assembly], nameof(System))
-                         .ConfigureAwait(false)
-                         .GetAwaiter()
-                         .GetResult();
             values[0] = $"{result:yyyy-MM-dd HH:mm:ss}";
         }
 
         if (!DateTime.TryParse(values[1], CultureInfo.InvariantCulture, out _)) {
-            var result = values[1]
+            var result = await values[1].ExecuteCSharpCodeAsync<DateTime>([typeof(DateTime).Assembly], nameof(System)).ConfigureAwait(false);
-                         .ExecuteCSharpCodeAsync<DateTime>([typeof(DateTime).Assembly], nameof(System))
-                         .ConfigureAwait(false)
-                         .GetAwaiter()
-                         .GetResult();
             values[1] = $"{result:yyyy-MM-dd HH:mm:ss}";
         }
 
         d.Value = values;
     }
 
-    private static void ProcessDynamicFilter(FreeSql.Internal.Model.DynamicFilterInfo d)
+    private static async Task ProcessDynamicFilterAsync(FreeSql.Internal.Model.DynamicFilterInfo d)
     {
         if (d?.Filters != null) {
             foreach (var filterInfo in d.Filters) {
-                ProcessDynamicFilter(filterInfo);
+                await ProcessDynamicFilterAsync(filterInfo).ConfigureAwait(false);
             }
         }
 
@@ -119,7 +113,7 @@ public sealed record DynamicFilterInfo : DataAbstraction
             }
         }
         else if (d?.Operator == DynamicFilterOperator.DateRange) {
-            ParseDateExp(d);
+            await ParseDateExpAsync(d).ConfigureAwait(false);
         }
     }
 }