From 8b337d332380eccead01ade6b2de70b923a44520 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Mon, 14 Oct 2024 14:46:54 +0800 Subject: [PATCH] =?UTF-8?q?fix=20common=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dlhis.Jinko.Face.sln | 14 --- .../ApiLog/Controller/ApiLogController.cs | 8 +- .../Common}/ApiLog/Request/ApiLogRequest.cs | 4 +- .../Common}/ApiLog/Response/ApiLogResponse.cs | 2 +- .../Common}/ApiLog/Services/ApiLogService.cs | 8 +- .../Services/Implements/IApiLogService.cs | 6 +- .../Common}/EnumSetting/EnumsController.cs | 4 +- .../Configurations/MinIOOptions.cs | 4 +- .../Constants/FileBucketConstants.cs | 2 +- .../Controllers/FileController.cs | 8 +- .../Request/FileVersionUploadRequest.cs | 4 +- .../Request/UploadFileRequest.cs | 4 +- .../Response/CommonEnumResponse.cs | 2 +- .../Response/FileVersionResponse.cs | 2 +- .../Services/IFileVersionService.cs | 6 +- .../FileOperation/Services/IMinioService.cs | 2 +- .../Services/Implements/FileVersionService.cs | 6 +- .../Services/Implements/MinioService.cs | 4 +- .../Common}/Packs/MinioPack.cs | 4 +- .../SysData/Controller/SysDataController.cs | 4 +- .../SysData/Services/ISysDataService.cs | 2 +- .../Services/Implements/SysDataService.cs | 2 +- Src/Dlhis.Basic/Dlhis.Basic.csproj | 2 + Src/Dlhis.Basic/appsettings.json | 6 ++ Src/Dlhis.Common.Api/Dlhis.Common.Api.csproj | 14 --- Src/Dlhis.Common.Api/IEnumSettingApi.cs | 12 --- Src/Dlhis.Common/.config/dotnet-tools.json | 12 --- Src/Dlhis.Common/Dlhis.Common.csproj | 31 ------- Src/Dlhis.Common/Dockerfile | 22 ----- Src/Dlhis.Common/Program.cs | 18 ---- .../PublishProfiles/FolderProfile.pubxml | 17 ---- .../Properties/launchSettings.json | 13 --- Src/Dlhis.Common/appsettings.Development.json | 42 --------- Src/Dlhis.Common/appsettings.json | 85 ------------------- 34 files changed, 51 insertions(+), 325 deletions(-) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/ApiLog/Controller/ApiLogController.cs (80%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/ApiLog/Request/ApiLogRequest.cs (84%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/ApiLog/Response/ApiLogResponse.cs (96%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/ApiLog/Services/ApiLogService.cs (87%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/ApiLog/Services/Implements/IApiLogService.cs (54%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/EnumSetting/EnumsController.cs (97%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/FileOperation/Configurations/MinIOOptions.cs (76%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/FileOperation/Constants/FileBucketConstants.cs (78%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/FileOperation/Controllers/FileController.cs (92%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/FileOperation/Request/FileVersionUploadRequest.cs (90%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/FileOperation/Request/UploadFileRequest.cs (85%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/FileOperation/Response/CommonEnumResponse.cs (80%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/FileOperation/Response/FileVersionResponse.cs (90%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/FileOperation/Services/IFileVersionService.cs (71%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/FileOperation/Services/IMinioService.cs (94%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/FileOperation/Services/Implements/FileVersionService.cs (93%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/FileOperation/Services/Implements/MinioService.cs (95%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/Packs/MinioPack.cs (84%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/SysData/Controller/SysDataController.cs (86%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/SysData/Services/ISysDataService.cs (71%) rename Src/{Dlhis.Common => Dlhis.Basic/Common}/SysData/Services/Implements/SysDataService.cs (96%) delete mode 100644 Src/Dlhis.Common.Api/Dlhis.Common.Api.csproj delete mode 100644 Src/Dlhis.Common.Api/IEnumSettingApi.cs delete mode 100644 Src/Dlhis.Common/.config/dotnet-tools.json delete mode 100644 Src/Dlhis.Common/Dlhis.Common.csproj delete mode 100644 Src/Dlhis.Common/Dockerfile delete mode 100644 Src/Dlhis.Common/Program.cs delete mode 100644 Src/Dlhis.Common/Properties/PublishProfiles/FolderProfile.pubxml delete mode 100644 Src/Dlhis.Common/Properties/launchSettings.json delete mode 100644 Src/Dlhis.Common/appsettings.Development.json delete mode 100644 Src/Dlhis.Common/appsettings.json diff --git a/Dlhis.Jinko.Face.sln b/Dlhis.Jinko.Face.sln index 08568dbb..92f4fdf4 100644 --- a/Dlhis.Jinko.Face.sln +++ b/Dlhis.Jinko.Face.sln @@ -13,10 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{57074FD8-1A2 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.ScheduledTask", "Src\Dlhis.ScheduledTask\Dlhis.ScheduledTask.csproj", "{0F1F7144-0BA3-4BDC-814E-E57A4E4A6392}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Common", "Src\Dlhis.Common\Dlhis.Common.csproj", "{4C1FADD9-8AFB-4087-9E52-EE6D6523ED38}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Common.Api", "Src\Dlhis.Common.Api\Dlhis.Common.Api.csproj", "{FD8D38C5-0827-49D1-A0BA-7707FBFDA2EC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scheduled", "Scheduled", "{AA987BDF-EF63-467B-AD04-59F9B10D9000}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Basic", "Src\Dlhis.Basic\Dlhis.Basic.csproj", "{D1F81CB7-F3EF-4196-A751-468248368020}" @@ -63,14 +59,6 @@ Global {0F1F7144-0BA3-4BDC-814E-E57A4E4A6392}.Debug|Any CPU.Build.0 = Debug|Any CPU {0F1F7144-0BA3-4BDC-814E-E57A4E4A6392}.Release|Any CPU.ActiveCfg = Release|Any CPU {0F1F7144-0BA3-4BDC-814E-E57A4E4A6392}.Release|Any CPU.Build.0 = Release|Any CPU - {4C1FADD9-8AFB-4087-9E52-EE6D6523ED38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C1FADD9-8AFB-4087-9E52-EE6D6523ED38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C1FADD9-8AFB-4087-9E52-EE6D6523ED38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C1FADD9-8AFB-4087-9E52-EE6D6523ED38}.Release|Any CPU.Build.0 = Release|Any CPU - {FD8D38C5-0827-49D1-A0BA-7707FBFDA2EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD8D38C5-0827-49D1-A0BA-7707FBFDA2EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD8D38C5-0827-49D1-A0BA-7707FBFDA2EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD8D38C5-0827-49D1-A0BA-7707FBFDA2EC}.Release|Any CPU.Build.0 = Release|Any CPU {D1F81CB7-F3EF-4196-A751-468248368020}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D1F81CB7-F3EF-4196-A751-468248368020}.Debug|Any CPU.Build.0 = Debug|Any CPU {D1F81CB7-F3EF-4196-A751-468248368020}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -129,8 +117,6 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {0F1F7144-0BA3-4BDC-814E-E57A4E4A6392} = {AA987BDF-EF63-467B-AD04-59F9B10D9000} - {4C1FADD9-8AFB-4087-9E52-EE6D6523ED38} = {4EBCE46B-CE3A-4A47-9432-82A1854CA58A} - {FD8D38C5-0827-49D1-A0BA-7707FBFDA2EC} = {4EBCE46B-CE3A-4A47-9432-82A1854CA58A} {D1F81CB7-F3EF-4196-A751-468248368020} = {4EBCE46B-CE3A-4A47-9432-82A1854CA58A} {925048C9-5940-4B51-8480-4DC908C754A1} = {57074FD8-1A2F-40C7-8476-001778A3F65D} {85A345C7-913E-4C1B-BE1C-600DE408A02F} = {57074FD8-1A2F-40C7-8476-001778A3F65D} diff --git a/Src/Dlhis.Common/ApiLog/Controller/ApiLogController.cs b/Src/Dlhis.Basic/Common/ApiLog/Controller/ApiLogController.cs similarity index 80% rename from Src/Dlhis.Common/ApiLog/Controller/ApiLogController.cs rename to Src/Dlhis.Basic/Common/ApiLog/Controller/ApiLogController.cs index 33f3f613..6a628341 100644 --- a/Src/Dlhis.Common/ApiLog/Controller/ApiLogController.cs +++ b/Src/Dlhis.Basic/Common/ApiLog/Controller/ApiLogController.cs @@ -1,12 +1,12 @@ -using Dlhis.Common.ApiLog.Request; -using Dlhis.Common.ApiLog.Response; -using Dlhis.Common.ApiLog.Services.Implements; +using Dlhis.Basic.Common.ApiLog.Request; +using Dlhis.Basic.Common.ApiLog.Response; +using Dlhis.Basic.Common.ApiLog.Services.Implements; using Kurisu.AspNetCore.DataAccess.Dto; using Kurisu.AspNetCore.UnifyResultAndValidation.Aop; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace Dlhis.Common.ApiLog.Controller; +namespace Dlhis.Basic.Common.ApiLog.Controller; /// /// API日志控制器 diff --git a/Src/Dlhis.Common/ApiLog/Request/ApiLogRequest.cs b/Src/Dlhis.Basic/Common/ApiLog/Request/ApiLogRequest.cs similarity index 84% rename from Src/Dlhis.Common/ApiLog/Request/ApiLogRequest.cs rename to Src/Dlhis.Basic/Common/ApiLog/Request/ApiLogRequest.cs index 3c3d30ae..5d77ea62 100644 --- a/Src/Dlhis.Common/ApiLog/Request/ApiLogRequest.cs +++ b/Src/Dlhis.Basic/Common/ApiLog/Request/ApiLogRequest.cs @@ -2,7 +2,7 @@ using Kurisu.AspNetCore.CustomClass; using Kurisu.AspNetCore.DataAccess.Dto; -namespace Dlhis.Common.ApiLog.Request; +namespace Dlhis.Basic.Common.ApiLog.Request; public class ApiLogRequest : PageDto, IValidatableObject { @@ -17,7 +17,7 @@ public class ApiLogRequest : PageDto, IValidatableObject public IEnumerable Validate(ValidationContext validationContext) { - if (SearchDateTimePeriod != null && SearchDateTimePeriod.End.HasValue) + if (SearchDateTimePeriod is { End: not null }) { SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1); } diff --git a/Src/Dlhis.Common/ApiLog/Response/ApiLogResponse.cs b/Src/Dlhis.Basic/Common/ApiLog/Response/ApiLogResponse.cs similarity index 96% rename from Src/Dlhis.Common/ApiLog/Response/ApiLogResponse.cs rename to Src/Dlhis.Basic/Common/ApiLog/Response/ApiLogResponse.cs index 82bf8766..2cf33937 100644 --- a/Src/Dlhis.Common/ApiLog/Response/ApiLogResponse.cs +++ b/Src/Dlhis.Basic/Common/ApiLog/Response/ApiLogResponse.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Dlhis.Common.ApiLog.Response +namespace Dlhis.Basic.Common.ApiLog.Response { public class ApiLogResponse { diff --git a/Src/Dlhis.Common/ApiLog/Services/ApiLogService.cs b/Src/Dlhis.Basic/Common/ApiLog/Services/ApiLogService.cs similarity index 87% rename from Src/Dlhis.Common/ApiLog/Services/ApiLogService.cs rename to Src/Dlhis.Basic/Common/ApiLog/Services/ApiLogService.cs index 80d15567..bbf0ea41 100644 --- a/Src/Dlhis.Common/ApiLog/Services/ApiLogService.cs +++ b/Src/Dlhis.Basic/Common/ApiLog/Services/ApiLogService.cs @@ -1,6 +1,6 @@ -using Dlhis.Common.ApiLog.Request; -using Dlhis.Common.ApiLog.Response; -using Dlhis.Common.ApiLog.Services.Implements; +using Dlhis.Basic.Common.ApiLog.Request; +using Dlhis.Basic.Common.ApiLog.Response; +using Dlhis.Basic.Common.ApiLog.Services.Implements; using Dlhis.Entity.Common; using Kurisu.AspNetCore.DataAccess.Dto; using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions; @@ -8,7 +8,7 @@ using Kurisu.AspNetCore.DataAccess.SqlSugar.Services; using Kurisu.AspNetCore.Utils.Extensions; using SqlSugar; -namespace Dlhis.Common.ApiLog.Services +namespace Dlhis.Basic.Common.ApiLog.Services { public class ApiLogService : IApiLogService { diff --git a/Src/Dlhis.Common/ApiLog/Services/Implements/IApiLogService.cs b/Src/Dlhis.Basic/Common/ApiLog/Services/Implements/IApiLogService.cs similarity index 54% rename from Src/Dlhis.Common/ApiLog/Services/Implements/IApiLogService.cs rename to Src/Dlhis.Basic/Common/ApiLog/Services/Implements/IApiLogService.cs index 6cd1d744..ad115619 100644 --- a/Src/Dlhis.Common/ApiLog/Services/Implements/IApiLogService.cs +++ b/Src/Dlhis.Basic/Common/ApiLog/Services/Implements/IApiLogService.cs @@ -1,8 +1,8 @@ -using Dlhis.Common.ApiLog.Request; -using Dlhis.Common.ApiLog.Response; +using Dlhis.Basic.Common.ApiLog.Request; +using Dlhis.Basic.Common.ApiLog.Response; using Kurisu.AspNetCore.DataAccess.Dto; -namespace Dlhis.Common.ApiLog.Services.Implements; +namespace Dlhis.Basic.Common.ApiLog.Services.Implements; public interface IApiLogService : IScopeDependency { diff --git a/Src/Dlhis.Common/EnumSetting/EnumsController.cs b/Src/Dlhis.Basic/Common/EnumSetting/EnumsController.cs similarity index 97% rename from Src/Dlhis.Common/EnumSetting/EnumsController.cs rename to Src/Dlhis.Basic/Common/EnumSetting/EnumsController.cs index 9b9fbac1..ec613052 100644 --- a/Src/Dlhis.Common/EnumSetting/EnumsController.cs +++ b/Src/Dlhis.Basic/Common/EnumSetting/EnumsController.cs @@ -1,5 +1,5 @@ using System.Reflection; -using Dlhis.Common.FileOperation.Response; +using Dlhis.Basic.Common.FileOperation.Response; using Dlhis.Entity.Basic.Entity; using Kurisu.AspNetCore.CustomClass; using Kurisu.AspNetCore.DataAccess.SqlSugar.Services; @@ -8,7 +8,7 @@ using Kurisu.AspNetCore.Utils.Extensions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace Dlhis.Common.EnumSetting; +namespace Dlhis.Basic.Common.EnumSetting; /// /// 枚举 diff --git a/Src/Dlhis.Common/FileOperation/Configurations/MinIOOptions.cs b/Src/Dlhis.Basic/Common/FileOperation/Configurations/MinIOOptions.cs similarity index 76% rename from Src/Dlhis.Common/FileOperation/Configurations/MinIOOptions.cs rename to Src/Dlhis.Basic/Common/FileOperation/Configurations/MinIOOptions.cs index f76d8e4d..6990a2d2 100644 --- a/Src/Dlhis.Common/FileOperation/Configurations/MinIOOptions.cs +++ b/Src/Dlhis.Basic/Common/FileOperation/Configurations/MinIOOptions.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using Kurisu.AspNetCore.ConfigurableOptions.Attributes; -namespace Dlhis.Common.FileOperation.Configurations; +namespace Dlhis.Basic.Common.FileOperation.Configurations; [Configuration("MinIO")] @@ -15,6 +15,4 @@ public class MinIOOptions [Required] public string SecretKey { get; set; } - - public string DefaultBucket { get; set; } } diff --git a/Src/Dlhis.Common/FileOperation/Constants/FileBucketConstants.cs b/Src/Dlhis.Basic/Common/FileOperation/Constants/FileBucketConstants.cs similarity index 78% rename from Src/Dlhis.Common/FileOperation/Constants/FileBucketConstants.cs rename to Src/Dlhis.Basic/Common/FileOperation/Constants/FileBucketConstants.cs index a26b3e14..27ec87bb 100644 --- a/Src/Dlhis.Common/FileOperation/Constants/FileBucketConstants.cs +++ b/Src/Dlhis.Basic/Common/FileOperation/Constants/FileBucketConstants.cs @@ -1,4 +1,4 @@ -namespace Dlhis.Common.FileOperation.Constants; +namespace Dlhis.Basic.Common.FileOperation.Constants; public static class FileBucketConstants { diff --git a/Src/Dlhis.Common/FileOperation/Controllers/FileController.cs b/Src/Dlhis.Basic/Common/FileOperation/Controllers/FileController.cs similarity index 92% rename from Src/Dlhis.Common/FileOperation/Controllers/FileController.cs rename to Src/Dlhis.Basic/Common/FileOperation/Controllers/FileController.cs index ecdd0b14..073b60a2 100644 --- a/Src/Dlhis.Common/FileOperation/Controllers/FileController.cs +++ b/Src/Dlhis.Basic/Common/FileOperation/Controllers/FileController.cs @@ -1,12 +1,12 @@ using System.ComponentModel.DataAnnotations; -using Dlhis.Common.FileOperation.Request; -using Dlhis.Common.FileOperation.Response; -using Dlhis.Common.FileOperation.Services; +using Dlhis.Basic.Common.FileOperation.Request; +using Dlhis.Basic.Common.FileOperation.Response; +using Dlhis.Basic.Common.FileOperation.Services; using Kurisu.AspNetCore.DataAccess.Dto; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace Dlhis.Common.FileOperation.Controllers; +namespace Dlhis.Basic.Common.FileOperation.Controllers; /// /// 文件操作 diff --git a/Src/Dlhis.Common/FileOperation/Request/FileVersionUploadRequest.cs b/Src/Dlhis.Basic/Common/FileOperation/Request/FileVersionUploadRequest.cs similarity index 90% rename from Src/Dlhis.Common/FileOperation/Request/FileVersionUploadRequest.cs rename to Src/Dlhis.Basic/Common/FileOperation/Request/FileVersionUploadRequest.cs index 45e4726d..10c35d71 100644 --- a/Src/Dlhis.Common/FileOperation/Request/FileVersionUploadRequest.cs +++ b/Src/Dlhis.Basic/Common/FileOperation/Request/FileVersionUploadRequest.cs @@ -1,8 +1,8 @@ using System.ComponentModel.DataAnnotations; -using Dlhis.Common.FileOperation.Constants; +using Dlhis.Basic.Common.FileOperation.Constants; using Microsoft.AspNetCore.Mvc; -namespace Dlhis.Common.FileOperation.Request; +namespace Dlhis.Basic.Common.FileOperation.Request; public class FileVersionUploadRequest : IValidatableObject { diff --git a/Src/Dlhis.Common/FileOperation/Request/UploadFileRequest.cs b/Src/Dlhis.Basic/Common/FileOperation/Request/UploadFileRequest.cs similarity index 85% rename from Src/Dlhis.Common/FileOperation/Request/UploadFileRequest.cs rename to Src/Dlhis.Basic/Common/FileOperation/Request/UploadFileRequest.cs index 302f64f4..08a489cd 100644 --- a/Src/Dlhis.Common/FileOperation/Request/UploadFileRequest.cs +++ b/Src/Dlhis.Basic/Common/FileOperation/Request/UploadFileRequest.cs @@ -1,8 +1,8 @@ using System.ComponentModel.DataAnnotations; -using Dlhis.Common.FileOperation.Constants; +using Dlhis.Basic.Common.FileOperation.Constants; using Microsoft.AspNetCore.Mvc; -namespace Dlhis.Common.FileOperation.Request; +namespace Dlhis.Basic.Common.FileOperation.Request; public class UploadFileRequest : IValidatableObject { diff --git a/Src/Dlhis.Common/FileOperation/Response/CommonEnumResponse.cs b/Src/Dlhis.Basic/Common/FileOperation/Response/CommonEnumResponse.cs similarity index 80% rename from Src/Dlhis.Common/FileOperation/Response/CommonEnumResponse.cs rename to Src/Dlhis.Basic/Common/FileOperation/Response/CommonEnumResponse.cs index 77a620bf..dbe928b1 100644 --- a/Src/Dlhis.Common/FileOperation/Response/CommonEnumResponse.cs +++ b/Src/Dlhis.Basic/Common/FileOperation/Response/CommonEnumResponse.cs @@ -1,6 +1,6 @@ using Kurisu.AspNetCore.CustomClass; -namespace Dlhis.Common.FileOperation.Response; +namespace Dlhis.Basic.Common.FileOperation.Response; public class CommonEnumResponse { diff --git a/Src/Dlhis.Common/FileOperation/Response/FileVersionResponse.cs b/Src/Dlhis.Basic/Common/FileOperation/Response/FileVersionResponse.cs similarity index 90% rename from Src/Dlhis.Common/FileOperation/Response/FileVersionResponse.cs rename to Src/Dlhis.Basic/Common/FileOperation/Response/FileVersionResponse.cs index 891f6358..72982576 100644 --- a/Src/Dlhis.Common/FileOperation/Response/FileVersionResponse.cs +++ b/Src/Dlhis.Basic/Common/FileOperation/Response/FileVersionResponse.cs @@ -1,4 +1,4 @@ -namespace Dlhis.Common.FileOperation.Response; +namespace Dlhis.Basic.Common.FileOperation.Response; public class FileVersionResponse { diff --git a/Src/Dlhis.Common/FileOperation/Services/IFileVersionService.cs b/Src/Dlhis.Basic/Common/FileOperation/Services/IFileVersionService.cs similarity index 71% rename from Src/Dlhis.Common/FileOperation/Services/IFileVersionService.cs rename to Src/Dlhis.Basic/Common/FileOperation/Services/IFileVersionService.cs index 57dc6580..a54bb13b 100644 --- a/Src/Dlhis.Common/FileOperation/Services/IFileVersionService.cs +++ b/Src/Dlhis.Basic/Common/FileOperation/Services/IFileVersionService.cs @@ -1,8 +1,8 @@ -using Dlhis.Common.FileOperation.Request; -using Dlhis.Common.FileOperation.Response; +using Dlhis.Basic.Common.FileOperation.Request; +using Dlhis.Basic.Common.FileOperation.Response; using Kurisu.AspNetCore.DataAccess.Dto; -namespace Dlhis.Common.FileOperation.Services; +namespace Dlhis.Basic.Common.FileOperation.Services; public interface IFileVersionService : IScopeDependency { diff --git a/Src/Dlhis.Common/FileOperation/Services/IMinioService.cs b/Src/Dlhis.Basic/Common/FileOperation/Services/IMinioService.cs similarity index 94% rename from Src/Dlhis.Common/FileOperation/Services/IMinioService.cs rename to Src/Dlhis.Basic/Common/FileOperation/Services/IMinioService.cs index 6a318f01..6c080ebd 100644 --- a/Src/Dlhis.Common/FileOperation/Services/IMinioService.cs +++ b/Src/Dlhis.Basic/Common/FileOperation/Services/IMinioService.cs @@ -1,4 +1,4 @@ -namespace Dlhis.Common.FileOperation.Services; +namespace Dlhis.Basic.Common.FileOperation.Services; public interface IMinioService : ISingletonDependency { diff --git a/Src/Dlhis.Common/FileOperation/Services/Implements/FileVersionService.cs b/Src/Dlhis.Basic/Common/FileOperation/Services/Implements/FileVersionService.cs similarity index 93% rename from Src/Dlhis.Common/FileOperation/Services/Implements/FileVersionService.cs rename to Src/Dlhis.Basic/Common/FileOperation/Services/Implements/FileVersionService.cs index 3db3202a..9c896eef 100644 --- a/Src/Dlhis.Common/FileOperation/Services/Implements/FileVersionService.cs +++ b/Src/Dlhis.Basic/Common/FileOperation/Services/Implements/FileVersionService.cs @@ -1,11 +1,11 @@ -using Dlhis.Common.FileOperation.Request; -using Dlhis.Common.FileOperation.Response; +using Dlhis.Basic.Common.FileOperation.Request; +using Dlhis.Basic.Common.FileOperation.Response; using Dlhis.Entity.Common; using Kurisu.AspNetCore.DataAccess.Dto; using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions; using Kurisu.AspNetCore.DataAccess.SqlSugar.Services; -namespace Dlhis.Common.FileOperation.Services.Implements; +namespace Dlhis.Basic.Common.FileOperation.Services.Implements; public class FileVersionService : IFileVersionService { diff --git a/Src/Dlhis.Common/FileOperation/Services/Implements/MinioService.cs b/Src/Dlhis.Basic/Common/FileOperation/Services/Implements/MinioService.cs similarity index 95% rename from Src/Dlhis.Common/FileOperation/Services/Implements/MinioService.cs rename to Src/Dlhis.Basic/Common/FileOperation/Services/Implements/MinioService.cs index b89a842f..e285e7fd 100644 --- a/Src/Dlhis.Common/FileOperation/Services/Implements/MinioService.cs +++ b/Src/Dlhis.Basic/Common/FileOperation/Services/Implements/MinioService.cs @@ -1,10 +1,10 @@ -using Dlhis.Common.FileOperation.Configurations; +using Dlhis.Basic.Common.FileOperation.Configurations; using Kurisu.AspNetCore.Utils.Extensions; using Microsoft.Extensions.Options; using Minio; using Minio.DataModel.Args; -namespace Dlhis.Common.FileOperation.Services.Implements; +namespace Dlhis.Basic.Common.FileOperation.Services.Implements; public class MinioService : IMinioService { diff --git a/Src/Dlhis.Common/Packs/MinioPack.cs b/Src/Dlhis.Basic/Common/Packs/MinioPack.cs similarity index 84% rename from Src/Dlhis.Common/Packs/MinioPack.cs rename to Src/Dlhis.Basic/Common/Packs/MinioPack.cs index b1989362..014eee28 100644 --- a/Src/Dlhis.Common/Packs/MinioPack.cs +++ b/Src/Dlhis.Basic/Common/Packs/MinioPack.cs @@ -1,9 +1,9 @@ -using Dlhis.Common.FileOperation.Configurations; +using Dlhis.Basic.Common.FileOperation.Configurations; using Kurisu.AspNetCore.Startup; using Microsoft.Extensions.Options; using Minio; -namespace Dlhis.Common.Packs; +namespace Dlhis.Basic.Common.Packs; public class MinioPack : BaseAppPack { diff --git a/Src/Dlhis.Common/SysData/Controller/SysDataController.cs b/Src/Dlhis.Basic/Common/SysData/Controller/SysDataController.cs similarity index 86% rename from Src/Dlhis.Common/SysData/Controller/SysDataController.cs rename to Src/Dlhis.Basic/Common/SysData/Controller/SysDataController.cs index 7e5a31e2..89c308d0 100644 --- a/Src/Dlhis.Common/SysData/Controller/SysDataController.cs +++ b/Src/Dlhis.Basic/Common/SysData/Controller/SysDataController.cs @@ -1,9 +1,9 @@ -using Dlhis.Common.SysData.Services; +using Dlhis.Basic.Common.SysData.Services; using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace Dlhis.Common.SysData.Controller; +namespace Dlhis.Basic.Common.SysData.Controller; [Authorize] [Route("api/[controller]")] diff --git a/Src/Dlhis.Common/SysData/Services/ISysDataService.cs b/Src/Dlhis.Basic/Common/SysData/Services/ISysDataService.cs similarity index 71% rename from Src/Dlhis.Common/SysData/Services/ISysDataService.cs rename to Src/Dlhis.Basic/Common/SysData/Services/ISysDataService.cs index 422e7136..6ee75f00 100644 --- a/Src/Dlhis.Common/SysData/Services/ISysDataService.cs +++ b/Src/Dlhis.Basic/Common/SysData/Services/ISysDataService.cs @@ -1,4 +1,4 @@ -namespace Dlhis.Common.SysData.Services; +namespace Dlhis.Basic.Common.SysData.Services; public interface ISysDataService : IScopeDependency { diff --git a/Src/Dlhis.Common/SysData/Services/Implements/SysDataService.cs b/Src/Dlhis.Basic/Common/SysData/Services/Implements/SysDataService.cs similarity index 96% rename from Src/Dlhis.Common/SysData/Services/Implements/SysDataService.cs rename to Src/Dlhis.Basic/Common/SysData/Services/Implements/SysDataService.cs index a8764994..53ec663d 100644 --- a/Src/Dlhis.Common/SysData/Services/Implements/SysDataService.cs +++ b/Src/Dlhis.Basic/Common/SysData/Services/Implements/SysDataService.cs @@ -5,7 +5,7 @@ using Kurisu.AspNetCore.DataAccess.Entity; using Kurisu.AspNetCore.DataAccess.SqlSugar.Services; using SqlSugar; -namespace Dlhis.Common.SysData.Services.Implements; +namespace Dlhis.Basic.Common.SysData.Services.Implements; public class SysDataService : ISysDataService { diff --git a/Src/Dlhis.Basic/Dlhis.Basic.csproj b/Src/Dlhis.Basic/Dlhis.Basic.csproj index 2d2370fa..cf699d42 100644 --- a/Src/Dlhis.Basic/Dlhis.Basic.csproj +++ b/Src/Dlhis.Basic/Dlhis.Basic.csproj @@ -21,6 +21,7 @@ + @@ -31,6 +32,7 @@ + diff --git a/Src/Dlhis.Basic/appsettings.json b/Src/Dlhis.Basic/appsettings.json index d6137a66..af884ed4 100644 --- a/Src/Dlhis.Basic/appsettings.json +++ b/Src/Dlhis.Basic/appsettings.json @@ -55,6 +55,12 @@ "ClientSecret": "123456" } }, + "MinIO": { + "Endpoint": "http://192.168.199.124:9000", + "AccessKey": "bmQOlK0COe5nL56kzGd3", + "SecretKey": "Udc5uBrGcT2yukfGXQtHKpqLQ27L1FmbrLyYunBr", + "DefaultBucket": "apk" + }, "Serilog": { "MinimumLevel": { "Default": "Information", diff --git a/Src/Dlhis.Common.Api/Dlhis.Common.Api.csproj b/Src/Dlhis.Common.Api/Dlhis.Common.Api.csproj deleted file mode 100644 index 7c16a4bd..00000000 --- a/Src/Dlhis.Common.Api/Dlhis.Common.Api.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - net6.0 - enable - disable - True - - - - - - - diff --git a/Src/Dlhis.Common.Api/IEnumSettingApi.cs b/Src/Dlhis.Common.Api/IEnumSettingApi.cs deleted file mode 100644 index 31dd3677..00000000 --- a/Src/Dlhis.Common.Api/IEnumSettingApi.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Kurisu.RemoteCall.Attributes; -using Kurisu.RemoteCall.Default; - -namespace Dlhis.Common.Api; - -[EnableRemoteClient(Name = "common-service", BaseUrl = "${InternalRequest:CommonRequestUrl}")] -public interface IEnumSettingApi -{ - [Auth] - [Get("/api/enums")] - Task> GetEnums(string code = null); -} diff --git a/Src/Dlhis.Common/.config/dotnet-tools.json b/Src/Dlhis.Common/.config/dotnet-tools.json deleted file mode 100644 index fd9a39d8..00000000 --- a/Src/Dlhis.Common/.config/dotnet-tools.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 1, - "isRoot": true, - "tools": { - "dotnet-ef": { - "version": "8.0.1", - "commands": [ - "dotnet-ef" - ] - } - } -} \ No newline at end of file diff --git a/Src/Dlhis.Common/Dlhis.Common.csproj b/Src/Dlhis.Common/Dlhis.Common.csproj deleted file mode 100644 index 70d8ea34..00000000 --- a/Src/Dlhis.Common/Dlhis.Common.csproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - net6.0 - disable - enable - True - Linux - ..\.. - - - - - - - - - - - - - - - - - - - - - - diff --git a/Src/Dlhis.Common/Dockerfile b/Src/Dlhis.Common/Dockerfile deleted file mode 100644 index 938c3356..00000000 --- a/Src/Dlhis.Common/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. - -FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base -WORKDIR /app -EXPOSE 80 - -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build -WORKDIR /src -COPY ["Src/Dlhis.Common/Dlhis.Common.csproj", "Src/Dlhis.Common/"] -COPY ["Src/Dlhis.Entity/Dlhis.Entity.csproj", "Src/Dlhis.Entity/"] -RUN dotnet restore "Src/Dlhis.Common/Dlhis.Common.csproj" -COPY . . -WORKDIR "/src/Src/Dlhis.Common" -RUN dotnet build "Dlhis.Common.csproj" -c Release -o /app/build - -FROM build AS publish -RUN dotnet publish "Dlhis.Common.csproj" -c Release -o /app/publish /p:UseAppHost=false - -FROM base AS final -WORKDIR /app -COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "Dlhis.Common.dll"] \ No newline at end of file diff --git a/Src/Dlhis.Common/Program.cs b/Src/Dlhis.Common/Program.cs deleted file mode 100644 index 3c574499..00000000 --- a/Src/Dlhis.Common/Program.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Kurisu.AspNetCore.Startup; -using Microsoft.IdentityModel.Logging; - -class Program -{ - static void Main(string[] args) - { - KurisuHost.Run(args); - } -} - -public class Startup : DefaultStartup -{ - public Startup(IConfiguration configuration) : base(configuration) - { - IdentityModelEventSource.ShowPII = true; - } -} \ No newline at end of file diff --git a/Src/Dlhis.Common/Properties/PublishProfiles/FolderProfile.pubxml b/Src/Dlhis.Common/Properties/PublishProfiles/FolderProfile.pubxml deleted file mode 100644 index c012208d..00000000 --- a/Src/Dlhis.Common/Properties/PublishProfiles/FolderProfile.pubxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - false - false - true - Release - Any CPU - FileSystem - D:\新建下载\迪联科技\common - FileSystem - <_TargetId>Folder - - \ No newline at end of file diff --git a/Src/Dlhis.Common/Properties/launchSettings.json b/Src/Dlhis.Common/Properties/launchSettings.json deleted file mode 100644 index ed0229c2..00000000 --- a/Src/Dlhis.Common/Properties/launchSettings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "profiles": { - "Dlhis.Common": { - "commandName": "Project", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "dotnetRunMessages": true, - "applicationUrl": "http://localhost:5001" - } - }, - "$schema": "https://json.schemastore.org/launchsettings.json" -} \ No newline at end of file diff --git a/Src/Dlhis.Common/appsettings.Development.json b/Src/Dlhis.Common/appsettings.Development.json deleted file mode 100644 index 2b64c0f8..00000000 --- a/Src/Dlhis.Common/appsettings.Development.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "SwaggerOptions": { - "Enable": true, - "Authority": "https://yikatong.isawesome.cn/oauth2", - "ClientId": "4fb184324eac4180", - "ClientSecret": "8ac8f235152f1524", - "Scopes": { - "openid": "openid", - "profile": "profile", - "yikatong": "yikatong" - } - }, - "IdentityServerOptions": { - "Authority": "https://yikatong.isawesome.cn/oauth2", - "RequireHttpsMetadata": true, - "Issuer": "identity.isawesome.cn", - "Audience": "", - "Pat": { - "Enable": false, - "Scheme": "token", - "ClientId": "reference", - "ClientSecret": "123456" - } - }, - //minIO配置 - "MinIO": { - //服务器IP - "Endpoint": "http://192.168.199.124:9000", - //账号 - "AccessKey": "bmQOlK0COe5nL56kzGd3", - //密码 - "SecretKey": "Udc5uBrGcT2yukfGXQtHKpqLQ27L1FmbrLyYunBr", - //默认存储桶 - "DefaultBucket": "apk" - } -} diff --git a/Src/Dlhis.Common/appsettings.json b/Src/Dlhis.Common/appsettings.json deleted file mode 100644 index 9bcca65b..00000000 --- a/Src/Dlhis.Common/appsettings.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "SqlSugarOptions": { - "DefaultConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=yikatong;charset=utf8mb4;", - "SlaveConnectionString": [], - "FaceConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=face;charset=utf8mb4;", - "LogConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=log;charset=utf8mb4;", - "Timeout": 30, - "SlowSqlTime": 1, - "EnableSqlLog": false - }, - - "AllowedHosts": "*", - "SwaggerOptions": { - "Enable": true, - "Authority": "http://identity.oauth.svc.cluster.local", - "ClientId": "4fb184324eac4180", - "ClientSecret": "8ac8f235152f1524", - "Scopes": { - "openid": "openid", - "profile": "profile", - "yikatong": "yikatong" - } - }, - "IdentityServerOptions": { - "Authority": "http://identity.oauth.svc.cluster.local", - "RequireHttpsMetadata": false, - "Issuer": "identity.isawesome.cn", - "Audience": "", - "Pat": { - "Enable": false, - "Scheme": "token", - "ClientId": "reference", - "ClientSecret": "123456" - } - }, - "MinIO": { - //服务器IP - "Endpoint": "http://192.168.199.124:9000", - //账号 - "AccessKey": "bmQOlK0COe5nL56kzGd3", - //密码 - "SecretKey": "Udc5uBrGcT2yukfGXQtHKpqLQ27L1FmbrLyYunBr", - //apk默认存储桶 - "DefaultBucket": "apk" - }, - "Serilog": { - "MinimumLevel": { - "Default": "Information", - "Override": { - "System": "Warning", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "WriteTo": [ - { - "Name": "Async", - "Args": { - "configure": [ - { - "Name": "Console", - "Args": { - "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}" - } - }, - { - "Name": "MySQL", - "Args": { - "connectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=log;charset=utf8mb4;", - "tableName": "Logs", - "autoCreateSqlTable": true - } - } - ] - } - } - ] - } -}