chore(release): 2.2.1

[skip ci]

.drone/workflows/README.md

@@ -0,0 +1 @@
+drone workflows

.editorconfig

@@ -10,6 +10,7 @@ ij_xml_text_wrap = off # IntelliJ IDEA 中 XML 文本不换行
 indent_size = 4 # 缩进大小为 4 个空格
 indent_style = space # 使用空格进行缩进
 insert_final_newline = false # 不在文件末尾插入空行
+max_line_length = 150 # 行长度限制为 150 个字符
 trim_trailing_whitespace = true # 删除行尾的空格
 
 [{*.json,*.yml}]

.github/workflows/README.md

@@ -0,0 +1 @@
+github workflows

.github/workflows/nightly-build.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [ 20.x ]
+        node-version: [ 22.x ]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -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

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [ 20.x ]
+        node-version: [ 22.x ]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -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 }}

.gitignore

@@ -402,4 +402,4 @@ FodyWeavers.xsd
 dist/
 *.[Dd]esigner.cs
 *.db
-/assets/res/Ln.resx
+/assets/res/Ln.resx

.gitmodules

@@ -1,9 +1,9 @@
-[submodule "refs/Furion"]
+[submodule "refs/Gurion"]
-    path = refs/Furion
+    path = refs/Gurion
-    url = https://github.com/nsnail/Furion.git
+    url = https://github.com/nsnail/Gurion.git
 [submodule "refs/ns-ext"]
     path = refs/ns-ext
     url = https://github.com/nsnail/ns-ext.git
-[submodule "refs/FreeSql"]
+[submodule "refs/NetAdmin.FreeSql"]
-    path = refs/FreeSql
+    path = refs/NetAdmin.FreeSql
-    url = https://github.com/nsnail/FreeSql.git
+    url = https://github.com/nsnail/NetAdmin.FreeSql.git

CHANGELOG.md

