diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1867d4e0..b572d6b7 100644
--- 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
diff --git a/Dockerfile b/Dockerfile
index bb674d9b..7d426512 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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
\ No newline at end of file
+COPY ./dist/backend/NetAdmin.AdmServer.Host/bin/Release/net9.0/publish .
+ENTRYPOINT redis-server --daemonize yes && dotnet NetAdmin.AdmServer.Host.dll -is
\ No newline at end of file
diff --git a/NetAdmin.sln b/NetAdmin.sln
index f482e3c4..1687cf94 100644
--- 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
diff --git a/README.md b/README.md
index 5ecbf548..0ff00670 100644
--- 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)界面
diff --git a/assets/res/Enums.ln b/assets/res/Enums.ln
index bb379e4a..90a0c2f2 100644
--- a/assets/res/Enums.ln
+++ b/assets/res/Enums.ln
@@ -4,7 +4,7 @@
不包含
不排序
不等于
-业务模块
+管理模块
丧偶
中专
中共党员
diff --git a/assets/seed-data/Sys_RoleApi.json b/assets/seed-data/Sys_RoleApi.json
index d141e48c..41e8e8ac 100644
--- 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
}
]
\ No newline at end of file
diff --git a/src/backend/NetAdmin.BizServer.Application/NetAdmin.BizServer.Application.csproj b/src/backend/NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj
similarity index 100%
rename from src/backend/NetAdmin.BizServer.Application/NetAdmin.BizServer.Application.csproj
rename to src/backend/NetAdmin.AdmServer.Application/NetAdmin.AdmServer.Application.csproj
diff --git a/src/backend/NetAdmin.BizServer.Cache/NetAdmin.BizServer.Cache.csproj b/src/backend/NetAdmin.AdmServer.Cache/NetAdmin.AdmServer.Cache.csproj
similarity index 69%
rename from src/backend/NetAdmin.BizServer.Cache/NetAdmin.BizServer.Cache.csproj
rename to src/backend/NetAdmin.AdmServer.Cache/NetAdmin.AdmServer.Cache.csproj
index 83473100..ceb4baae 100644
--- a/src/backend/NetAdmin.BizServer.Cache/NetAdmin.BizServer.Cache.csproj
+++ b/src/backend/NetAdmin.AdmServer.Cache/NetAdmin.AdmServer.Cache.csproj
@@ -2,6 +2,6 @@
-
+
\ No newline at end of file
diff --git a/src/backend/NetAdmin.BizServer.Host/CommandLineArgs.cs b/src/backend/NetAdmin.AdmServer.Host/CommandLineArgs.cs
similarity index 92%
rename from src/backend/NetAdmin.BizServer.Host/CommandLineArgs.cs
rename to src/backend/NetAdmin.AdmServer.Host/CommandLineArgs.cs
index 4138e99e..44b7d579 100644
--- a/src/backend/NetAdmin.BizServer.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;
///
/// 命令行参数
diff --git a/src/backend/NetAdmin.BizServer.Host/Extensions/IApplicationBuilderExtensions.cs b/src/backend/NetAdmin.AdmServer.Host/Extensions/IApplicationBuilderExtensions.cs
similarity index 96%
rename from src/backend/NetAdmin.BizServer.Host/Extensions/IApplicationBuilderExtensions.cs
rename to src/backend/NetAdmin.AdmServer.Host/Extensions/IApplicationBuilderExtensions.cs
index 2c168e9b..97ca69a9 100644
--- a/src/backend/NetAdmin.BizServer.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;
///
/// 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 _allResNames;
diff --git a/src/backend/NetAdmin.BizServer.Host/Extensions/ServiceCollectionExtensions.cs b/src/backend/NetAdmin.AdmServer.Host/Extensions/ServiceCollectionExtensions.cs
similarity index 93%
rename from src/backend/NetAdmin.BizServer.Host/Extensions/ServiceCollectionExtensions.cs
rename to src/backend/NetAdmin.AdmServer.Host/Extensions/ServiceCollectionExtensions.cs
index 0ce88ece..ab942d5e 100644
--- a/src/backend/NetAdmin.BizServer.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;
///
/// ServiceCollection 扩展方法
diff --git a/src/backend/NetAdmin.BizServer.Host/Filters/JwtHandler.cs b/src/backend/NetAdmin.AdmServer.Host/Filters/JwtHandler.cs
similarity index 97%
rename from src/backend/NetAdmin.BizServer.Host/Filters/JwtHandler.cs
rename to src/backend/NetAdmin.AdmServer.Host/Filters/JwtHandler.cs
index a0dcc6de..66aab6ac 100644
--- a/src/backend/NetAdmin.BizServer.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;
///
[SuppressSniffer]
diff --git a/src/backend/NetAdmin.BizServer.Host/NetAdmin.BizServer.Host.csproj b/src/backend/NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj
similarity index 88%
rename from src/backend/NetAdmin.BizServer.Host/NetAdmin.BizServer.Host.csproj
rename to src/backend/NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj
index f8f04a4e..58eb7b2c 100644
--- a/src/backend/NetAdmin.BizServer.Host/NetAdmin.BizServer.Host.csproj
+++ b/src/backend/NetAdmin.AdmServer.Host/NetAdmin.AdmServer.Host.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/src/backend/NetAdmin.BizServer.Host/Properties/launchSettings.json b/src/backend/NetAdmin.AdmServer.Host/Properties/launchSettings.json
similarity index 92%
rename from src/backend/NetAdmin.BizServer.Host/Properties/launchSettings.json
rename to src/backend/NetAdmin.AdmServer.Host/Properties/launchSettings.json
index bbe592a4..92a8a815 100644
--- a/src/backend/NetAdmin.BizServer.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",
diff --git a/src/backend/NetAdmin.BizServer.Host/Startup.cs b/src/backend/NetAdmin.AdmServer.Host/Startup.cs
similarity index 97%
rename from src/backend/NetAdmin.BizServer.Host/Startup.cs
rename to src/backend/NetAdmin.AdmServer.Host/Startup.cs
index c677f9ae..67c16c86 100644
--- a/src/backend/NetAdmin.BizServer.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(args);
-namespace NetAdmin.BizServer.Host
+namespace NetAdmin.AdmServer.Host
{
///
/// 启动类
diff --git a/src/backend/NetAdmin.BizServer.Host/settings.Development.json b/src/backend/NetAdmin.AdmServer.Host/settings.Development.json
similarity index 100%
rename from src/backend/NetAdmin.BizServer.Host/settings.Development.json
rename to src/backend/NetAdmin.AdmServer.Host/settings.Development.json
diff --git a/src/backend/NetAdmin.BizServer.Host/settings.Test.json b/src/backend/NetAdmin.AdmServer.Host/settings.Test.json
similarity index 100%
rename from src/backend/NetAdmin.BizServer.Host/settings.Test.json
rename to src/backend/NetAdmin.AdmServer.Host/settings.Test.json
diff --git a/src/backend/NetAdmin.BizServer.Host/settings.json b/src/backend/NetAdmin.AdmServer.Host/settings.json
similarity index 100%
rename from src/backend/NetAdmin.BizServer.Host/settings.json
rename to src/backend/NetAdmin.AdmServer.Host/settings.json
diff --git a/src/backend/NetAdmin.BizServer.Tests/AllTests.cs b/src/backend/NetAdmin.AdmServer.Tests/AllTests.cs
similarity index 98%
rename from src/backend/NetAdmin.BizServer.Tests/AllTests.cs
rename to src/backend/NetAdmin.AdmServer.Tests/AllTests.cs
index e7937639..79d77d27 100644
--- a/src/backend/NetAdmin.BizServer.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;
///
/// 所有测试
diff --git a/src/backend/NetAdmin.BizServer.Tests/NetAdmin.BizServer.Tests.csproj b/src/backend/NetAdmin.AdmServer.Tests/NetAdmin.AdmServer.Tests.csproj
similarity index 74%
rename from src/backend/NetAdmin.BizServer.Tests/NetAdmin.BizServer.Tests.csproj
rename to src/backend/NetAdmin.AdmServer.Tests/NetAdmin.AdmServer.Tests.csproj
index 96f616ff..0fa6cfde 100644
--- a/src/backend/NetAdmin.BizServer.Tests/NetAdmin.BizServer.Tests.csproj
+++ b/src/backend/NetAdmin.AdmServer.Tests/NetAdmin.AdmServer.Tests.csproj
@@ -1,7 +1,7 @@
-
+
diff --git a/src/backend/NetAdmin.Infrastructure/Enums/ModuleTypes.cs b/src/backend/NetAdmin.Infrastructure/Enums/ModuleTypes.cs
index 903b7b1b..1dbe39f5 100644
--- a/src/backend/NetAdmin.Infrastructure/Enums/ModuleTypes.cs
+++ b/src/backend/NetAdmin.Infrastructure/Enums/ModuleTypes.cs
@@ -15,8 +15,8 @@ public enum ModuleTypes
,
///
- /// 业务模块
+ /// 管理模块
///
- [ResourceDescription(nameof(Ln.业务模块))]
- BizServer = 2
+ [ResourceDescription(nameof(Ln.管理模块))]
+ AdmServer = 2
}
\ No newline at end of file
diff --git a/src/backend/NetAdmin.Infrastructure/commonSettings.json b/src/backend/NetAdmin.Infrastructure/commonSettings.json
index 346aaad0..d4131ff2 100644
--- 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",
diff --git a/src/backend/NetAdmin.ScheduledService/NetAdmin.ScheduledService.csproj b/src/backend/NetAdmin.ScheduledService/NetAdmin.ScheduledService.csproj
index 5df6c288..75d4d894 100644
--- a/src/backend/NetAdmin.ScheduledService/NetAdmin.ScheduledService.csproj
+++ b/src/backend/NetAdmin.ScheduledService/NetAdmin.ScheduledService.csproj
@@ -2,7 +2,7 @@
-
+
diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DevService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/DevService.cs
index 4ac459b9..b755159e 100644
--- 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
{
req.ThrowIfInvalid();
- // 模块类型(Sys、Biz、等)
+ // 模块类型(Sys、Adm、等)
var moduleType = Enum.GetName(req.Type)!;
// 模板层目录