fix common合并

2024-10-14 14:46:54 +08:00
parent 247e0156f9
commit f2302c1870
34 changed files with 51 additions and 325 deletions
--- 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}"
@@ -65,14 +61,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
@@ -135,8 +123,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}
--- a/Src/Dlhis.Basic/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;

 /// <summary>
 /// API日志控制器
--- a/Src/Dlhis.Basic/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<ValidationResult> Validate(ValidationContext validationContext)
    {
-        if (SearchDateTimePeriod != null && SearchDateTimePeriod.End.HasValue)
+        if (SearchDateTimePeriod is { End: not null })
        {
            SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1);
        }
--- a/Src/Dlhis.Basic/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
    {
--- a/Src/Dlhis.Basic/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
    {
--- a/Src/Dlhis.Basic/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
 {
--- a/Src/Dlhis.Basic/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;

 /// <summary>
 /// 枚举
--- a/Src/Dlhis.Basic/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; }
 }
--- a/Src/Dlhis.Basic/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
 {
--- a/Src/Dlhis.Basic/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;

 /// <summary>
 /// 文件操作
--- a/Src/Dlhis.Basic/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
 {
--- a/Src/Dlhis.Basic/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
 {
--- a/Src/Dlhis.Basic/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
 {
--- a/Src/Dlhis.Basic/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
 {
--- a/Src/Dlhis.Basic/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
 {
--- a/Src/Dlhis.Basic/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
 {
--- a/Src/Dlhis.Basic/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
 {
--- a/Src/Dlhis.Basic/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
 {
--- a/Src/Dlhis.Basic/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
 {
--- a/Src/Dlhis.Basic/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]")]
--- a/Src/Dlhis.Basic/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
 {
--- a/Src/Dlhis.Basic/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
 {
--- a/Src/Dlhis.Basic/Dlhis.Basic.csproj
+++ b/Src/Dlhis.Basic/Dlhis.Basic.csproj
@@ -21,6 +21,7 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
+    <PackageReference Include="Minio" Version="6.0.3" />
  </ItemGroup>

  <ItemGroup>
@@ -31,6 +32,7 @@
  </ItemGroup>

  <ItemGroup>
+    <Folder Include="Common\" />
    <Folder Include="Summary\Request\" />
  </ItemGroup>

--- 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",
--- a/Src/Dlhis.Common.Api/Dlhis.Common.Api.csproj
+++ b/Src/Dlhis.Common.Api/Dlhis.Common.Api.csproj
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>disable</Nullable>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Kurisu.RemoteCall" Version="0.4.2" />
-  </ItemGroup>
-
-</Project>
--- a/Src/Dlhis.Common.Api/IEnumSettingApi.cs
+++ b/Src/Dlhis.Common.Api/IEnumSettingApi.cs
@@ -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<DefaultApiResult<object>> GetEnums(string code = null);
-}
--- a/Src/Dlhis.Common/.config/dotnet-tools.json
+++ b/Src/Dlhis.Common/.config/dotnet-tools.json
@@ -1,12 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "dotnet-ef": {
-      "version": "8.0.1",
-      "commands": [
-        "dotnet-ef"
-      ]
-    }
-  }
-}
--- a/Src/Dlhis.Common/Dlhis.Common.csproj
+++ b/Src/Dlhis.Common/Dlhis.Common.csproj
@@ -1,31 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>disable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerfileContext>..\..</DockerfileContext>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="log\**" />
-    <Compile Remove="Response\**" />
-    <Content Remove="log\**" />
-    <Content Remove="Response\**" />
-    <EmbeddedResource Remove="log\**" />
-    <EmbeddedResource Remove="Response\**" />
-    <None Remove="log\**" />
-    <None Remove="Response\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Dlhis.Entity\Dlhis.Entity.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Minio" Version="6.0.2" />
-  </ItemGroup>
-
-</Project>
--- a/Src/Dlhis.Common/Dockerfile
+++ b/Src/Dlhis.Common/Dockerfile
@@ -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"]
--- a/Src/Dlhis.Common/Program.cs
+++ b/Src/Dlhis.Common/Program.cs
@@ -1,18 +0,0 @@
-using Kurisu.AspNetCore.Startup;
-using Microsoft.IdentityModel.Logging;
-
-class Program
-{
-    static void Main(string[] args)
-    {
-        KurisuHost.Run<Startup>(args);
-    }
-}
-
-public class Startup : DefaultStartup
-{
-    public Startup(IConfiguration configuration) : base(configuration)
-    {
-        IdentityModelEventSource.ShowPII = true;
-    }
-}
--- a/Src/Dlhis.Common/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/Src/Dlhis.Common/Properties/PublishProfiles/FolderProfile.pubxml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
-->
-<Project>
-  <PropertyGroup>
-    <DeleteExistingFiles>false</DeleteExistingFiles>
-    <ExcludeApp_Data>false</ExcludeApp_Data>
-    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>D:\新建下载\迪联科技\common</PublishUrl>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <_TargetId>Folder</_TargetId>
-  </PropertyGroup>
-</Project>
--- a/Src/Dlhis.Common/Properties/launchSettings.json
+++ b/Src/Dlhis.Common/Properties/launchSettings.json
@@ -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"
-}
--- a/Src/Dlhis.Common/appsettings.Development.json
+++ b/Src/Dlhis.Common/appsettings.Development.json
@@ -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"
-  }
-}
--- a/Src/Dlhis.Common/appsettings.json
+++ b/Src/Dlhis.Common/appsettings.json
@@ -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
-              }
-            }
-          ]
-        }
-      }
-    ]
-  }
-}