@@ -2,6 +2,113 @@
 
 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.2.1](https://github.com/nsnail/NetAdmin/compare/v2.1.0...v2.2.1) (2024-12-04)
+
+
+### Features
+
+* ✨ 菜单复制 ([#214](https://github.com/nsnail/NetAdmin/issues/214)) ([81d9b0b](https://github.com/nsnail/NetAdmin/commit/81d9b0b3bb280661ceffa61aa6e9d612fb7ec52c))
+* ✨ 文档管理 ([#221](https://github.com/nsnail/NetAdmin/issues/221)) ([7ed3040](https://github.com/nsnail/NetAdmin/commit/7ed30406c9f721a12f0b756ec8884a1882242b93))
+* ✨ select-filter badge icon ([#217](https://github.com/nsnail/NetAdmin/issues/217)) ([4d857f1](https://github.com/nsnail/NetAdmin/commit/4d857f1861b1256980e7cc59e2ab6a5f7d966da2))
+
+
+### Bug Fixes
+
+* 🐛 按钮文字提示 ([#227](https://github.com/nsnail/NetAdmin/issues/227)) ([c88c8d2](https://github.com/nsnail/NetAdmin/commit/c88c8d293d44f2707f3b5232e6a40a141af9981c))
+* 🐛 导出界面报错 ([#213](https://github.com/nsnail/NetAdmin/issues/213)) ([ef2f0de](https://github.com/nsnail/NetAdmin/commit/ef2f0de095e314f34bec21c0a2ccdb51423a163b))
+* 🐛 导出文件的responseType ([#205](https://github.com/nsnail/NetAdmin/issues/205)) ([841a419](https://github.com/nsnail/NetAdmin/commit/841a4195e77aa96e3c6c72626c1add3f71a310aa))
+* 🐛 请求日志批量插入，漏写了登录日志 ([#210](https://github.com/nsnail/NetAdmin/issues/210)) ([6c71c74](https://github.com/nsnail/NetAdmin/commit/6c71c74a27617c7d0530a5f6eaff650ecfd4eaec))
+* 🐛 用户选择器报错 ([#220](https://github.com/nsnail/NetAdmin/issues/220)) ([71bfdaa](https://github.com/nsnail/NetAdmin/commit/71bfdaafa8176cf686b03244ee758de058080a71))
+* 🐛 editUser ([ef2a0c3](https://github.com/nsnail/NetAdmin/commit/ef2a0c3280532ac24889279e4780a1b1a2561a6b))
+* 🐛 idd ([#208](https://github.com/nsnail/NetAdmin/issues/208)) ([4e9f605](https://github.com/nsnail/NetAdmin/commit/4e9f605ea2cc6fe394068cfea5638e51920b9096))
+* 🐛 version 条件重复指定 ([01058ba](https://github.com/nsnail/NetAdmin/commit/01058ba7288bcc645f66de2f78e1d659d55333cf))
+* 🐛 version lock ([4eecc0b](https://github.com/nsnail/NetAdmin/commit/4eecc0b4ce09f620f83109949e4c2b67b7f8ba90))
+
+## [2.2.0](https://github.com/nsnail/NetAdmin/compare/v2.1.0...v2.2.0) (2024-11-27)
+
+
+### Features
+
+* ✨ 菜单复制 ([#214](https://github.com/nsnail/NetAdmin/issues/214)) ([81d9b0b](https://github.com/nsnail/NetAdmin/commit/81d9b0b3bb280661ceffa61aa6e9d612fb7ec52c))
+* ✨ 文档管理 ([#221](https://github.com/nsnail/NetAdmin/issues/221)) ([7ed3040](https://github.com/nsnail/NetAdmin/commit/7ed30406c9f721a12f0b756ec8884a1882242b93))
+* ✨ select-filter badge icon ([#217](https://github.com/nsnail/NetAdmin/issues/217)) ([4d857f1](https://github.com/nsnail/NetAdmin/commit/4d857f1861b1256980e7cc59e2ab6a5f7d966da2))
+
+
+### Bug Fixes
+
+* 🐛 导出界面报错 ([#213](https://github.com/nsnail/NetAdmin/issues/213)) ([ef2f0de](https://github.com/nsnail/NetAdmin/commit/ef2f0de095e314f34bec21c0a2ccdb51423a163b))
+* 🐛 导出文件的responseType ([#205](https://github.com/nsnail/NetAdmin/issues/205)) ([841a419](https://github.com/nsnail/NetAdmin/commit/841a4195e77aa96e3c6c72626c1add3f71a310aa))
+* 🐛 请求日志批量插入，漏写了登录日志 ([#210](https://github.com/nsnail/NetAdmin/issues/210)) ([6c71c74](https://github.com/nsnail/NetAdmin/commit/6c71c74a27617c7d0530a5f6eaff650ecfd4eaec))
+* 🐛 用户选择器报错 ([#220](https://github.com/nsnail/NetAdmin/issues/220)) ([71bfdaa](https://github.com/nsnail/NetAdmin/commit/71bfdaafa8176cf686b03244ee758de058080a71))
+* 🐛 idd ([#208](https://github.com/nsnail/NetAdmin/issues/208)) ([4e9f605](https://github.com/nsnail/NetAdmin/commit/4e9f605ea2cc6fe394068cfea5638e51920b9096))
+
+## [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)
+
+
+### Features
+
+* ✨ 查询过滤器保存 ([779d8e5](https://github.com/nsnail/NetAdmin/commit/779d8e511a84d2be91d74ea308c22b969d6963f3))
+* ✨ 框架代码同步 ([#173](https://github.com/nsnail/NetAdmin/issues/173)) ([c088492](https://github.com/nsnail/NetAdmin/commit/c088492cfabada198ad563e43278ab7e869029bc))
+* ✨ 框架代码同步 ([#178](https://github.com/nsnail/NetAdmin/issues/178)) ([58e4572](https://github.com/nsnail/NetAdmin/commit/58e4572723ba68700fb6414167cb27b03c864db1))
+
+
+### Bug Fixes
+
+* 🐛 public const int SECS_CACHE_LOGIN_BY_USER_ID = 3600 * 24 * 30; // 秒：缓存时间-通过用户编号登录的用户信息 ([#179](https://github.com/nsnail/NetAdmin/issues/179)) ([000e3d6](https://github.com/nsnail/NetAdmin/commit/000e3d68a85eaee7758b4160d1d0ffa52aa4aae0))
+
+## [1.6.0](https://github.com/nsnail/NetAdmin/compare/v1.5.0...v1.6.0) (2024-08-12)
+
+
+### Features
+
+* ✨ 移除RedLocker，更改为自实现 ([#169](https://github.com/nsnail/NetAdmin/issues/169)) ([cd8ed67](https://github.com/nsnail/NetAdmin/commit/cd8ed674e0615b33fc0e025b9412c2f16d252f0f))
+
+
+### Bug Fixes
+
+* 🐛 站内信角标颜色 ([#167](https://github.com/nsnail/NetAdmin/issues/167)) ([e00c30c](https://github.com/nsnail/NetAdmin/commit/e00c30c96123769d8a9e6f30cc9a2c3e8099e34c))
+* 🐛 ip归属地查询接口地址更新 ([#168](https://github.com/nsnail/NetAdmin/issues/168)) ([4733ade](https://github.com/nsnail/NetAdmin/commit/4733adede5e8993f741e9b94541aafeb6a733859))
+* 🐛 ip显示问题 ([#166](https://github.com/nsnail/NetAdmin/issues/166)) ([6b63250](https://github.com/nsnail/NetAdmin/commit/6b6325003924b1605b610f759b2131c15013ffa0))
+* 🐛 trimSuffix ([#163](https://github.com/nsnail/NetAdmin/issues/163)) ([7c56c8d](https://github.com/nsnail/NetAdmin/commit/7c56c8d571d4f29fcb20f238893dbf61e5e538f0))
+
+## [1.5.0](https://github.com/nsnail/NetAdmin/compare/v1.4.0...v1.5.0) (2024-07-26)
+
+
+### Features
+
+* ✨ 登录日志独立存储 ([#161](https://github.com/nsnail/NetAdmin/issues/161)) ([faaf5aa](https://github.com/nsnail/NetAdmin/commit/faaf5aa0fc5299633ca4f384d6287171bb241ff4))
+* ✨ 框架代码同步 ([#158](https://github.com/nsnail/NetAdmin/issues/158)) ([1a28e8d](https://github.com/nsnail/NetAdmin/commit/1a28e8d5a62aeab7e4fda5049b4f733a16480b67))
+* ✨ 请求日志增加TraceId ([#154](https://github.com/nsnail/NetAdmin/issues/154)) ([aaea283](https://github.com/nsnail/NetAdmin/commit/aaea28389a56566e055b6651cf48a89194a72cb7))
+* ✨ cron表达式的自然语言表达 ([#156](https://github.com/nsnail/NetAdmin/issues/156)) ([6d4ccf3](https://github.com/nsnail/NetAdmin/commit/6d4ccf344595e128a445f1cb7596a7a1c28fd4cd))
+* ✨ logoBar显示程序版本号 ([#153](https://github.com/nsnail/NetAdmin/issues/153)) ([be5b9a1](https://github.com/nsnail/NetAdmin/commit/be5b9a160d1f06cfdf36cea4e5eb95908523fed2))
+
+
+### Bug Fixes
+
+* 🐛 error CS0117: 'Numbers' does not contain a definition for 'SECS_CACHE_DIC_CATALOG_CODE' ([#155](https://github.com/nsnail/NetAdmin/issues/155)) ([1733802](https://github.com/nsnail/NetAdmin/commit/1733802e02b7e69e4c8646f259da5098b87888f7))
+
+## [1.4.0](https://github.com/nsnail/NetAdmin/compare/v1.3.0...v1.4.0) (2024-07-03)
+
+
+### Features
+
+* ✨ 框架代码同步 ([#150](https://github.com/nsnail/NetAdmin/issues/150)) ([e1b0030](https://github.com/nsnail/NetAdmin/commit/e1b0030193556fa0564ea059657b4b43c98085c2))
+
 ## [1.3.0](https://github.com/nsnail/NetAdmin/compare/v1.2.0...v1.3.0) (2024-06-24)
 
 

Directory.Build.props

@@ -1,6 +1,7 @@
 <!-- 注意此文件名大小写不可变更 -->
 <Project>
     <PropertyGroup>
+        <DefineConstants>DBTYPE_SQLITE</DefineConstants>
         <SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
     </PropertyGroup>
     <Import Project="$(SolutionDir)/build/minver.targets" />
@@ -9,8 +10,8 @@
         <Authors>nsnail</Authors>
         <BaseIntermediateOutputPath>$(SolutionDir)/dist/backend/$(MSBuildProjectName)/obj</BaseIntermediateOutputPath>
         <BaseOutputPath>$(SolutionDir)/dist/backend/$(MSBuildProjectName)/bin</BaseOutputPath>
-        <Copyright>© 2006-2023 nsnail</Copyright>
+        <Copyright>© 2006-2024 nsnail</Copyright>
-        <Description>通用后台权限管理系统、快速开发框架（基于C#12/.NET9、Vue3/Vite、Element Plus等现代技术构建，具有十分整洁、优雅的编码规范）</Description>
+        <Description>通用后台权限管理系统、快速开发框架（基于C#13/.NET9、Vue3/Vite、ElementPlus等现代技术构建，具有十分整洁、优雅的编码规范）</Description>
         <EnableBaseIntermediateOutputPathMismatchWarning>false</EnableBaseIntermediateOutputPathMismatchWarning>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <ImplicitUsings>enable</ImplicitUsings>
@@ -25,12 +26,12 @@
         <Title>$(AssemblyName)</Title>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="MinVer" Version="5.0.0">
+        <PackageReference Include="MinVer" Version="6.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-        <Compile Include="../GlobalUsings.cs" Link="GlobalUsings.cs" />
+        <Compile Include="$(SolutionDir)/src/backend/GlobalUsings.cs" Link="GlobalUsings.cs" />
     </ItemGroup>
 </Project>

Dockerfile

@@ -1,7 +1,7 @@
-FROM mcr.microsoft.com/dotnet/aspnet:9.0.0-preview.5 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
 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

@@ -1,12 +1,42 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C84EB5A0-37AD-4B17-A51E-E36888C4441E}"
+
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".drone", ".drone", "{3E408077-E73E-45CE-A53A-EF5F9DAE4B46}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "backend", "backend", "{4DAF9366-855F-46BB-AE4C-660C92FA0697}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{BB5BB244-E7D2-4368-8C18-C1C0ED1E12D1}"
+    ProjectSection(SolutionItems) = preProject
+        README.md = .drone/workflows/README.md
+    EndProjectSection
 EndProject
+
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{1129FE25-466B-4F4F-85FC-3752664245E1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{3C6F049E-3EE8-4D66-9AFF-E8A369032487}"
+    ProjectSection(SolutionItems) = preProject
+        nightly-build.yml = .github/workflows/nightly-build.yml
+        README.md = .github/workflows/README.md
+        release.yml = .github/workflows/release.yml
+    EndProjectSection
+EndProject
+
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{8E4C93BA-9493-4892-80C4-5E174C504829}"
+    ProjectSection(SolutionItems) = preProject
+        code.quality.props = build/code.quality.props
+        copy.pkg.xml.comment.files.targets = build/copy.pkg.xml.comment.files.targets
+        minver.targets = build/minver.targets
+        prebuild.targets = build/prebuild.targets
+        stylecop.analyzers.ruleset = build/stylecop.analyzers.ruleset
+    EndProjectSection
+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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{5198A03D-0CAC-4828-A807-34A693F73859}"
     ProjectSection(SolutionItems) = preProject
         .commitlintrc.js = .commitlintrc.js
@@ -26,11 +56,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{5198A03D-0
         README.md = README.md
     EndProjectSection
 EndProject
+
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BB0B25C9-0901-4923-913F-00F9A6B352A5}"
     ProjectSection(SolutionItems) = preProject
         1.git.pull.request.ps1 = scripts/1.git.pull.request.ps1
         2.git.release.ps1 = scripts/2.git.release.ps1
         3.git.recreate.branch.ps1 = scripts/3.git.recreate.branch.ps1
+        4.git.del.obsolete.tags.ps1 = scripts/4.git.del.obsolete.tags.ps1
+        5.git.update.submodule.ps1 = scripts/5.git.update.submodule.ps1
         clean.ln.csx = scripts/clean.ln.csx
         code.clean.csx = scripts/code.clean.csx
         code.clean.ps1 = scripts/code.clean.ps1
@@ -43,53 +76,39 @@ 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.furion.json = scripts/switcher.furion.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
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{1129FE25-466B-4F4F-85FC-3752664245E1}"
+
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C84EB5A0-37AD-4B17-A51E-E36888C4441E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{3C6F049E-3EE8-4D66-9AFF-E8A369032487}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "backend", "backend", "{4DAF9366-855F-46BB-AE4C-660C92FA0697}"
-    ProjectSection(SolutionItems) = preProject
-        nightly-build.yml = .github/workflows/nightly-build.yml
-        release.yml = .github/workflows/release.yml
-    EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{8E4C93BA-9493-4892-80C4-5E174C504829}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Infrastructure", "src\backend\NetAdmin\NetAdmin.Infrastructure\NetAdmin.Infrastructure.csproj", "{1E62C322-EE42-4699-A6F1-791C53EFA62D}"
-    ProjectSection(SolutionItems) = preProject
-        code.quality.props = build/code.quality.props
-        copy.pkg.xml.comment.files.targets = build/copy.pkg.xml.comment.files.targets
-        minver.targets = build/minver.targets
-        prebuild.targets = build/prebuild.targets
-        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}") = "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.Application", "src\backend\NetAdmin.AdmServer.Application\NetAdmin.AdmServer.Application.csproj", "{E38B2EB4-D7A5-4777-9236-3B348919DF23}"
+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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Host", "src\backend\NetAdmin.AdmServer.Host\NetAdmin.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
@@ -97,10 +116,25 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01.frameworks", "01.framewo
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "04.tests", "04.tests", "{89260294-80FC-49F1-8D73-AECD39AFF2B7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Tests", "src\backend\NetAdmin.AdmServer.Tests\NetAdmin.AdmServer.Tests.csproj", "{C7F27698-DA05-4ACD-B0D7-4791B3972002}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "05.tools", "05.tools", "{79409163-5006-405D-AC96-406FA0AD77B7}"
 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}") = "UnitTests", "src\backend\UnitTests\UnitTests.csproj", "{C7F27698-DA05-4ACD-B0D7-4791B3972002}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Tests", "src\backend\NetAdmin\NetAdmin.Tests\NetAdmin.Tests.csproj", "{00604162-C444-478B-B773-3AB23C856CA7}"
+EndProject
+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}") = "YourSolution.AdmServer.Infrastructure", "src\backend\YourSolution.AdmServer.Infrastructure\YourSolution.AdmServer.Infrastructure.csproj", "{C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}"
+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\NetAdmin.FreeSql\src\FreeSql\FreeSql.csproj", "{3C65DA42-877D-46FF-B754-C12214302A29}"#refs
+##EndProject#refs
+##Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSql.Provider.Sqlite", "refs\NetAdmin.FreeSql\src\FreeSql.Provider.Sqlite\FreeSql.Provider.Sqlite.csproj", "{CF5EFA63-4631-4A64-B4F3-98A7DD532F68}"#refs
+##EndProject#refs
+##Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSql.DbContext", "refs\NetAdmin.FreeSql\src\FreeSql.DbContext\FreeSql.DbContext.csproj", "{FE03DF27-EC56-48DB-81B0-F99947259A7C}"#refs
+##EndProject#refs
+
 Global
     GlobalSection(SolutionConfigurationPlatforms) = preSolution
         Debug|Any CPU = Debug|Any CPU
@@ -162,6 +196,30 @@ Global
         {00604162-C444-478B-B773-3AB23C856CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
         {00604162-C444-478B-B773-3AB23C856CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
         {00604162-C444-478B-B773-3AB23C856CA7}.Release|Any CPU.Build.0 = Release|Any CPU
+        {932520DF-D312-415A-A128-1117F8221D68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        {932520DF-D312-415A-A128-1117F8221D68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        {932520DF-D312-415A-A128-1117F8221D68}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        {932520DF-D312-415A-A128-1117F8221D68}.Release|Any CPU.Build.0 = Release|Any CPU
+        {C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        {C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        {C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        {C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}.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}
@@ -178,10 +236,14 @@ Global
         {CE895E44-EEC3-4ECE-A56A-8A82E7D863E3} = {12AE5B4B-CB1A-498E-83B8-04E201E31D86}
         {89260294-80FC-49F1-8D73-AECD39AFF2B7} = {4DAF9366-855F-46BB-AE4C-660C92FA0697}
         {C7F27698-DA05-4ACD-B0D7-4791B3972002} = {89260294-80FC-49F1-8D73-AECD39AFF2B7}
-        {3C6F049E-3EE8-4D66-9AFF-E8A369032487} = {1129FE25-466B-4F4F-85FC-3752664245E1}
         {00604162-C444-478B-B773-3AB23C856CA7} = {D9C3EF66-2757-473D-A26B-54FD08DA203F}
         {34650E82-D257-46DA-BD6B-DE307113347B} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2}
         {19872A4C-3C9A-4C62-A33B-74F5B8D6F77C} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2}
         {C2CC1596-3BEE-43EA-A9BE-4EDE5716296C} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2}
+        {79409163-5006-405D-AC96-406FA0AD77B7} = {4DAF9366-855F-46BB-AE4C-660C92FA0697}
+        {932520DF-D312-415A-A128-1117F8221D68} = {12AE5B4B-CB1A-498E-83B8-04E201E31D86}
+        {C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA} = {12AE5B4B-CB1A-498E-83B8-04E201E31D86}
+        {3C6F049E-3EE8-4D66-9AFF-E8A369032487} = {1129FE25-466B-4F4F-85FC-3752664245E1}
+        {BB5BB244-E7D2-4368-8C18-C1C0ED1E12D1} = {3E408077-E73E-45CE-A53A-EF5F9DAE4B46}
     EndGlobalSection
 EndGlobal

NetAdmin.sln.DotSettings

@@ -27,6 +27,256 @@
     <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
     <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
     <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_RECORD_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AD/@EntryIndexedValue">AD</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AE/@EntryIndexedValue">AE</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AF/@EntryIndexedValue">AF</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AG/@EntryIndexedValue">AG</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AI/@EntryIndexedValue">AI</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AL/@EntryIndexedValue">AL</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AM/@EntryIndexedValue">AM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AO/@EntryIndexedValue">AO</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AQ/@EntryIndexedValue">AQ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AR/@EntryIndexedValue">AR</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AS/@EntryIndexedValue">AS</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AT/@EntryIndexedValue">AT</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AU/@EntryIndexedValue">AU</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AW/@EntryIndexedValue">AW</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AX/@EntryIndexedValue">AX</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AZ/@EntryIndexedValue">AZ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BA/@EntryIndexedValue">BA</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BB/@EntryIndexedValue">BB</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BD/@EntryIndexedValue">BD</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BE/@EntryIndexedValue">BE</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BF/@EntryIndexedValue">BF</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BG/@EntryIndexedValue">BG</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BH/@EntryIndexedValue">BH</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BI/@EntryIndexedValue">BI</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BJ/@EntryIndexedValue">BJ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BL/@EntryIndexedValue">BL</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BM/@EntryIndexedValue">BM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BN/@EntryIndexedValue">BN</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BO/@EntryIndexedValue">BO</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BQ/@EntryIndexedValue">BQ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BR/@EntryIndexedValue">BR</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BS/@EntryIndexedValue">BS</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BT/@EntryIndexedValue">BT</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BV/@EntryIndexedValue">BV</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BW/@EntryIndexedValue">BW</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BY/@EntryIndexedValue">BY</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BZ/@EntryIndexedValue">BZ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CA/@EntryIndexedValue">CA</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CC/@EntryIndexedValue">CC</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CD/@EntryIndexedValue">CD</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CF/@EntryIndexedValue">CF</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CG/@EntryIndexedValue">CG</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CH/@EntryIndexedValue">CH</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CI/@EntryIndexedValue">CI</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CK/@EntryIndexedValue">CK</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CL/@EntryIndexedValue">CL</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CM/@EntryIndexedValue">CM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CN/@EntryIndexedValue">CN</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CO/@EntryIndexedValue">CO</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CR/@EntryIndexedValue">CR</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CU/@EntryIndexedValue">CU</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CV/@EntryIndexedValue">CV</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CW/@EntryIndexedValue">CW</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CX/@EntryIndexedValue">CX</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CY/@EntryIndexedValue">CY</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CZ/@EntryIndexedValue">CZ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DE/@EntryIndexedValue">DE</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DJ/@EntryIndexedValue">DJ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DK/@EntryIndexedValue">DK</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DM/@EntryIndexedValue">DM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DO/@EntryIndexedValue">DO</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DZ/@EntryIndexedValue">DZ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EC/@EntryIndexedValue">EC</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EE/@EntryIndexedValue">EE</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EG/@EntryIndexedValue">EG</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EH/@EntryIndexedValue">EH</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ER/@EntryIndexedValue">ER</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ES/@EntryIndexedValue">ES</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ET/@EntryIndexedValue">ET</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FI/@EntryIndexedValue">FI</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FJ/@EntryIndexedValue">FJ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FK/@EntryIndexedValue">FK</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FM/@EntryIndexedValue">FM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FO/@EntryIndexedValue">FO</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FR/@EntryIndexedValue">FR</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GA/@EntryIndexedValue">GA</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GB/@EntryIndexedValue">GB</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GD/@EntryIndexedValue">GD</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GE/@EntryIndexedValue">GE</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GF/@EntryIndexedValue">GF</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GG/@EntryIndexedValue">GG</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GH/@EntryIndexedValue">GH</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GI/@EntryIndexedValue">GI</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GM/@EntryIndexedValue">GM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GN/@EntryIndexedValue">GN</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GP/@EntryIndexedValue">GP</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GQ/@EntryIndexedValue">GQ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GR/@EntryIndexedValue">GR</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GS/@EntryIndexedValue">GS</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GT/@EntryIndexedValue">GT</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GU/@EntryIndexedValue">GU</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GW/@EntryIndexedValue">GW</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GY/@EntryIndexedValue">GY</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HK/@EntryIndexedValue">HK</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HM/@EntryIndexedValue">HM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HN/@EntryIndexedValue">HN</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HR/@EntryIndexedValue">HR</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HT/@EntryIndexedValue">HT</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HU/@EntryIndexedValue">HU</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IE/@EntryIndexedValue">IE</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IM/@EntryIndexedValue">IM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IN/@EntryIndexedValue">IN</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IO/@EntryIndexedValue">IO</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IQ/@EntryIndexedValue">IQ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IR/@EntryIndexedValue">IR</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IS/@EntryIndexedValue">IS</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IT/@EntryIndexedValue">IT</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JE/@EntryIndexedValue">JE</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JM/@EntryIndexedValue">JM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JO/@EntryIndexedValue">JO</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JP/@EntryIndexedValue">JP</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KE/@EntryIndexedValue">KE</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KG/@EntryIndexedValue">KG</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KH/@EntryIndexedValue">KH</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KI/@EntryIndexedValue">KI</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KM/@EntryIndexedValue">KM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KN/@EntryIndexedValue">KN</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KP/@EntryIndexedValue">KP</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KR/@EntryIndexedValue">KR</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KW/@EntryIndexedValue">KW</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KY/@EntryIndexedValue">KY</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KZ/@EntryIndexedValue">KZ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LA/@EntryIndexedValue">LA</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LB/@EntryIndexedValue">LB</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LC/@EntryIndexedValue">LC</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LI/@EntryIndexedValue">LI</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LK/@EntryIndexedValue">LK</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LR/@EntryIndexedValue">LR</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LS/@EntryIndexedValue">LS</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LT/@EntryIndexedValue">LT</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LU/@EntryIndexedValue">LU</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LV/@EntryIndexedValue">LV</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LY/@EntryIndexedValue">LY</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MA/@EntryIndexedValue">MA</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MC/@EntryIndexedValue">MC</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ME/@EntryIndexedValue">ME</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MF/@EntryIndexedValue">MF</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MG/@EntryIndexedValue">MG</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MH/@EntryIndexedValue">MH</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MK/@EntryIndexedValue">MK</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ML/@EntryIndexedValue">ML</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MM/@EntryIndexedValue">MM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MN/@EntryIndexedValue">MN</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MO/@EntryIndexedValue">MO</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MP/@EntryIndexedValue">MP</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MQ/@EntryIndexedValue">MQ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MR/@EntryIndexedValue">MR</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MS/@EntryIndexedValue">MS</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MT/@EntryIndexedValue">MT</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MU/@EntryIndexedValue">MU</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MV/@EntryIndexedValue">MV</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MW/@EntryIndexedValue">MW</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MX/@EntryIndexedValue">MX</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MY/@EntryIndexedValue">MY</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MZ/@EntryIndexedValue">MZ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NA/@EntryIndexedValue">NA</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NC/@EntryIndexedValue">NC</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NE/@EntryIndexedValue">NE</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NF/@EntryIndexedValue">NF</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NG/@EntryIndexedValue">NG</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NI/@EntryIndexedValue">NI</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NL/@EntryIndexedValue">NL</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NO/@EntryIndexedValue">NO</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NP/@EntryIndexedValue">NP</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NR/@EntryIndexedValue">NR</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NU/@EntryIndexedValue">NU</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NZ/@EntryIndexedValue">NZ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OM/@EntryIndexedValue">OM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OTP/@EntryIndexedValue">OTP</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PA/@EntryIndexedValue">PA</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PE/@EntryIndexedValue">PE</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PF/@EntryIndexedValue">PF</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PG/@EntryIndexedValue">PG</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PH/@EntryIndexedValue">PH</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PK/@EntryIndexedValue">PK</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PL/@EntryIndexedValue">PL</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PM/@EntryIndexedValue">PM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PN/@EntryIndexedValue">PN</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PR/@EntryIndexedValue">PR</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PS/@EntryIndexedValue">PS</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PT/@EntryIndexedValue">PT</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PW/@EntryIndexedValue">PW</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PY/@EntryIndexedValue">PY</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QA/@EntryIndexedValue">QA</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RE/@EntryIndexedValue">RE</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RO/@EntryIndexedValue">RO</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RS/@EntryIndexedValue">RS</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RU/@EntryIndexedValue">RU</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RW/@EntryIndexedValue">RW</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SA/@EntryIndexedValue">SA</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SB/@EntryIndexedValue">SB</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SC/@EntryIndexedValue">SC</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SD/@EntryIndexedValue">SD</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SE/@EntryIndexedValue">SE</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SG/@EntryIndexedValue">SG</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SH/@EntryIndexedValue">SH</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SI/@EntryIndexedValue">SI</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SJ/@EntryIndexedValue">SJ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SK/@EntryIndexedValue">SK</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SL/@EntryIndexedValue">SL</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SM/@EntryIndexedValue">SM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SN/@EntryIndexedValue">SN</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SO/@EntryIndexedValue">SO</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SR/@EntryIndexedValue">SR</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ST/@EntryIndexedValue">ST</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SV/@EntryIndexedValue">SV</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SX/@EntryIndexedValue">SX</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SY/@EntryIndexedValue">SY</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SZ/@EntryIndexedValue">SZ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TC/@EntryIndexedValue">TC</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TD/@EntryIndexedValue">TD</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TF/@EntryIndexedValue">TF</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TG/@EntryIndexedValue">TG</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TH/@EntryIndexedValue">TH</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TJ/@EntryIndexedValue">TJ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TL/@EntryIndexedValue">TL</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TM/@EntryIndexedValue">TM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TN/@EntryIndexedValue">TN</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TO/@EntryIndexedValue">TO</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TR/@EntryIndexedValue">TR</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TT/@EntryIndexedValue">TT</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TV/@EntryIndexedValue">TV</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TW/@EntryIndexedValue">TW</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TZ/@EntryIndexedValue">TZ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UA/@EntryIndexedValue">UA</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UG/@EntryIndexedValue">UG</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UM/@EntryIndexedValue">UM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=US/@EntryIndexedValue">US</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UY/@EntryIndexedValue">UY</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UZ/@EntryIndexedValue">UZ</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VA/@EntryIndexedValue">VA</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VC/@EntryIndexedValue">VC</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VE/@EntryIndexedValue">VE</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VG/@EntryIndexedValue">VG</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VI/@EntryIndexedValue">VI</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VN/@EntryIndexedValue">VN</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VU/@EntryIndexedValue">VU</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WF/@EntryIndexedValue">WF</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WS/@EntryIndexedValue">WS</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=YE/@EntryIndexedValue">YE</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=YT/@EntryIndexedValue">YT</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ZA/@EntryIndexedValue">ZA</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ZM/@EntryIndexedValue">ZM</s:String>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ZW/@EntryIndexedValue">ZW</s:String>
     <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=15b5b1f1_002D457c_002D4ca6_002Db278_002D5615aedc07d3/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
     <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=236f7aa5_002D7b06_002D43ca_002Dbf2a_002D9b31bfcff09a/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="CONSTANT_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="AA_BB" /&gt;&lt;/Policy&gt;</s:String>
     <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=669e5282_002Dfb4b_002D4e90_002D91e7_002D07d269d04b60/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Constant fields (not private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="CONSTANT_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;&lt;/Policy&gt;</s:String>
@@ -78,6 +328,7 @@
     <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
     <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
     <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+    <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
     <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
     <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
 

README.md

@@ -1,20 +1,20 @@
 # NetAdmin
 
-通用后台权限管理系统、快速开发框架（基于C#12/.NET9、Vue3/Vite、Element Plus等现代技术构建，具有十分整洁、优雅的编码规范）
+通用后台权限管理系统、快速开发框架（基于C#13/.NET9、Vue3/Vite、ElementPlus等现代技术构建，具有十分整洁、优雅的编码规范）
 
 [![.NET](https://github.com/nsnail/NetAdmin/actions/workflows/nightly-build.yml/badge.svg)](https://github.com/nsnail/NetAdmin/actions/workflows/nightly-build.yml)
 [![MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/nsnail/NetAdmin/blob/main/LICENSE)
-[![Furion](https://img.shields.io/badge/Furion-4.x-blueviolet.svg)](https://github.com/nsnail/NetAdmin/blob/main/LICENSE)
 [![FreeSql](https://img.shields.io/badge/FreeSql-3.x-orange.svg)](https://github.com/nsnail/NetAdmin/blob/main/LICENSE)
 
 ## 在线预览
 
-http://na.yaopy.com （演示站点仅300kbps带宽，访问较慢）
+https://na.tools92.top
 
 ## 一键运行
 
 ```shell
 docker run -p 8080:8080 nsnail/netadmin
+# 需魔法上网
 ```
 
 ## 构建步骤
@@ -27,14 +27,16 @@ 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,51 +47,59 @@ 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工具）"]
+host["<b>NetAdmin.Host</b>\n框架：主机层\n（.Net自托管主机程序）\n（输入输出格式化）\n（数据校验、鉴权）\n（...所有HTTP管道过滤器中间件）"]
-
+cache["<b>NetAdmin.Cache</b>\n框架：缓存层\n（基于Redis或MemoryCache的缓存策略实现）"]
-XH["NetAdmin.XXX.Host\n（WebApi）"]-->H
+app["<b>NetAdmin.Application</b>\n框架：业务应用层\n（内部服务增删改查）\n（外部服务增删改查）\n（...所有业务用例的计算与组合逻辑的模块化）"]
-XS["NetAdmin.XXXService\n（常驻内存服务）"]-->H
+domain["<b>NetAdmin.Domain</b>\n框架：数据实体层\n（数据库关系实体映射）\n（DTO数据传输对象）\n（...所有数据模型的抽象与封装）"]
-XS["NetAdmin.XXXService\n（常驻内存服务）"]-->XC
+infra["<b>NetAdmin.Infrastructure</b>\n框架：基础设施层\n（第三方组件和Nuget包引用）\n（公共构建和程序运行配置）\n（公共常量枚举异常定义）\n（全球化化和多语言）\n（...所有公共Utility工具）"]
-XC["NetAdmin.XXX.Cache\n（缓存层实例）"]-->C
+biz-host["YourSolution.XXX.Host\n业务实例：主机层"]
-XA["NetAdmin.XXX.Application\n（业务逻辑层实例）"]-->A
+biz-cache["YourSolution.XXX.Cache\n业务实例：缓存层"]
-
+biz-app["YourSolution.XXX.Application\n业务实例：应用层"]
-XH-->XC
+biz-domain["YourSolution.XXX.Domain\n业务实例：数据实体层"]
-XC-->XA
+biz-infra["YourSolution.XXX.Infrastructure\n业务实例：基础设施层"]
+biz-host-->biz-cache-->biz-app-->biz-domain-->biz-infra
+sys-host-->sys-cache-->sys-app-->domain-->infra
+host-->cache-->app-->domain-->infra
+biz-host-->sys-host-->host
+biz-cache-->sys-cache-->cache
+biz-app-->sys-app-->app
+biz-domain-->domain
+biz-infra-->infra
 ```
 
-## 引用的开源代码 / 特别鸣谢
+## 特别鸣谢
 
 | 语言         | 集成领域          | 开源库                                                                                                                                                                                                                   |
 |------------|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | C#         | Web基础框架       | [ASP.NET Core](https://github.com/dotnet/aspnetcore)                                                                                                                                                                  |
-| C#         | 快速开发脚手架       | [Furion](https://gitee.com/dotnetchina/Furion)                                                                                                                                                                        |
 | 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)                                                                                                                                                       |
@@ -97,11 +107,9 @@ 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)                                                                                                                                                          |
+| TypeScript | UI控件库         | [ElementPlus](https://github.com/element-plus/element-plus)                                                                                                                                                           |
 | TypeScript | CSS解析器        | [Sass](https://github.com/sass/sass)                                                                                                                                                                                  |
 | TypeScript | 图表和数据可视化      | [ECharts](https://github.com/apache/echarts)                                                                                                                                                                          |
 | JavaScript | 后台管理界面        | [SCUI](https://gitee.com/lolicode/scui)                                                                                                                                                                               |
@@ -109,4 +117,4 @@ XC-->XA
 | JavaScript | JavaScript解析器 | [Terser](https://github.com/terser/terser)                                                                                                                                                                            |
 | JavaScript | 代码质量检查        | [ESLint](https://github.com/eslint/eslint)                                                                                                                                                                            |
 | JavaScript | 代码格式化工具       | [Prettier](https://github.com/prettier/prettier)                                                                                                                                                                      |
-| JavaScript | 标准加密库         | [crypto-js](https://github.com/brix/crypto-js)                                                                                                                                                                        |
+| JavaScript | 标准加密库         | [crypto-js](https://github.com/brix/crypto-js)                                                                                                                                                                        |

assets/res/CountryCodes.ln

@@ -0,0 +1,249 @@
+不丹
+东帝汶
+中国
+中非
+丹麦
+乌克兰
+乌兹别克斯坦
+乌干达
+乌拉圭
+乍得
+也门
+亚美尼亚
+以色列
+伊拉克
+伊朗
+伯利兹
+佛得角
+俄罗斯
+保加利亚
+克罗地亚
+关岛
+冈比亚
+冰岛
+几内亚
+几内亚比绍
+列支敦士登
+刚果共和国
+刚果民主共和国
+利比亚
+利比里亚
+加拿大
+加纳
+加蓬
+匈牙利
+北马其顿
+北马里亚纳群岛
+南乔治亚和南桑威奇群岛
+南极洲
+南苏丹
+南非
+博茨瓦纳
+卡塔尔
+卢旺达
+卢森堡
+印度
+印度尼西亚
+危地马拉
+厄瓜多尔
+厄立特里亚
+叙利亚
+古巴
+台湾
+吉尔吉斯斯坦
+吉布提
+哈萨克斯坦
+哥伦比亚
+哥斯达黎加
+喀麦隆
+图瓦卢
+土库曼斯坦
+土耳其
+圣卢西亚
+圣基茨和尼维斯
+圣多美和普林西比
+圣巴泰勒米
+圣文森特和格林纳丁斯
+圣皮埃尔和密克隆
+圣诞岛
+圣赫勒拿
+圣马力诺
+圭亚那
+坦桑尼亚
+埃及
+埃塞俄比亚
+基里巴斯
+塔吉克斯坦
+塞内加尔
+塞尔维亚
+塞拉利昂
+塞浦路斯
+塞舌尔
+墨西哥
+多哥
+多米尼克
+多米尼加
+奥兰
+奥地利
+委内瑞拉
+孟加拉国
+安哥拉
+安圭拉
+安提瓜和巴布达
+安道尔
+密克罗尼西亚联邦
+尼加拉瓜
+尼日利亚
+尼日尔
+尼泊尔
+巴勒斯坦
+巴哈马
+巴基斯坦
+巴巴多斯
+巴布亚新几内亚
+巴拉圭
+巴拿马
+巴林
+巴西
+布基纳法索
+布隆迪
+布韦岛
+希腊
+帕劳
+库克群岛
+库拉索
+开曼群岛
+德国
+意大利
+所罗门群岛
+托克劳
+拉脱维亚
+挪威
+捷克
+摩尔多瓦
+摩洛哥
+摩纳哥
+文莱
+斐济
+斯威士兰
+斯洛伐克
+斯洛文尼亚
+斯瓦尔巴和扬马延
+斯里兰卡
+新加坡
+新喀里多尼亚
+新西兰
+日本
+智利
+朝鲜
+柬埔寨
+根西
+格林纳达
+格陵兰
+格鲁吉亚
+梵蒂冈
+比利时
+毛里塔尼亚
+毛里求斯
+汤加
+沙特阿拉伯
+法国
+法属南部和南极领地
+法属圣马丁
+法属圭亚那
+法属波利尼西亚
+法罗群岛
+波兰
+波多黎各
+波黑
+泰国
+泽西
+津巴布韦
+洪都拉斯
+海地
+澳大利亚
+澳门
+爱尔兰
+爱沙尼亚
+牙买加
+特克斯和凯科斯群岛
+特立尼达和多巴哥
+玻利维亚
+瑙鲁
+瑞典
+瑞士
+瓜德罗普
+瓦利斯和富图纳
+瓦努阿图
+留尼汪
+白俄罗斯
+百慕大
+皮特凯恩群岛
+直布罗陀
+福克兰群岛
+科威特
+科摩罗
+科特迪瓦
+科科斯基林群岛
+秘鲁
+突尼斯
+立陶宛
+索马里
+约旦
+纳米比亚
+纽埃
+缅甸
+罗马尼亚
+美国
+美国本土外小岛屿
+美属维尔京群岛
+美属萨摩亚
+老挝
+肯尼亚
+芬兰
+苏丹
+苏里南
+英国
+英属印度洋领地
+英属维尔京群岛
+荷兰
+荷兰加勒比区
+荷属圣马丁
+莫桑比克
+莱索托
+菲律宾
+萨尔瓦多
+萨摩亚
+葡萄牙
+蒙古
+蒙特塞拉特
+西撒哈拉
+西班牙
+诺福克岛
+贝宁
+赞比亚
+赤道几内亚
+赫德岛和麦克唐纳群岛
+越南
+阿塞拜疆
+阿富汗
+阿尔及利亚
+阿尔巴尼亚
+阿曼
+阿根廷
+阿联酋
+阿鲁巴
+韩国
+香港
+马尔代夫
+马恩岛
+马拉维
+马提尼克
+马来西亚
+马约特
+马绍尔群岛
+马耳他
+马达加斯加
+马里
+黎巴嫩
+黑山

assets/res/NetAdmin.Fields.ln

@@ -1,3 +1,7 @@
+上次执行时间
+上次执行状态
+上次执行耗时
+下次执行时间
 不为其中之一
 不以什么开始
 不以什么结束
@@ -8,8 +12,11 @@
 中专
 中共党员
 为其中之一
+人工审核
 以什么开始
 以什么结束
+作业名称
+作业状态
 保密
 信息
 倒序排序
@@ -17,6 +24,7 @@
 公告
 共青团员
 出生证
+创建时间
 初中
 删除
 包含
@@ -24,13 +32,19 @@
 博士后
 发送失败
 同步数据库结构
+响应体
+响应状态码
+唯一编码
+备注
 外国人居留证
 外部错误
 大专
 大于
 大于等于
 女
+字典内容导出
 宕机
+客户端IP
 小于
 小于等于
 小学
@@ -41,14 +55,33 @@
 并且
 成功
 或者
+所属角色
+所属部门
 手机
+手机号
+执行耗时
+执行计划
 护照
 指定部门数据
 按钮
+排序
+接口名称
+接口导出
+接口描述
+接口路径
 插入种子数据
+操作系统
+数据范围
+文档内容
+文档内容导出
+文档标题
 无效操作
 无效输入
+无限权限
 日期范围
+是否启用
+显示仪表板
+最后登录时间
 未处理异常
 未婚
 未读
@@ -59,13 +92,23 @@
 框架
 比较数据库结构
 注册
+消息主题
+消息摘要
+消息类型
 港澳台通行证
+用户代理
+用户名
+用户导出
 电子邮箱
 男
 登录
+登录名
+登录日志导出
 硕士
+示例导出
 离异
 空闲
+站内信导出
 等于
 等待发送
 管理模块
@@ -76,16 +119,31 @@
 自定义
 范围
 菜单
+角色名称
+角色导出
 解绑手机号码
 警告
+计划作业导出
+计划作业执行记录导出
+请求方式
+请求日志导出
 调试
 跟踪
+跟踪标识
 身份证
 运行
 通知
+邮箱号
+部门名称
+部门导出
+配置导出
 重设密码
 链接
 错误
 随机排序
+项值
+项名
 顺序排序
-高中
+高中
+默认角色
+默认部门

assets/res/NetAdmin.Statements.ln

@@ -21,6 +21,7 @@ XML注释文件不存在
 字典目录编号不能为空
 字典编码不能为空
 学历不正确
+完全公开
 密码不能为空
 已处理完毕
 并发冲突_请稍后重试
@@ -35,6 +36,12 @@ XML注释文件不存在
 数据库服务器时钟偏移
 数据库结构同步完成
 文件不能为空
+文档内容不能为空
+文档分类不存在
+文档分类名称不能为空
+文档分类编号不能为空
+文档分类编码不能为空
+文档标题不能为空
 新密码不能为空
 新手机号码验证码不正确
 无效端口号
@@ -47,8 +54,11 @@ XML注释文件不存在
 时间计划不能为空
 未指定部门
 未获取到待执行任务
+档案可见性不正确
 模块名称不能为空
+模块类型不能为空
 模块说明不能为空
+此节点已下线
 民族不正确
 消息主题不能为空
 消息内容不能为空
@@ -60,12 +70,16 @@ XML注释文件不存在
 用户名长度4位以上
 用户头像不能为空
 用户编号不存在
+登录用户
 目标设备不能为空
 短信验证请求不能为空
+种子数据插入完成
 站内信不存在
 站内信状态不正确
 站内信类型不正确
+缓存键不能为空
 网络地址不正确
+自己可见
 菜单名称不能为空
 菜单标题不能为空
 菜单类型不正确
@@ -75,6 +89,7 @@ XML注释文件不存在
 角色数据范围不正确
 角色编号不能为空
 角色编号列表不能为空
+记录已存在
 设备类型不能为空
 证件类型不正确
 该角色下存在用户
@@ -83,16 +98,21 @@ XML注释文件不存在
 请求地址不能为空
 请求对象不能为空
 请求方法不正确
+请稍后重试
 请联系管理员激活账号
 读取用户令牌出错
 账号不能为空
 邀请码不正确
 邮箱验证码不正确
 部门不存在
+部门可见
 部门名称不能为空
 配置文件初始化完毕
 键值不能为空
 键名称不能为空
+随机延时结束时间不正确
+随机延时起始时间不正确
+非JSON字符串
 验证数据不能为空
 验证码不正确
 验证码不能为空

assets/seed-data/Sys_Job.json

@@ -4,7 +4,7 @@
     "ExecutionCron": "0 * * * * ?",
     "HttpMethod": 3,
     "JobName": "HTTP 请求测试",
-    "NextExecTime": "2020/9/13 12:26:40",
+    "NextExecTime": "2020-09-13 12:26:40",
     "NextTimeId": 1600000000,
     "RequestUrl": "https://httpbin.org/ip",
     "Status": 1,

assets/seed-data/Sys_Menu.json

@@ -140,13 +140,34 @@
     "Title": "缓存管理",
     "Type": 1
   },
+  // ------------------------------  档案管理 ------------------------------
+  {
+    "Icon": "sc-icon-Archive",
+    "Id": 616214756757512,
+    "Name": "archive",
+    "Path": "/archive",
+    "Sort": 98,
+    "Title": "档案管理",
+    "Type": 1
+  },
+  {
+    "Component": "sys/doc",
+    "Icon": "el-icon-document",
+    "Id": 616214756757516,
+    "Name": "archive/doc",
+    "ParentId": 616214756757512,
+    "Path": "/archive/doc",
+    "Sort": 100,
+    "Title": "文档管理",
+    "Type": 1
+  },
   // ------------------------------  日志管理 ------------------------------
   {
     "Icon": "el-icon-tickets",
     "Id": 374792687640581,
     "Name": "log",
     "Path": "/log",
-    "Sort": 98,
+    "Sort": 97,
     "Title": "日志管理",
     "Type": 1
   },
@@ -178,7 +199,7 @@
     "Id": 373838105399301,
     "Name": "dev",
     "Path": "/dev",
-    "Sort": 97,
+    "Sort": 96,
     "Title": "开发管理",
     "Type": 1
   },
@@ -198,7 +219,7 @@
     "ParentId": 373838105399301,
     "Icon": "el-icon-eleme-filled",
     "Name": "dev/element",
-    "Path": "http://element-plus.org/zh-CN/component/overview.html",
+    "Path": "https://element-plus.org/zh-CN/component/overview.html",
     "Sort": 99,
     "Title": "Element",
     "Type": 3,

assets/seed-data/Sys_Role.json

@@ -9,7 +9,7 @@
     "Sort": 100
   },
   {
-    "DataScope": 1,
+    "DataScope": 4,
     "Enabled": true,
     "Id": 371729946431493,
     "Name": "普通用户",

assets/seed-data/Sys_RoleMenu.json

@@ -1,11 +1,9 @@
 [
   {
-    "Id": 396423792566281,
     "MenuId": 373837717815301,
     "RoleId": 371729946431493
   },
   {
-    "Id": 396423792566282,
     "MenuId": 374967228141573,
     "RoleId": 371729946431493
   }

assets/seed-data/Sys_SiteMsg.json

@@ -1,10 +1,10 @@
 [
   {
-    "Content": "<p>尊敬的用户：</p>\n<p style=\"padding-left: 40px;\">欢迎您使用 NetAdmin 后台管理系统！NetAdmin 是一款通用后台权限管理系统和快速开发框架，它基于 C#12/.NET9、Vue3/Vite、Element Plus 等现代技术构建，具有十分整洁、优雅的编码规范。</p>\n<p style=\"padding-left: 40px;\">NetAdmin 致力于为企业提供高效、安全、易用的解决方案，帮助您快速构建出符合业务需求的应用程序。系统提供了丰富的功能模块，包括用户管理、权限管理、日志管理、文件上传等，可以满足您日常管理的需求。</p>\n<p style=\"padding-left: 40px;\">在使用 NetAdmin 的过程中，我们真诚地希望您能够遵守以下规定：</p>\n<p style=\"padding-left: 80px;\">1. 不得利用 NetAdmin 进行非法活动或者侵犯他人权益；</p>\n<p style=\"padding-left: 80px;\">2. 不得对 NetAdmin 系统进行恶意攻击或者破坏；</p>\n<p style=\"padding-left: 80px;\">3. 不得将 NetAdmin 系统的任何部分用于商业目的或者未经授权的访问。</p>\n<p style=\"padding-left: 80px;\">4. 为了更好地为您提供服务，NetAdmin 将不断进行优化和升级，同时也欢迎您提出宝贵的意见和建议。如果您在使用过程中遇到任何问题，可以通过官方网站或者技术支持团队进行咨询和解决。</p>\n<p style=\"padding-left: 40px;\">再次感谢您对 NetAdmin 的信任和支持！我们相信，在您的使用过程中，NetAdmin 一定会成为您的得力助手，为您的事业发展提供强有力的支持！</p>\n<p style=\"text-align: right;\">NetAdmin 开发团队</p>",
+    "Content": "<p>尊敬的用户：</p>\n<p style=\"padding-left: 40px;\">欢迎您使用 NetAdmin 后台管理系统！NetAdmin 是一款通用后台权限管理系统和快速开发框架，它基于 C#13/.NET9、Vue3/Vite、ElementPlus 等现代技术构建，具有十分整洁、优雅的编码规范。</p>\n<p style=\"padding-left: 40px;\">NetAdmin 致力于为企业提供高效、安全、易用的解决方案，帮助您快速构建出符合业务需求的应用程序。系统提供了丰富的功能模块，包括用户管理、权限管理、日志管理、文件上传等，可以满足您日常管理的需求。</p>\n<p style=\"padding-left: 40px;\">在使用 NetAdmin 的过程中，我们真诚地希望您能够遵守以下规定：</p>\n<p style=\"padding-left: 80px;\">1. 不得利用 NetAdmin 进行非法活动或者侵犯他人权益；</p>\n<p style=\"padding-left: 80px;\">2. 不得对 NetAdmin 系统进行恶意攻击或者破坏；</p>\n<p style=\"padding-left: 80px;\">3. 不得将 NetAdmin 系统的任何部分用于商业目的或者未经授权的访问。</p>\n<p style=\"padding-left: 80px;\">4. 为了更好地为您提供服务，NetAdmin 将不断进行优化和升级，同时也欢迎您提出宝贵的意见和建议。如果您在使用过程中遇到任何问题，可以通过官方网站或者技术支持团队进行咨询和解决。</p>\n<p style=\"padding-left: 40px;\">再次感谢您对 NetAdmin 的信任和支持！我们相信，在您的使用过程中，NetAdmin 一定会成为您的得力助手，为您的事业发展提供强有力的支持！</p>\n<p style=\"text-align: right;\">NetAdmin 开发团队</p>",
     "CreatedUserId": 370942943322181,
     "CreatedUserName": "root",
     "MsgType": 2,
-    "Summary": "尊敬的用户：\n欢迎您使用 NetAdmin 后台管理系统！NetAdmin 是一款通用后台权限管理系统和快速开发框架，它基于 C#12/.NET9、Vue3/Vite、Element Plus 等现代",
+    "Summary": "尊敬的用户：\n欢迎您使用 NetAdmin 后台管理系统！NetAdmin 是一款通用后台权限管理系统和快速开发框架，它基于 C#13/.NET9、Vue3/Vite、ElementPlus 等现代",
     "Title": "欢迎使用 NetAdmin 后台管理系统",
   }
 ]

assets/seed-data/Sys_UserProfile.json

@@ -1,8 +1,10 @@
 [
   {
-    "Id": 370942943322181
+    "Id": 370942943322181,
+    "AppConfig": "[]"
   },
   {
-    "Id": 560217289236492
+    "Id": 560217289236492,
+    "AppConfig": "[]"
   }
 ]

build/code.quality.props

@@ -15,15 +15,15 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.48">
+        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Roslynator.Analyzers" Version="4.12.4">
+        <PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="SonarAnalyzer.CSharp" Version="9.27.0.93347">
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="10.3.0.106239">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

build/prebuild.targets

@@ -9,22 +9,4 @@
               Command="dotnet t4 ./gen.cs.tt -o ../dist/backend/$(ProjectName)/Ln.cs"
               StdOutEncoding="utf-8" />
     </Target>
-    <ItemGroup>
-        <None Include="$(SolutionDir)/assets/res/Statements.ln">
-            <Link>Languages/Statements.ln</Link>
-        </None>
-        <None Include="$(SolutionDir)/assets/res/Nations.ln">
-            <Link>Languages/Nations.ln</Link>
-        </None>
-        <None Include="$(SolutionDir)/assets/res/Fields.ln">
-            <Link>Languages/Fields.ln</Link>
-        </None>
-        <EmbeddedResource Include="$(SolutionDir)/assets/res/Ln.resx">
-            <Link>Languages/Ln.resx</Link>
-            <Generator>PublicResXFileCodeGenerator</Generator>
-        </EmbeddedResource>
-        <Compile Include="$(SolutionDir)/dist/backend/$(ProjectName)/Ln.Designer.cs">
-            <Link>Languages/Ln.Designer.cs</Link>
-        </Compile>
-    </ItemGroup>
 </Project>

docker/README.md

@@ -0,0 +1 @@
+docker

dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-t4": {
-      "version": "2.3.1",
+      "version": "3.0.0",
       "commands": [
         "t4"
       ]

package.json

@@ -1,9 +1,9 @@
 {
-  "version": "1.3.0",
+  "version": "2.2.1",
   "devDependencies": {
-    "cz-git": "^1.9.2",
+    "cz-git": "^1.11.0",
-    "commitizen": "^4.3.0",
+    "commitizen": "^4.3.1",
-    "prettier": "^3.3.0",
+    "prettier": "^3.4.1",
     "standard-version": "^9.5.0"
   },
   "config": {

scripts/2.git.release.ps1

@@ -20,8 +20,10 @@ git tag -d $tag
 git tag $tag
 git push --tags origin release
 Start-Process -FilePath "https://github.com/nsnail/NetAdmin/compare/main...release"
-Write-Host "按『Enter』回到主分支，『Ctrl+C』退出"
+Write-Host "按『Enter』回到tk分支，『Ctrl+C』退出"
 Pause
 git checkout main
 git pull
-git branch -D release
+git branch -D release
+git branch -D tk
+git checkout -b tk

scripts/4.git.del.obsolete.tags.ps1

@@ -0,0 +1,2 @@
+git push origin :refs/tags/$(git tag -l "*-*")
+git tag -d $(git tag -l "*-*")

scripts/5.git.update.submodule.ps1

@@ -0,0 +1,3 @@
+git submodule update --progress --init --recursive --force --remote -- "../refs/Gurion"
+git submodule update --progress --init --recursive --force --remote -- "../refs/NetAdmin.FreeSql"
+git submodule update --progress --init --recursive --force --remote -- "../refs/ns-ext"

scripts/gen.resx.tt

@@ -1,6 +1,7 @@
 <#@ template language="C#" #>
 <#@ output encoding="utf-8" extension="resx" #>
 <#@ import namespace="System.IO" #>
+<#@ import namespace="System.Linq" #>
 <#@ import namespace="System.Text.RegularExpressions" #>
 <?xml version="1.0" encoding="utf-8"?>
 <root>
@@ -28,14 +29,11 @@
     </resheader>
    <#
     var regex = new Regex(@"^\d", RegexOptions.Compiled);
-    foreach (var file in Directory.GetFiles("../assets/res/", "*.ln"))
+    foreach (var line in Directory.GetFiles("../assets/res/", "*.ln").SelectMany(x => File.ReadLines(x)).Distinct())
     {
-        foreach (var line in File.ReadLines(file))
-        {
 #>
     <data name="<#= regex.IsMatch(line) ? "_" : "" #><#= line #>" xml:space="preserve"><value><#= line #></value></data>
 <#
-        }
     }
 #>
 </root>

scripts/rename.csx

@@ -1,12 +1,11 @@
-#r "nuget: NSExt, 2.1.0"
+#r "nuget: NSExt, 2.3.2"
 using NSExt.Extensions;
 
 Console.WriteLine("请输入原始名称（NetAdmin）：");
 var oldName = Console.ReadLine().NullOrEmpty("NetAdmin");
 Console.WriteLine("请输入替换名称：");
 var newName = Console.ReadLine();
-foreach (var path in Directory.EnumerateDirectories("../", $"*{oldName}*",
+foreach (var path in Directory.EnumerateDirectories("../", $"*{oldName}*", SearchOption.AllDirectories).Where(x => !x.Contains(".git")))
-             SearchOption.AllDirectories))
 {
     Console.Write($"{path} --> ");
     var newPath = path.Replace(oldName, newName);
@@ -16,7 +15,7 @@ foreach (var path in Directory.EnumerateDirectories("../", $"*{oldName}*",
 
 
 Console.WriteLine();
-foreach (var path in Directory.EnumerateFiles("../", $"*.*", SearchOption.AllDirectories))
+foreach (var path in Directory.EnumerateFiles("../", $"*.*", SearchOption.AllDirectories).Where(x => !x.Contains(".git")))
 {
     File.WriteAllText(path, File.ReadAllText(path).Replace(oldName, newName));
     var newPath = path.Replace(oldName, newName);

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.821-ns1"
-        },
-        {
-          "packageName": "FreeSql.DbContext.NS",
-          "version": "3.2.821-ns1"
-        }
-      ]
-    }
-  ]
-}

scripts/switcher.furion.json

@@ -1,17 +0,0 @@
-{
-  "solution": "NetAdmin.sln",
-  "mappings": {
-    "Furion.Pure.NS": "../refs/Furion/framework/Furion.Pure/Furion.Pure.csproj"
-  },
-  "restore": [
-    {
-      "name": "NetAdmin.Infrastructure",
-      "packages": [
-        {
-          "packageName": "Furion.Pure.NS",
-          "version": "4.9.4-ns1"
-        }
-      ]
-    }
-  ]
-}

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.1.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

scripts/sync.sln.files.csx

@@ -17,6 +17,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{5198A03D-0
 """
 );
 
+content = Regex.Replace(
+    content,
+    "Project\\(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\"\\) = \"docker\", \"docker\", \"{E80A1018-C354-4A26-9029-8847BB9DA864}\"(?:.|\n)*?EndProject",
+    $$"""
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker", "docker", "{E80A1018-C354-4A26-9029-8847BB9DA864}"
+    ProjectSection(SolutionItems) = preProject
+{{string.Join('\n',
+             Directory.GetFiles(@"../docker", "*")
+                      .Select(x=>$"        {Path.GetFileName(x)} = docker/{Path.GetFileName(x)}")
+                      )}}
+    EndProject
+"""
+);
+
 content = Regex.Replace(
     content,
     "Project\\(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\"\\) = \"workflows\", \"workflows\", \"{3C6F049E-3EE8-4D66-9AFF-E8A369032487}\"(?:.|\n)*?EndProject",
@@ -31,6 +45,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
 """
 );
 
+content = Regex.Replace(
+    content,
+    "Project\\(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\"\\) = \"workflows\", \"workflows\", \"{BB5BB244-E7D2-4368-8C18-C1C0ED1E12D1}\"(?:.|\n)*?EndProject",
+    $$"""
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{BB5BB244-E7D2-4368-8C18-C1C0ED1E12D1}"
+    ProjectSection(SolutionItems) = preProject
+{{string.Join('\n',
+             Directory.GetFiles(@"../.drone/workflows", "*")
+                      .Select(x=>$"        {Path.GetFileName(x)} = .drone/workflows/{Path.GetFileName(x)}")
+                      )}}
+    EndProject
+"""
+);
+
 content = Regex.Replace(
     content,
     "Project\\(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\"\\) = \"scripts\", \"scripts\", \"{BB0B25C9-0901-4923-913F-00F9A6B352A5}\"(?:.|\n)*?EndProject",

scripts/wait.server.stop.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# 检查是否提供了 URL 参数
+if [ -z "$1" ]; then
+    echo "Usage: $0 <url>"
+    exit 1
+fi
+
+# 获取外部传入的 URL 参数
+URL="$1"
+
+# 初始化返回值和时间限制
+response=""
+start_time=$(date +%s)
+time_limit=600  # 10分钟的秒数
+
+# 循环检查 API 返回值
+while [ "$response" != "1" ]; do
+    # 等待一段时间再进行下一次检查，避免频繁请求
+    sleep 1
+
+    # 使用 curl 请求 URL，并捕获返回值，忽略 SSL 证书错误
+    response=$(curl -sk "$URL")
+
+    # 打印返回值 (可选)
+    echo "$1: $response"
+
+    # 检查时间是否超过限制
+    current_time=$(date +%s)
+    elapsed_time=$((current_time - start_time))
+
+    if [ "$elapsed_time" -ge "$time_limit" ]; then
+        echo "Time limit exceeded. Continuing with the script..."
+        break
+    fi
+done
+
+# 无论是因为返回值为 "1" 还是超时，继续执行后续脚本
+echo "Continuing with the script..."

src/backend/GlobalUsings.cs

@@ -25,16 +25,16 @@ global using FreeSql;
 global using FreeSql.Aop;
 global using FreeSql.DataAnnotations;
 global using FreeSql.Internal.Model;
-global using Furion;
+global using Gurion;
-global using Furion.Authorization;
+global using Gurion.Authorization;
-global using Furion.ConfigurableOptions;
+global using Gurion.ConfigurableOptions;
-global using Furion.DataEncryption;
+global using Gurion.DataEncryption;
-global using Furion.DataValidation;
+global using Gurion.DataValidation;
-global using Furion.DependencyInjection;
+global using Gurion.DependencyInjection;
-global using Furion.DynamicApiController;
+global using Gurion.DynamicApiController;
-global using Furion.EventBus;
+global using Gurion.EventBus;
-global using Furion.SpecificationDocument;
+global using Gurion.SpecificationDocument;
-global using Furion.UnifyResult;
+global using Gurion.UnifyResult;
 global using Mapster;
 global using Microsoft.AspNetCore.Authorization;
 global using Microsoft.AspNetCore.Builder;
@@ -63,8 +63,4 @@ global using NetAdmin.Infrastructure.Extensions;
 global using NetAdmin.Infrastructure.Languages;
 global using NetAdmin.Infrastructure.Utils;
 global using NSExt.Attributes;
-global using NSExt.Extensions;
+global using NSExt.Extensions;
-#if !INFRAS
-global using DynamicFilterInfo = NetAdmin.Domain.Dto.Dependency.DynamicFilterInfo;
-global using DynamicFilterOperators = NetAdmin.Domain.Enums.DynamicFilterOperators;
-#endif

src/backend/NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj

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

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.SysComponent.Cache/NetAdmin.SysComponent.Cache.csproj"/>
-        <ProjectReference Include="../NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj"/>
-    </ItemGroup>
-</Project>

src/backend/NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj

@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-    <Import Project="$(SolutionDir)/build/code.quality.props"/>
-    <ItemGroup>
-        <EmbeddedResource Include="$(SolutionDir)/assets/captcha/**" LinkBase="Assets/Captcha"/>
-        <EmbeddedResource Include="$(SolutionDir)/CHANGELOG.md" LogicalName="CHANGELOG.md"/>
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="../NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj"/>
-        <ProjectReference Include="../NetAdmin.AdmServer.Cache/NetAdmin.AdmServer.Cache.csproj"/>
-    </ItemGroup>
-    <ItemGroup>
-        <None Update="*.json">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-    <ItemGroup Condition="'$(Configuration)' != 'Debug'">
-        <EmbeddedResource Include="../../../dist/frontend/admin/**/*" LinkBase="UI"/>
-    </ItemGroup>
-</Project>

src/backend/NetAdmin.AdmServer.Host/settings.Development.json

@@ -1 +0,0 @@
-{}

src/backend/NetAdmin.AdmServer.Host/settings.Test.json

@@ -1 +0,0 @@
-{}

src/backend/NetAdmin.AdmServer.Host/settings.json

@@ -1,45 +0,0 @@
-{
-  "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
-  "SpecificationDocumentSettings": {
-    "GroupOpenApiInfos": [
-      {
-        "Group": "Sys",
-        "Title": "系统组件",
-        "Description": "NetAdmin - 系统组件",
-      },
-      {
-        "Group": "Adm",
-        "Title": "管理服务",
-        "Description": "NetAdmin - 管理服务",
-      },
-      {
-        "Group": "Tpl",
-        "Visible": false,
-      },
-      {
-        "Group": "Probe",
-        "Visible": false,
-      }
-    ],
-    "SecurityDefinitions": [
-      {
-        "Id": "Bearer",
-        "Type": "ApiKey",
-        "Name": "Authorization",
-        "Description": "JWT Authorization header using the Bearer scheme.",
-        "BearerFormat": "JWT",
-        "Scheme": "bearer",
-        "In": "Header",
-        "Requirement": {
-          "Scheme": {
-            "Reference": {
-              "Id": "Bearer",
-              "Type": "SecurityScheme"
-            },
-            "Accesses": []
-          }
-        }
-      }
-    ]
-  }
-}

src/backend/NetAdmin.AdmServer.Tests/NetAdmin.AdmServer.Tests.csproj

@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <ItemGroup>
-        <ProjectReference Include="../NetAdmin.Tests/NetAdmin.Tests.csproj"/>
-        <ProjectReference Include="../NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj"/>
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0"/>
-    </ItemGroup>
-</Project>

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

@@ -1,31 +0,0 @@
-using NetAdmin.Application.Repositories;
-using NetAdmin.Domain.DbMaps.Dependency;
-using RedLockNet;
-
-namespace NetAdmin.Application.Services;
-
-/// <summary>
-///     RedLocker Service Base
-/// </summary>
-public abstract class RedLockerService<TEntity, TPrimary, TLogger>(
-    BasicRepository<TEntity, TPrimary> rpo
-  , RedLocker                          redLocker) : RepositoryService<TEntity, TPrimary, TLogger>(rpo)
-    where TEntity : EntityBase<TPrimary> //
-    where TPrimary : IEquatable<TPrimary>
-{
-    /// <summary>
-    ///     获取锁
-    /// </summary>
-    /// <exception cref="NetAdminGetLockerException">NetAdminGetLockerException</exception>
-    protected async Task<IRedLock> GetLockerAsync(string lockName)
-    {
-        // 加锁
-        var redLock = await redLocker.RedLockFactory.CreateLockAsync( //
-                                         lockName, TimeSpan.FromSeconds(Numbers.SECS_RED_LOCK_EXPIRY)
-                                       , TimeSpan.FromSeconds(Numbers.SECS_RED_LOCK_WAIT)
-                                       , TimeSpan.FromSeconds(Numbers.SECS_RED_LOCK_RETRY))
-                                     .ConfigureAwait(false);
-
-        return redLock.IsAcquired ? redLock : throw new NetAdminGetLockerException();
-    }
-}

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

@@ -1,100 +0,0 @@
-using NetAdmin.Application.Repositories;
-using NetAdmin.Domain.DbMaps.Dependency;
-using NetAdmin.Domain.DbMaps.Dependency.Fields;
-
-namespace NetAdmin.Application.Services;
-
-/// <summary>
-///     仓储服务基类
-/// </summary>
-/// <typeparam name="TEntity">实体类型</typeparam>
-/// <typeparam name="TPrimary">主键类型</typeparam>
-/// <typeparam name="TLogger">日志类型</typeparam>
-public abstract class RepositoryService<TEntity, TPrimary, TLogger>(BasicRepository<TEntity, TPrimary> rpo)
-    : ServiceBase<TLogger>
-    where TEntity : EntityBase<TPrimary> //
-    where TPrimary : IEquatable<TPrimary>
-{
-    /// <summary>
-    ///     默认仓储
-    /// </summary>
-    protected BasicRepository<TEntity, TPrimary> Rpo => rpo;
-
-    /// <summary>
-    ///     启用级联保存
-    /// </summary>
-    protected bool EnableCascadeSave {
-        get => Rpo.DbContextOptions.EnableCascadeSave;
-        set => Rpo.DbContextOptions.EnableCascadeSave = value;
-    }
-
-    /// <summary>
-    ///     更新实体
-    /// </summary>
-    /// <param name="newValue">新的值</param>
-    /// <param name="includeFields">包含的属性</param>
-    /// <param name="excludeFields">排除的属性</param>
-    /// <param name="whereExp">查询表达式</param>
-    /// <param name="whereSql">查询sql</param>
-    /// <param name="ignoreVersion">是否忽略版本锁</param>
-    /// <returns>更新行数</returns>
-    protected Task<int> UpdateAsync(                         //
-        TEntity                         newValue             //
-      , IEnumerable<string>             includeFields        //
-      , string[]                        excludeFields = null //
-      , Expression<Func<TEntity, bool>> whereExp      = null //
-      , string                          whereSql      = null //
-      , bool                            ignoreVersion = false)
-    {
-        // 默认匹配主键
-        whereExp ??= a => a.Id.Equals(newValue.Id);
-        var update = BuildUpdate(newValue, includeFields, excludeFields, ignoreVersion).Where(whereExp).Where(whereSql);
-        return update.ExecuteAffrowsAsync();
-    }
-
-    #if DBTYPE_SQLSERVER
-    /// <summary>
-    ///     更新实体
-    /// </summary>
-    /// <param name="newValue">新的值</param>
-    /// <param name="includeFields">包含的属性</param>
-    /// <param name="excludeFields">排除的属性</param>
-    /// <param name="whereExp">查询表达式</param>
-    /// <param name="ignoreVersion">是否忽略版本锁</param>
-    /// <returns>更新后的实体列表</returns>
-    protected Task<List<TEntity>> UpdateReturnListAsync(     //
-        TEntity                         newValue             //
-      , IEnumerable<string>             includeFields        //
-      , string[]                        excludeFields = null //
-      , Expression<Func<TEntity, bool>> whereExp = null //
-      , bool                            ignoreVersion = false)
-    {
-        // 默认匹配主键
-        whereExp ??= a => a.Id.Equals(newValue.Id);
-        return BuildUpdate(newValue, includeFields, excludeFields, ignoreVersion).Where(whereExp).ExecuteUpdatedAsync();
-    }
-    #endif
-
-    private IUpdate<TEntity> BuildUpdate(        //
-        TEntity             entity               //
-      , IEnumerable<string> includeFields        //
-      , string[]            excludeFields = null //
-      , bool                ignoreVersion = false)
-    {
-        var updateExp = includeFields == null
-            ? Rpo.UpdateDiy.SetSource(entity)
-            : Rpo.UpdateDiy.SetDto(includeFields!.ToDictionary(
-                                       x => x
-                                     , x => typeof(TEntity).GetProperty(x, BindingFlags.Public | BindingFlags.Instance)!
-                                                           .GetValue(entity)));
-        if (excludeFields != null) {
-            updateExp = updateExp.IgnoreColumns(excludeFields);
-        }
-
-        if (!ignoreVersion && entity is IFieldVersion ver) {
-            updateExp = updateExp.Where($"{nameof(IFieldVersion.Version)} = @version", new { version = ver.Version });
-        }
-
-        return updateExp;
-    }
-}

src/backend/NetAdmin.Domain/DbMaps/Dependency/MutableEntity.cs

@@ -1,34 +0,0 @@
-using NetAdmin.Domain.Attributes;
-using NetAdmin.Domain.DbMaps.Dependency.Fields;
-
-namespace NetAdmin.Domain.DbMaps.Dependency;
-
-/// <inheritdoc />
-public abstract record MutableEntity : MutableEntity<long>
-{
-    /// <inheritdoc cref="EntityBase{T}.Id" />
-    [Column(IsIdentity = false, IsPrimary = true, Position = 1)]
-    [Snowflake]
-    public override long Id { get; init; }
-}
-
-/// <summary>
-///     可变实体
-/// </summary>
-public abstract record MutableEntity<T> : LiteMutableEntity<T>, IFieldModifiedUser
-    where T : IEquatable<T>
-{
-    /// <inheritdoc cref="EntityBase{T}.Id" />
-    [Column(IsIdentity = false, IsPrimary = true, Position = 1)]
-    public override T Id { get; init; }
-
-    /// <inheritdoc cref="IFieldModifiedUser.ModifiedUserId" />
-    [Column(CanInsert = false, Position = -1)]
-    [JsonIgnore]
-    public long? ModifiedUserId { get; init; }
-
-    /// <inheritdoc cref="IFieldModifiedUser.ModifiedUserName" />
-    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_31, CanInsert = false, Position = -1)]
-    [JsonIgnore]
-    public string ModifiedUserName { get; init; }
-}

src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs

@@ -1,173 +0,0 @@
-using NetAdmin.Domain.DbMaps.Dependency;
-using NetAdmin.Domain.DbMaps.Dependency.Fields;
-
-namespace NetAdmin.Domain.DbMaps.Sys;
-
-/// <summary>
-///     请求日志表
-/// </summary>
-[Index(Chars.FLG_DB_INDEX_PREFIX             + nameof(ApiId),          nameof(ApiId),          false)]
-[Index(Chars.FLG_DB_INDEX_PREFIX             + nameof(CreatedTime),    nameof(CreatedTime),    false)]
-[Index(Chars.FLG_DB_INDEX_PREFIX             + nameof(UserId),         nameof(UserId),         false)]
-[Index(Chars.FLG_DB_INDEX_PREFIX             + nameof(HttpStatusCode), nameof(HttpStatusCode), false)]
-[Table(Name = Chars.FLG_DB_TABLE_NAME_PREFIX + nameof(Sys_RequestLog))]
-public record Sys_RequestLog : SimpleEntity, IFieldCreatedTime, IFieldCreatedClient
-{
-    /// <summary>
-    ///     接口
-    /// </summary>
-    [JsonIgnore]
-    [Navigate(nameof(ApiId))]
-    public Sys_Api Api { get; init; }
-
-    /// <summary>
-    ///     接口编号
-    /// </summary>
-    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)]
-    [JsonIgnore]
-    public virtual string ApiId { get; init; }
-
-    /// <inheritdoc />
-    [Column(Position = -1)]
-    [JsonIgnore]
-    public int? CreatedClientIp { get; init; }
-
-    /// <inheritdoc />
-    [Column(ServerTime = DateTimeKind.Local, CanUpdate = false, Position = -1)]
-    [JsonIgnore]
-    public virtual DateTime CreatedTime { get; init; }
-
-    /// <inheritdoc />
-    #if DBTYPE_SQLSERVER
-    [Column(Position = -1, DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_1022)]
-    #else
-    [Column(Position = -1, DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)]
-    #endif
-    [JsonIgnore]
-    public virtual string CreatedUserAgent { get; init; }
-
-    /// <summary>
-    ///     执行耗时（微秒）
-    /// </summary>
-    [Column]
-    [JsonIgnore]
-    public virtual long Duration { get; init; }
-
-    /// <summary>
-    ///     程序响应码
-    /// </summary>
-    [Column]
-    [JsonIgnore]
-    public virtual ErrorCodes ErrorCode { get; init; }
-
-    /// <summary>
-    ///     异常信息
-    /// </summary>
-    #if DBTYPE_SQLSERVER
-    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_MAX)]
-    #else
-    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)]
-    #endif
-    [JsonIgnore]
-    public virtual string Exception { get; init; }
-
-    /// <summary>
-    ///     HTTP状态码
-    /// </summary>
-    [Column]
-    [JsonIgnore]
-    public virtual int HttpStatusCode { get; init; }
-
-    /// <summary>
-    ///     请求方法
-    /// </summary>
-    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_15)]
-    [JsonIgnore]
-    public virtual string Method { get; init; }
-
-    /// <summary>
-    ///     请求内容
-    /// </summary>
-    #if DBTYPE_SQLSERVER
-    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_MAX)]
-    #else
-    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)]
-    #endif
-    [JsonIgnore]
-    public virtual string RequestBody { get; init; }
-
-    /// <summary>
-    ///     请求content-type
-    /// </summary>
-    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)]
-    [JsonIgnore]
-    public virtual string RequestContentType { get; init; }
-
-    /// <summary>
-    ///     请求头信息
-    /// </summary>
-    #if DBTYPE_SQLSERVER
-    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_MAX)]
-    #else
-    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)]
-    #endif
-    [JsonIgnore]
-    public virtual string RequestHeaders { get; init; }
-
-    /// <summary>
-    ///     请求地址
-    /// </summary>
-    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_127)]
-    [JsonIgnore]
-    public virtual string RequestUrl { get; init; }
-
-    /// <summary>
-    ///     响应内容
-    /// </summary>
-    #if DBTYPE_SQLSERVER
-    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_MAX)]
-    #else
-    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)]
-    #endif
-    [JsonIgnore]
-    public virtual string ResponseBody { get; init; }
-
-    /// <summary>
-    ///     响应content-type
-    /// </summary>
-    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_63)]
-    [JsonIgnore]
-    public virtual string ResponseContentType { get; init; }
-
-    /// <summary>
-    ///     响应头
-    /// </summary>
-    #if DBTYPE_SQLSERVER
-    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_MAX)]
-    #else
-    [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)]
-    #endif
-    [JsonIgnore]
-    public virtual string ResponseHeaders { get; init; }
-
-    /// <summary>
-    ///     服务器IP
-    /// </summary>
-    [Column]
-    [JsonIgnore]
-    public virtual int? ServerIp { get; init; }
-
-    /// <summary>
-    ///     用户
-    /// </summary>
-    [JsonIgnore]
-    [Navigate(nameof(UserId))]
-    public Sys_User User { get; init; }
-
-    /// <summary>
-    ///     用户编号
-    /// </summary>
-    [Column]
-    [JsonIgnore]
-    public virtual long? UserId { get; init; }
-}

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

@@ -1,42 +0,0 @@
-using NetAdmin.Domain.Enums;
-
-namespace NetAdmin.Domain.Dto.Dependency;
-
-/// <summary>
-///     动态过滤条件
-/// </summary>
-public sealed record DynamicFilterInfo : DataAbstraction
-{
-    /// <summary>
-    ///     字段名
-    /// </summary>
-    public string Field { get; init; }
-
-    /// <summary>
-    ///     子过滤条件
-    /// </summary>
-    public List<DynamicFilterInfo> Filters { get; init; }
-
-    /// <summary>
-    ///     子过滤条件逻辑关系
-    /// </summary>
-    public DynamicFilterLogics Logic { get; init; }
-
-    /// <summary>
-    ///     操作符
-    /// </summary>
-    public DynamicFilterOperators Operator { get; init; }
-
-    /// <summary>
-    ///     值
-    /// </summary>
-    public object Value { get; init; }
-
-    /// <summary>
-    ///     隐式转换为 FreeSql 的 DynamicFilterInfo 对象
-    /// </summary>
-    public static implicit operator FreeSql.Internal.Model.DynamicFilterInfo(DynamicFilterInfo d)
-    {
-        return d.Adapt<FreeSql.Internal.Model.DynamicFilterInfo>();
-    }
-}

src/backend/NetAdmin.Domain/Dto/Dependency/QueryReq.cs

@@ -1,39 +0,0 @@
-namespace NetAdmin.Domain.Dto.Dependency;
-
-/// <summary>
-///     请求：查询
-/// </summary>
-public record QueryReq<T> : DataAbstraction
-    where T : DataAbstraction, new()
-{
-    /// <summary>
-    ///     取前n条
-    /// </summary>
-    [Range(1, Numbers.MAX_LIMIT_QUERY)]
-    public int Count { get; init; } = Numbers.MAX_LIMIT_QUERY;
-
-    /// <summary>
-    ///     动态查询条件
-    /// </summary>
-    public DynamicFilterInfo DynamicFilter { get; init; }
-
-    /// <summary>
-    ///     查询条件
-    /// </summary>
-    public T Filter { get; init; }
-
-    /// <summary>
-    ///     查询关键字
-    /// </summary>
-    public string Keywords { get; init; }
-
-    /// <summary>
-    ///     排序方式
-    /// </summary>
-    public Orders? Order { get; init; }
-
-    /// <summary>
-    ///     排序字段
-    /// </summary>
-    public string Prop { get; init; }
-}

src/backend/NetAdmin.Domain/Dto/Sys/Cache/GetAllEntriesRsp.cs

@@ -1,53 +0,0 @@
-namespace NetAdmin.Domain.Dto.Sys.Cache;
-
-/// <summary>
-///     响应：获取所有缓存项
-/// </summary>
-public sealed record GetAllEntriesRsp : DataAbstraction
-{
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="GetAllEntriesRsp" /> class.
-    /// </summary>
-    public GetAllEntriesRsp() { }
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="GetAllEntriesRsp" /> class.
-    /// </summary>
-    public GetAllEntriesRsp(long absExp, string key, long sldExp, string data)
-    {
-        AbsExp = absExp;
-        Key    = key;
-        SldExp = sldExp;
-        Data   = data;
-    }
-
-    /// <summary>
-    ///     绝对过期时间
-    /// </summary>
-    public DateTime? AbsExpTime => AbsExp == -1 ? null : DateTime.FromBinary(AbsExp).ToLocalTime();
-
-    /// <summary>
-    ///     滑动过期时间
-    /// </summary>
-    public DateTime? SldExpTime => SldExp == -1 ? null : DateTime.FromBinary(SldExp).ToLocalTime();
-
-    /// <summary>
-    ///     绝对过期时间
-    /// </summary>
-    public long AbsExp { get; init; }
-
-    /// <summary>
-    ///     缓存值
-    /// </summary>
-    public string Data { get; init; }
-
-    /// <summary>
-    ///     缓存键
-    /// </summary>
-    public string Key { get; init; }
-
-    /// <summary>
-    ///     滑动过期时间
-    /// </summary>
-    public long SldExp { get; init; }
-}

src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs

@@ -1,8 +0,0 @@
-using NetAdmin.Domain.DbMaps.Sys;
-
-namespace NetAdmin.Domain.Dto.Sys.RequestLog;
-
-/// <summary>
-///     请求：创建请求日志
-/// </summary>
-public sealed record CreateRequestLogReq : Sys_RequestLog;

src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs

@@ -1,8 +0,0 @@
-using NetAdmin.Domain.DbMaps.Sys;
-
-namespace NetAdmin.Domain.Dto.Sys.RequestLog;
-
-/// <summary>
-///     请求：查询请求日志
-/// </summary>
-public sealed record QueryRequestLogReq : Sys_RequestLog;

src/backend/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs

@@ -1,108 +0,0 @@
-using NetAdmin.Domain.DbMaps.Dependency.Fields;
-using NetAdmin.Domain.DbMaps.Sys;
-using NetAdmin.Domain.Dto.Sys.User;
-
-namespace NetAdmin.Domain.Dto.Sys.RequestLog;
-
-/// <summary>
-///     响应：查询请求日志
-/// </summary>
-public sealed record QueryRequestLogRsp : Sys_RequestLog, IRegister
-{
-    /// <summary>
-    ///     创建者客户端IP
-    /// </summary>
-    public new string CreatedClientIp => base.CreatedClientIp?.ToIpV4();
-
-    /// <summary>
-    ///     登录名
-    /// </summary>
-    public string LoginName => RequestBody?.ToObject<LoginByPwdReq>()?.Account;
-
-    /// <summary>
-    ///     操作系统
-    /// </summary>
-    public string Os => UserAgentParser.Create(CreatedUserAgent)?.Platform;
-
-    /// <inheritdoc cref="Sys_RequestLog.ApiId" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string ApiId { get; init; }
-
-    /// <summary>
-    ///     接口描述
-    /// </summary>
-    public string ApiSummary { get; init; }
-
-    /// <inheritdoc cref="IFieldCreatedTime.CreatedTime" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-    public override DateTime CreatedTime { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.CreatedUserAgent" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string CreatedUserAgent { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.Duration" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-    public override long Duration { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.ErrorCode" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-    public override ErrorCodes ErrorCode { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.Exception" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string Exception { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.HttpStatusCode" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-    public override int HttpStatusCode { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.Method" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string Method { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.RequestBody" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string RequestBody { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.RequestContentType" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string RequestContentType { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.RequestHeaders" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string RequestHeaders { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.RequestUrl" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string RequestUrl { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.ResponseBody" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string ResponseBody { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.ResponseContentType" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string ResponseContentType { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.ResponseHeaders" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override string ResponseHeaders { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.ServerIp" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override int? ServerIp { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.User" />
-    public new QueryUserRsp User { get; init; }
-
-    /// <inheritdoc cref="Sys_RequestLog.UserId" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override long? UserId { get; init; }
-
-    /// <inheritdoc />
-    public void Register(TypeAdapterConfig config)
-    {
-        _ = config.ForType<Sys_RequestLog, QueryRequestLogRsp>().Map(d => d.ApiSummary, s => s.Api.Summary);
-    }
-}

src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj

@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <DefineConstants>DBTYPE_SQLITE</DefineConstants>
-    </PropertyGroup>
-    <Import Project="$(SolutionDir)/build/code.quality.props"/>
-    <ItemGroup>
-        <Content Include="$(SolutionDir)/assets/seed-data/**" LinkBase="SeedData" CopyToOutputDirectory="PreserveNewest"/>
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="../NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj"/>
-    </ItemGroup>
-</Project>

src/backend/NetAdmin.Host/Controllers/ProbeController.cs

@@ -1,28 +0,0 @@
-using NetAdmin.Application.Services;
-using NetAdmin.Cache;
-using NetAdmin.Host.Middlewares;
-
-namespace NetAdmin.Host.Controllers;
-
-/// <summary>
-///     探针组件
-/// </summary>
-[ApiDescriptionSettings("Probe")]
-public sealed class ProbeController : ControllerBase<ICache<IDistributedCache, IService>, IService>
-{
-    /// <summary>
-    ///     健康检查
-    /// </summary>
-    [AllowAnonymous]
-    [HttpGet]
-    #pragma warning disable CA1822, S3400
-    public object HealthCheck()
-        #pragma warning restore S3400, CA1822
-    {
-        return new {
-                       HostName           = Environment.MachineName
-                     , CurrentConnections = SafetyShopHostMiddleware.Connections
-                     , GlobalStatic.ProductVersion
-                   };
-    }
-}

src/backend/NetAdmin.Host/Middlewares/SafetyShopHostMiddleware.cs

@@ -1,44 +0,0 @@
-namespace NetAdmin.Host.Middlewares;
-
-/// <summary>
-///     安全停机中间件
-/// </summary>
-/// <remarks>
-///     放在所有中间件最前面
-/// </remarks>
-public sealed class SafetyShopHostMiddleware(RequestDelegate next)
-{
-    private static long _connections;
-    private static bool _hostStopping;
-
-    /// <summary>
-    ///     当前连接数
-    /// </summary>
-    public static long Connections => Interlocked.Read(ref _connections);
-
-    /// <summary>
-    ///     停机处理
-    /// </summary>
-    public static void OnStopping()
-    {
-        Volatile.Write(ref _hostStopping, true);
-        while (Interlocked.Read(ref _connections) > 0) {
-            Thread.Sleep(10);
-        }
-    }
-
-    /// <summary>
-    ///     主函数
-    /// </summary>
-    public async Task InvokeAsync(HttpContext context)
-    {
-        if (Volatile.Read(ref _hostStopping)) {
-            context.Response.StatusCode = (int)HttpStatusCode.ServiceUnavailable;
-            return;
-        }
-
-        _ = Interlocked.Increment(ref _connections);
-        await next(context).ConfigureAwait(false);
-        _ = Interlocked.Decrement(ref _connections);
-    }
-}

src/backend/NetAdmin.Host/Utils/RequestLogger.cs

@@ -1,82 +0,0 @@
-using NetAdmin.Domain.Contexts;
-using NetAdmin.Domain.Dto.Sys.RequestLog;
-using NetAdmin.Domain.Events.Sys;
-
-namespace NetAdmin.Host.Utils;
-
-/// <summary>
-///     请求日志记录器
-/// </summary>
-public sealed class RequestLogger(ILogger<RequestLogger> logger, IEventPublisher eventPublisher) : ISingleton
-{
-    private static readonly string[] _textContentTypes = ["text", "json", "xml", "urlencoded"];
-
-    /// <summary>
-    ///     生成审计数据
-    /// </summary>
-    public async Task<CreateRequestLogReq> LogAsync(HttpContext context,   long duration, string responseBody
-                                                  , ErrorCodes  errorCode, IExceptionHandlerFeature exception)
-    {
-        // 从请求头中读取用户信息
-        var associatedUser = GetAssociatedUser(context);
-
-        var auditData = new CreateRequestLogReq {
-                                                    Duration           = duration
-                                                  , Method             = context.Request.Method
-                                                  , RequestContentType = context.Request.ContentType
-                                                  , RequestBody = Array.Exists( //
-                                                        _textContentTypes
-                                                      , x => context.Request.ContentType?.Contains(
-                                                            x, StringComparison.OrdinalIgnoreCase) ?? false)
-                                                        ? (await context.ReadBodyContentAsync().ConfigureAwait(false))
-                                                        ?.Sub(0, Numbers.MAX_LIMIT_PRINT_LEN_CONTENT)
-                                                        : string.Empty
-                                                  , RequestUrl = context.Request.GetRequestUrlAddress()
-                                                  , ResponseBody
-                                                        = responseBody?.Sub(0, Numbers.MAX_LIMIT_PRINT_LEN_CONTENT)
-                                                  , ServerIp = context.GetLocalIpAddressToIPv4()?.IpV4ToInt32()
-                                                  , ApiId = context.Request.Path.Value?.TrimStart('/')
-                                                  , RequestHeaders = context.Request.Headers.Json()
-                                                  , ResponseContentType = context.Response.ContentType
-                                                  , ResponseHeaders = context.Response.Headers.Json()
-                                                  , HttpStatusCode = context.Response.StatusCode
-                                                  , ErrorCode = errorCode
-                                                  , Exception = exception?.Error.ToString()
-                                                  , UserId = associatedUser?.UserId
-                                                  , CreatedUserAgent = context.Request.Headers.UserAgent.ToString()
-                                                  , CreatedClientIp = context.GetRealIpAddress()
-                                                                             ?.MapToIPv4()
-                                                                             .ToString()
-                                                                             .IpV4ToInt32()
-                                                };
-
-        // 打印日志
-        logger.Info(auditData);
-
-        // 发布请求日志事件
-        await eventPublisher.PublishAsync(new RequestLogEvent(auditData)).ConfigureAwait(false);
-
-        return auditData;
-    }
-
-    private (long UserId, string UserName)? GetAssociatedUser(HttpContext context)
-    {
-        var token = context.Request.Headers.Authorization.FirstOrDefault();
-        if (token == null) {
-            return null;
-        }
-
-        ContextUserToken userToken = null;
-        try {
-            var jsonWebToken
-                = JWTEncryption.ReadJwtToken(token.TrimStart($"{Chars.FLG_HTTP_HEADER_VALUE_AUTH_SCHEMA} "));
-            var claim = jsonWebToken?.Claims.FirstOrDefault(y => y.Type == nameof(ContextUserToken));
-            userToken = claim?.Value.ToObject<ContextUserToken>();
-        }
-        catch (Exception ex) {
-            logger.Warn($"{Ln.读取用户令牌出错}: {ex}");
-        }
-
-        return userToken == null ? null : (userToken.Id, userToken.UserName);
-    }
-}

src/backend/NetAdmin.Infrastructure/Constant/Numbers.cs

@@ -1,32 +0,0 @@
-#pragma warning disable CS1591
-
-namespace NetAdmin.Infrastructure.Constant;
-
-/// <summary>
-///     数字常量表
-/// </summary>
-/// <remarks>
-///     public类型会通过接口暴露给前端
-/// </remarks>
-public static class Numbers
-{
-    public const int  DEF_PAGE_SIZE_QUERY = 20;  // 分页查询默认的页容量
-    public const long DEF_SORT_VAL        = 100; // 排序默认值
-
-    public const int  HTTP_STATUS_BIZ_FAIL    = 900;             // Http状态码-业务异常
-    public const long ID_DIC_CATALOG_GEO_AREA = 379794295185413; // 唯一编号：字典目录-行政区划字典
-
-    public const int MAX_LIMIT_BULK_REQ          = 100;   // 最大限制：批量请求数
-    public const int MAX_LIMIT_PRINT_LEN_CONTENT = 4096;  // 最大限制：打印长度（HTTP 内容）
-    public const int MAX_LIMIT_PRINT_LEN_SQL     = 4096;  // 最大限制：打印长度（SQL 语句）
-    public const int MAX_LIMIT_QUERY             = 1000;  // 最大限制：非分页查询条数
-    public const int MAX_LIMIT_QUERY_PAGE_NO     = 10000; // 最大限制：分页查询页码
-    public const int MAX_LIMIT_QUERY_PAGE_SIZE   = 100;   // 最大限制：分页查询页容量
-
-    public const int SECS_CACHE_CHART     = 300; // 秒：缓存时间-仪表
-    public const int SECS_CACHE_DEFAULT   = 60;  // 秒：缓存时间-默认
-    public const int SECS_RED_LOCK_EXPIRY = 30;  // 秒：RedLock-锁过期时间，假如持有锁的进程挂掉，最多在此时间内锁将被释放（如持有锁的进程正常，此值不会生效）
-    public const int SECS_RED_LOCK_RETRY  = 1;   // 秒：RedLock-锁等待时间内，多久尝试获取一次
-    public const int SECS_RED_LOCK_WAIT   = 10;  // 秒：RedLock-锁等待时间，相同的 resource 如果当前的锁被其他线程占用，最多等待时间
-    public const int SECS_TIMEOUT_JOB     = 600; // 秒：超时时间-作业
-}

src/backend/NetAdmin.Infrastructure/Extensions/HttpResponseMessageExtensions.cs

@@ -1,42 +0,0 @@
-namespace NetAdmin.Infrastructure.Extensions;
-
-/// <summary>
-///     HttpResponseMessage 扩展方法
-/// </summary>
-public static class HttpResponseMessageExtensions
-{
-    /// <summary>
-    ///     记录日志
-    /// </summary>
-    public static async Task LogAsync<T>(this HttpResponseMessage me, ILogger<T> logger
-                                       , Func<string, string>     bodyPreHandle = null)
-    {
-        logger.Info(
-            (await me.BuildJsonAsync(bodyPreHandle).ConfigureAwait(false))?.Sub(
-                0, Numbers.MAX_LIMIT_PRINT_LEN_CONTENT));
-    }
-
-    /// <summary>
-    ///     记录异常日志
-    /// </summary>
-    public static async Task LogExceptionAsync<T>(this HttpResponseMessage me, string errors, ILogger<T> logger
-                                                , Func<string, string>     bodyHandle = null)
-    {
-        logger.Warn(
-            $"{errors}: {(await me.BuildJsonAsync(bodyHandle).ConfigureAwait(false))?.Sub(0, Numbers.MAX_LIMIT_PRINT_LEN_CONTENT)}");
-    }
-
-    /// <summary>
-    ///     将Http请求的Uri、Header、Body打包成Json字符串
-    /// </summary>
-    private static async Task<string> BuildJsonAsync( //
-        this HttpResponseMessage me, Func<string, string> bodyHandle = null)
-    {
-        var body = me?.Content is null ? null : await me.Content!.ReadAsStringAsync().ConfigureAwait(false);
-        return new {
-                       Header        = me?.ToString()
-                     , RequestHeader = me?.RequestMessage?.Headers
-                     , Body          = bodyHandle is null ? body : bodyHandle(body)
-                   }.Json();
-    }
-}

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

@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <DefineConstants>INFRAS</DefineConstants>
-    </PropertyGroup>
-    <Import Project="$(SolutionDir)/build/code.quality.props"/>
-    <Import Project="$(SolutionDir)/build/copy.pkg.xml.comment.files.targets"/>
-    <Import Project="$(SolutionDir)/build/prebuild.targets"/>
-    <ItemGroup>
-        <PackageReference Include="Cronos" Version="0.8.4"/>
-        <PackageReference Include="FreeSql.DbContext.NS" Version="3.2.821-ns1"/>
-        <PackageReference Include="FreeSql.Provider.Sqlite.NS" Version="3.2.821-ns1"/>
-        <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.4"/>
-        <PackageReference Include="Furion.Extras.ObjectMapper.Mapster.NS" Version="4.9.4-ns1"/>
-        <PackageReference Include="Furion.Pure.NS" Version="4.9.4-ns1"/>
-        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-preview.5.24306.11"/>
-        <PackageReference Include="Minio" Version="6.0.2"/>
-        <PackageReference Include="NSExt" Version="2.1.0"/>
-        <PackageReference Include="RedLock.net" Version="2.3.2"/>
-        <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0"/>
-        <PackageReference Include="Yitter.IdGenerator" Version="1.0.14"/>
-    </ItemGroup>
-    <ItemGroup>
-        <None Update="*.json">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-</Project>

src/backend/NetAdmin.Infrastructure/Utils/RedLocker.cs

@@ -1,98 +0,0 @@
-using RedLockNet.SERedis;
-using RedLockNet.SERedis.Configuration;
-using StackExchange.Redis;
-
-namespace NetAdmin.Infrastructure.Utils;
-
-/// <summary>
-///     Redis 分布锁
-/// </summary>
-#pragma warning disable DesignedForInheritance
-public class RedLocker : IDisposable, ISingleton
-#pragma warning restore DesignedForInheritance
-{
-    // Track whether Dispose has been called.
-    private bool _disposed;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="RedLocker" /> class.
-    /// </summary>
-    public RedLocker(IOptions<RedisOptions> redisOptions)
-    {
-        RedLockFactory = RedLockFactory.Create( //
-            new List<RedLockMultiplexer>        //
-            {
-                ConnectionMultiplexer.Connect( //
-                    redisOptions.Value.Instances.First(x => x.Name == Chars.FLG_REDIS_INSTANCE_DATA_CACHE).ConnStr)
-            });
-    }
-
-    /// <summary>
-    ///     Finalizes an instance of the <see cref="RedLocker" /> class.
-    ///     Use C# finalizer syntax for finalization code.
-    ///     This finalizer will run only if the Dispose method
-    ///     does not get called.
-    ///     It gives your base class the opportunity to finalize.
-    ///     Do not provide finalizer in types derived from this class.
-    /// </summary>
-    ~RedLocker()
-    {
-        // Do not re-create Dispose clean-up code here.
-        // Calling Dispose(disposing: false) is optimal in terms of
-        // readability and maintainability.
-        Dispose(false);
-    }
-
-    /// <summary>
-    ///     RedLockFactory
-    /// </summary>
-    public RedLockFactory RedLockFactory { get; }
-
-    /// <summary>
-    ///     Implement IDisposable.
-    ///     Do not make this method virtual.
-    ///     A derived class should not be able to override this method.
-    /// </summary>
-    public void Dispose()
-    {
-        Dispose(true);
-
-        // This object will be cleaned up by the Dispose method.
-        // Therefore, you should call GC.SuppressFinalize to
-        // take this object off the finalization queue
-        // and prevent finalization code for this object
-        // from executing a second time.
-        GC.SuppressFinalize(this);
-    }
-
-    /// <summary>
-    ///     Dispose(bool disposing) executes in two distinct scenarios.
-    ///     If disposing equals true, the method has been called directly
-    ///     or indirectly by a user's code. Managed and unmanaged resources
-    ///     can be disposed.
-    ///     If disposing equals false, the method has been called by the
-    ///     runtime from inside the finalizer and you should not reference
-    ///     other objects. Only unmanaged resources can be disposed.
-    /// </summary>
-    protected virtual void Dispose(bool disposing)
-    {
-        // Check to see if Dispose has already been called.
-        if (_disposed) {
-            return;
-        }
-
-        // If disposing equals true, dispose all managed
-        // and unmanaged resources.
-        if (disposing) {
-            RedLockFactory.Dispose();
-        }
-
-        // Call the appropriate methods to clean up
-        // unmanaged resources here.
-        // If disposing is false,
-        // only the following code is executed.
-
-        // Note disposing has been done.
-        _disposed = true;
-    }
-}