refactor: ♻️ bizServer 更名为 AdmServer (#104)

2025-04-20 05:02:50 +08:00 · 2024-04-25 18:32:14 +08:00 · 2024-04-25 18:32:14 +08:00 · 6bd6e62fb6
commit 6bd6e62fb6
parent 149e1afa53
24 changed files with 33 additions and 37 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -42,8 +42,8 @@ jobs:
          key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
          restore-keys: ${{ runner.os }}-nuget
      - name: Publish backend
-        working-directory: ./src/backend/NetAdmin.BizServer.Host
-        run: dotnet publish NetAdmin.BizServer.Host.csproj -c Release
+        working-directory: ./src/backend/NetAdmin.AdmServer.Host
+        run: dotnet publish NetAdmin.AdmServer.Host.csproj -c Release
      - name: Build docker images
        run: docker build -t nsnail/netadmin .
      - name: Docker login
--- a/4
+++ b/4
@ -3,5 +3,5 @@ WORKDIR /app
 EXPOSE 8080
 RUN apt update
 RUN apt install -y redis
-COPY ./dist/backend/NetAdmin.BizServer.Host/bin/Release/net9.0/publish .
-ENTRYPOINT redis-server --daemonize yes && dotnet NetAdmin.BizServer.Host.dll -is
+COPY ./dist/backend/NetAdmin.AdmServer.Host/bin/Release/net9.0/publish .
+ENTRYPOINT redis-server --daemonize yes && dotnet NetAdmin.AdmServer.Host.dll -is
--- a/NetAdmin.sln
+++ b/NetAdmin.sln
@ -68,9 +68,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{8E4C93BA
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Infrastructure", "src\backend\NetAdmin.Infrastructure\NetAdmin.Infrastructure.csproj", "{1E62C322-EE42-4699-A6F1-791C53EFA62D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.BizServer.Application", "src\backend\NetAdmin.BizServer.Application\NetAdmin.BizServer.Application.csproj", "{E38B2EB4-D7A5-4777-9236-3B348919DF23}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Application", "src\backend\NetAdmin.AdmServer.Application\NetAdmin.AdmServer.Application.csproj", "{E38B2EB4-D7A5-4777-9236-3B348919DF23}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.BizServer.Host", "src\backend\NetAdmin.BizServer.Host\NetAdmin.BizServer.Host.csproj", "{CE895E44-EEC3-4ECE-A56A-8A82E7D863E3}"
+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.HostedServers", "03.HostedServers", "{12AE5B4B-CB1A-498E-83B8-04E201E31D86}"
 EndProject
@ -82,7 +82,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Host", "src\backen
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Cache", "src\backend\NetAdmin.Cache\NetAdmin.Cache.csproj", "{91452C22-4B57-4F16-9AF6-42C7BF830504}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.BizServer.Cache", "src\backend\NetAdmin.BizServer.Cache\NetAdmin.BizServer.Cache.csproj", "{7CB632D3-3635-4F8D-AFE7-F496D37D422B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Cache", "src\backend\NetAdmin.AdmServer.Cache\NetAdmin.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}"
 EndProject
@ -100,7 +100,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.ScheduledService",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "06.Tests", "06.Tests", "{89260294-80FC-49F1-8D73-AECD39AFF2B7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.BizServer.Tests", "src\backend\NetAdmin.BizServer.Tests\NetAdmin.BizServer.Tests.csproj", "{C7F27698-DA05-4ACD-B0D7-4791B3972002}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.AdmServer.Tests", "src\backend\NetAdmin.AdmServer.Tests\NetAdmin.AdmServer.Tests.csproj", "{C7F27698-DA05-4ACD-B0D7-4791B3972002}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Tests", "src\backend\NetAdmin.Tests\NetAdmin.Tests.csproj", "{00604162-C444-478B-B773-3AB23C856CA7}"
 EndProject
--- a/README.md
+++ b/README.md
@ -42,7 +42,7 @@ docker run -p 8080:8080 nsnail/netadmin
   ```
    4. 运行后端WebApi
   ``` shell
-   dotnet run --project ./src/backend/NetAdmin.BizServer.Host/NetAdmin.BizServer.Host.csproj --urls http://[::]:5010 -is
+   dotnet run --project ./src/backend/NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj --urls http://[::]:5010 -is
   ```
    5. 体验WebApi程序
        - 浏览器打开 http://localhost:5010 ，将看到Swagger（Knife4jUI）界面
--- a/assets/res/Enums.ln
+++ b/assets/res/Enums.ln
@ -4,7 +4,7 @@
 不包含
 不排序
 不等于
-业务模块
+管理模块
 丧偶
 中专
 中共党员
--- a/assets/seed-data/Sys_RoleApi.json
+++ b/assets/seed-data/Sys_RoleApi.json
@ -14,9 +14,5 @@
  {
    "ApiId": "api/sys/user",
    "RoleId": 371729946431493
-  },
-  {
-    "ApiId": "api/biz/member/member.info",
-    "RoleId": 371729946431493
  }
 ]
--- a/src/backend/NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj
+++ b/src/backend/NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj
--- a/src/backend/NetAdmin.AdmServer.Cache/NetAdmin.AdmServer.Cache.csproj
+++ b/src/backend/NetAdmin.AdmServer.Cache/NetAdmin.AdmServer.Cache.csproj
@ -2,6 +2,6 @@
    <Import Project="$(SolutionDir)/build/code.quality.props"/>
    <ItemGroup>
        <ProjectReference Include="../NetAdmin.SysComponent.Cache/NetAdmin.SysComponent.Cache.csproj"/>
-        <ProjectReference Include="../NetAdmin.BizServer.Application/NetAdmin.BizServer.Application.csproj"/>
+        <ProjectReference Include="../NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj"/>
    </ItemGroup>
 </Project>
--- a/src/backend/NetAdmin.AdmServer.Host/CommandLineArgs.cs
+++ b/src/backend/NetAdmin.AdmServer.Host/CommandLineArgs.cs
@ -1,6 +1,6 @@
 using Spectre.Console.Cli;

-namespace NetAdmin.BizServer.Host;
+namespace NetAdmin.AdmServer.Host;

 /// <summary>
 ///     命令行参数
--- a/src/backend/NetAdmin.AdmServer.Host/Extensions/IApplicationBuilderExtensions.cs
+++ b/src/backend/NetAdmin.AdmServer.Host/Extensions/IApplicationBuilderExtensions.cs
@ -1,4 +1,4 @@
-namespace NetAdmin.BizServer.Host.Extensions;
+namespace NetAdmin.AdmServer.Host.Extensions;

 /// <summary>
 ///     ApplicationBuilder 扩展方法
@ -9,7 +9,7 @@ namespace NetAdmin.BizServer.Host.Extensions;
 public static class IApplicationBuilderExtensions
 {
    private const           string              _INDEX_HTML_PATH = ".index.html";
-    private const           string              _RES_PFX = $"{nameof(NetAdmin)}.{nameof(BizServer)}.{nameof(Host)}.UI";
+    private const           string              _RES_PFX = $"{nameof(NetAdmin)}.{nameof(AdmServer)}.{nameof(Host)}.UI";
    private static readonly Regex               _regex = new(@"\.(\w+)$", RegexOptions.Compiled);
    private static          IEnumerable<string> _allResNames;

--- a/src/backend/NetAdmin.AdmServer.Host/Extensions/ServiceCollectionExtensions.cs
+++ b/src/backend/NetAdmin.AdmServer.Host/Extensions/ServiceCollectionExtensions.cs
@ -1,10 +1,10 @@
-using NetAdmin.BizServer.Host.Filters;
+using NetAdmin.AdmServer.Host.Filters;
 using NetAdmin.Domain.Contexts;
 using NetAdmin.Domain.DbMaps.Dependency.Fields;
 using NetAdmin.Domain.Enums.Sys;
 using NetAdmin.Host.Extensions;

-namespace NetAdmin.BizServer.Host.Extensions;
+namespace NetAdmin.AdmServer.Host.Extensions;

 /// <summary>
 ///     ServiceCollection 扩展方法
--- a/src/backend/NetAdmin.AdmServer.Host/Filters/JwtHandler.cs
+++ b/src/backend/NetAdmin.AdmServer.Host/Filters/JwtHandler.cs
@ -1,7 +1,7 @@
 using NetAdmin.Domain.Contexts;
 using NetAdmin.SysComponent.Cache.Sys.Dependency;

-namespace NetAdmin.BizServer.Host.Filters;
+namespace NetAdmin.AdmServer.Host.Filters;

 /// <inheritdoc />
 [SuppressSniffer]
--- a/src/backend/NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj
+++ b/src/backend/NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj
@ -6,7 +6,7 @@
    </ItemGroup>
    <ItemGroup>
        <ProjectReference Include="../NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj"/>
-        <ProjectReference Include="../NetAdmin.BizServer.Cache/NetAdmin.BizServer.Cache.csproj"/>
+        <ProjectReference Include="../NetAdmin.AdmServer.Cache/NetAdmin.AdmServer.Cache.csproj"/>
    </ItemGroup>
    <ItemGroup>
        <None Update="*.json">
--- a/src/backend/NetAdmin.AdmServer.Host/Properties/launchSettings.json
+++ b/src/backend/NetAdmin.AdmServer.Host/Properties/launchSettings.json
@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/launchsettings.json",
  "profiles": {
-    "NetAdmin.BizServer.Host": {
+    "NetAdmin.AdmServer.Host": {
      "commandName": "Project",
      "dotnetRunMessages": true,
      "commandLineArgs": "-is",
--- a/src/backend/NetAdmin.AdmServer.Host/Startup.cs
+++ b/src/backend/NetAdmin.AdmServer.Host/Startup.cs
@ -1,5 +1,5 @@
-using NetAdmin.BizServer.Host;
-using NetAdmin.BizServer.Host.Extensions;
+using NetAdmin.AdmServer.Host;
+using NetAdmin.AdmServer.Host.Extensions;
 using NetAdmin.Host.Extensions;
 using NetAdmin.Host.Middlewares;
 using NetAdmin.SysComponent.Host.Extensions;
@ -11,7 +11,7 @@ using Prometheus;

 NetAdmin.Host.Startup.Entry<Startup>(args);

-namespace NetAdmin.BizServer.Host
+namespace NetAdmin.AdmServer.Host
 {
    /// <summary>
    ///     启动类
--- a/src/backend/NetAdmin.AdmServer.Host/settings.Development.json
+++ b/src/backend/NetAdmin.AdmServer.Host/settings.Development.json
--- a/src/backend/NetAdmin.AdmServer.Host/settings.Test.json
+++ b/src/backend/NetAdmin.AdmServer.Host/settings.Test.json
--- a/src/backend/NetAdmin.AdmServer.Host/settings.json
+++ b/src/backend/NetAdmin.AdmServer.Host/settings.json
--- a/src/backend/NetAdmin.AdmServer.Tests/AllTests.cs
+++ b/src/backend/NetAdmin.AdmServer.Tests/AllTests.cs
@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Net.Http.Json;
 using Microsoft.AspNetCore.Mvc.Testing;
 using NetAdmin.Application.Modules;
-using NetAdmin.BizServer.Host;
+using NetAdmin.AdmServer.Host;
 using NetAdmin.Domain.Dto.Dependency;
 using NetAdmin.Domain.Dto.Sys.Api;
 using NetAdmin.Domain.Dto.Sys.Cache;
@ -13,7 +13,7 @@ using NetAdmin.Tests;
 using Xunit;
 using Xunit.Abstractions;

-namespace NetAdmin.BizServer.Tests;
+namespace NetAdmin.AdmServer.Tests;

 /// <summary>
 ///     所有测试
--- a/src/backend/NetAdmin.AdmServer.Tests/NetAdmin.AdmServer.Tests.csproj
+++ b/src/backend/NetAdmin.AdmServer.Tests/NetAdmin.AdmServer.Tests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <ItemGroup>
        <ProjectReference Include="../NetAdmin.Tests/NetAdmin.Tests.csproj"/>
-        <ProjectReference Include="../NetAdmin.BizServer.Host/NetAdmin.BizServer.Host.csproj"/>
+        <ProjectReference Include="../NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj"/>
    </ItemGroup>
    <ItemGroup>
        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24177-07"/>
--- a/src/backend/NetAdmin.Infrastructure/Enums/ModuleTypes.cs
+++ b/src/backend/NetAdmin.Infrastructure/Enums/ModuleTypes.cs
@ -15,8 +15,8 @@ public enum ModuleTypes
   ,

    /// <summary>
-    ///     业务模块
+    ///     管理模块
    /// </summary>
-    [ResourceDescription<Ln>(nameof(Ln.业务模块))]
-    BizServer = 2
+    [ResourceDescription<Ln>(nameof(Ln.管理模块))]
+    AdmServer = 2
 }
--- a/src/backend/NetAdmin.Infrastructure/commonSettings.json
+++ b/src/backend/NetAdmin.Infrastructure/commonSettings.json
@ -57,9 +57,9 @@
    "XmlComments": [
      "FreeSql.xml",
      "NetAdmin.Application.xml",
-      "NetAdmin.BizServer.Application.xml",
-      "NetAdmin.BizServer.Cache.xml",
-      "NetAdmin.BizServer.Host.xml",
+      "NetAdmin.AdmServer.Application.xml",
+      "NetAdmin.AdmServer.Cache.xml",
+      "NetAdmin.AdmServer.Host.xml",
      "NetAdmin.Cache.xml",
      "NetAdmin.Domain.xml",
      "NetAdmin.Host.xml",
--- a/src/backend/NetAdmin.ScheduledService/NetAdmin.ScheduledService.csproj
+++ b/src/backend/NetAdmin.ScheduledService/NetAdmin.ScheduledService.csproj
@ -2,7 +2,7 @@
    <Import Project="$(SolutionDir)/build/code.quality.props"/>
    <ItemGroup>
        <ProjectReference Include="../NetAdmin.Host/NetAdmin.Host.csproj"/>
-        <ProjectReference Include="../NetAdmin.BizServer.Cache/NetAdmin.BizServer.Cache.csproj"/>
+        <ProjectReference Include="../NetAdmin.AdmServer.Cache/NetAdmin.AdmServer.Cache.csproj"/>
    </ItemGroup>
    <ItemGroup>
        <None Update="*.json">
--- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DevService.cs
+++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DevService.cs
@ -24,7 +24,7 @@ public sealed class DevService(IApiService apiService) : ServiceBase<DevService>
    {
        req.ThrowIfInvalid();

-        // 模块类型（Sys、Biz、等）
+        // 模块类型（Sys、Adm、等）
        var moduleType = Enum.GetName(req.Type)!;

        // 模板层目录