remove 移除user项目

Dlhis.Jinko.Face.sln

@@ -21,8 +21,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scheduled", "Scheduled", "{
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Basic", "Src\Dlhis.Basic\Dlhis.Basic.csproj", "{D1F81CB7-F3EF-4196-A751-468248368020}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.User", "Src\Dlhis.User\Dlhis.User.csproj", "{9F9BC299-3CDD-4CCE-80CA-5FE57332B1F0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Sys", "Src\Dlhis.Sys\Dlhis.Sys.csproj", "{925048C9-5940-4B51-8480-4DC908C754A1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Sys.Api", "Src\Dlhis.Sys.Api\Dlhis.Sys.Api.csproj", "{85A345C7-913E-4C1B-BE1C-600DE408A02F}"
@@ -77,10 +75,6 @@ Global
 		{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
 		{D1F81CB7-F3EF-4196-A751-468248368020}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F9BC299-3CDD-4CCE-80CA-5FE57332B1F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F9BC299-3CDD-4CCE-80CA-5FE57332B1F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F9BC299-3CDD-4CCE-80CA-5FE57332B1F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F9BC299-3CDD-4CCE-80CA-5FE57332B1F0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{925048C9-5940-4B51-8480-4DC908C754A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{925048C9-5940-4B51-8480-4DC908C754A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{925048C9-5940-4B51-8480-4DC908C754A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -138,7 +132,6 @@ Global
 		{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}
-		{9F9BC299-3CDD-4CCE-80CA-5FE57332B1F0} = {57074FD8-1A2F-40C7-8476-001778A3F65D}
 		{925048C9-5940-4B51-8480-4DC908C754A1} = {57074FD8-1A2F-40C7-8476-001778A3F65D}
 		{85A345C7-913E-4C1B-BE1C-600DE408A02F} = {57074FD8-1A2F-40C7-8476-001778A3F65D}
 		{1F337648-8A22-4601-A842-0F634FBA2825} = {4EBCE46B-CE3A-4A47-9432-82A1854CA58A}

Src/Dlhis.Sys/Identity/Controllers/OAuth2Controller.cs

@@ -1,11 +1,11 @@
 using System.Text;
-using Dlhis.User.Identity.Request;
+using Dlhis.Sys.Identity.Request;
 using Kurisu.AspNetCore.Authentication.Options;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json.Linq;
 
-namespace Dlhis.User.Identity.Controllers;
+namespace Dlhis.Sys.Identity.Controllers;
 
 /// <summary>
 /// OAuth2认证

Src/Dlhis.Sys/Identity/Request/ClientGrantRequest.cs

@@ -1,4 +1,4 @@
-namespace Dlhis.User.Identity.Request;
+namespace Dlhis.Sys.Identity.Request;
 
 public class ClientGrantRequest
 {

Src/Dlhis.Sys/Packs/OAuth2HttpClientPack.cs

@@ -1,6 +1,6 @@
 using Kurisu.AspNetCore.Startup;
 
-namespace Dlhis.User.Packs;
+namespace Dlhis.Sys.Packs;
 
 public class OAuth2HttpClientPack : BaseAppPack
 {

Src/Dlhis.User/Dlhis.User.csproj

@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<Nullable>disable</Nullable>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-		<DockerfileContext>..\..</DockerfileContext>
-		<GenerateDocumentationFile>True</GenerateDocumentationFile>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<Compile Remove="log\**" />
-		<Content Remove="log\**" />
-		<EmbeddedResource Remove="log\**" />
-		<None Remove="log\**" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Kurisu.AspNetCore" Version="0.9.11" />
-	</ItemGroup>
-</Project>

Src/Dlhis.User/Dockerfile

@@ -1,21 +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.User/Dlhis.User.csproj", "Src/Dlhis.User/"]
-RUN dotnet restore "Src/Dlhis.User/Dlhis.User.csproj"
-COPY . .
-WORKDIR "/src/Src/Dlhis.User"
-RUN dotnet build "Dlhis.User.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "Dlhis.User.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "Dlhis.User.dll"]

Src/Dlhis.User/Program.cs

@@ -1,21 +0,0 @@
-using Kurisu.AspNetCore.Startup;
-using Microsoft.IdentityModel.Logging;
-
-namespace Dlhis.User
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            KurisuHost.Run<Startup>(args);
-        }
-    }
-
-    public class Startup : DefaultStartup
-    {
-        public Startup(IConfiguration configuration) : base(configuration)
-        {
-            IdentityModelEventSource.ShowPII = true;
-        }
-    }
-}

Src/Dlhis.User/Properties/launchSettings.json

@@ -1,21 +0,0 @@
-{
-  "profiles": {
-    "Dlhis.User": {
-      "commandName": "Project",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5004"
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "http://+:80"
-      },
-      "publishAllPorts": true
-    }
-  },
-  "$schema": "https://json.schemastore.org/launchsettings.json"
-}

Src/Dlhis.User/appsettings.Development.json

@@ -1,34 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "InternalRequest": {
-    "CommonRequestUrl": "http://localhost:5001"
-  },
-  "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"
-    }
-  }
-}

Src/Dlhis.User/appsettings.json

@@ -1,65 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*",
-
-  "SqlSugarOptions": {
-    "DefaultConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=identity;charset=utf8mb4;",
-    "SlaveConnectionString": [],
-    "Timeout": 30,
-    "SlowSqlTime": 1,
-    "EnableSqlLog": false
-  },
-  "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"
-    }
-  },
-  "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}"
-              }
-            }
-          ]
-        }
-      }
-    ]
-  }
-}