From 00bc873605791e8e44a482ceb6e830de96fa5ce5 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 27 Jun 2025 17:25:37 +0800 Subject: [PATCH] =?UTF-8?q?refactor=20=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=20-=20sln=E5=8D=87=E7=BA=A7=E5=88=B0slnx=20-=20=E7=A7=BB?= =?UTF-8?q?=E9=99=A4gateway=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dlhis.Jinko.Face.sln | 160 --------------------- Dlhis.Jinko.Face.slnx | 32 +++++ Src/Gateway/Dockerfile | 21 --- Src/Gateway/Gateway.csproj | 25 ---- Src/Gateway/Program.cs | 20 --- Src/Gateway/Properties/launchSettings.json | 14 -- Src/Gateway/Startup.cs | 37 ----- Src/Gateway/appsettings.Development.json | 8 -- Src/Gateway/appsettings.json | 19 --- Src/Gateway/ocelot.Development.json | 104 -------------- Src/Gateway/ocelot.json | 115 --------------- global.json | 7 + 12 files changed, 39 insertions(+), 523 deletions(-) delete mode 100644 Dlhis.Jinko.Face.sln create mode 100644 Dlhis.Jinko.Face.slnx delete mode 100644 Src/Gateway/Dockerfile delete mode 100644 Src/Gateway/Gateway.csproj delete mode 100644 Src/Gateway/Program.cs delete mode 100644 Src/Gateway/Properties/launchSettings.json delete mode 100644 Src/Gateway/Startup.cs delete mode 100644 Src/Gateway/appsettings.Development.json delete mode 100644 Src/Gateway/appsettings.json delete mode 100644 Src/Gateway/ocelot.Development.json delete mode 100644 Src/Gateway/ocelot.json create mode 100644 global.json diff --git a/Dlhis.Jinko.Face.sln b/Dlhis.Jinko.Face.sln deleted file mode 100644 index ed3b6625..00000000 --- a/Dlhis.Jinko.Face.sln +++ /dev/null @@ -1,160 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.7.34302.85 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Basic", "Basic", "{4EBCE46B-CE3A-4A47-9432-82A1854CA58A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Canteen", "Canteen", "{3D8A98C1-83C9-4375-AEAB-4F72AFAF365B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Entity", "Src\Dlhis.Entity\Dlhis.Entity.csproj", "{53884925-C9B9-4965-8B0D-100076CA0F43}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sys", "Sys", "{57074FD8-1A2F-40C7-8476-001778A3F65D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.ScheduledTask", "Src\Dlhis.ScheduledTask\Dlhis.ScheduledTask.csproj", "{0F1F7144-0BA3-4BDC-814E-E57A4E4A6392}" -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}" -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}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Basic.Api", "Src\Dlhis.Basic.Api\Dlhis.Basic.Api.csproj", "{1F337648-8A22-4601-A842-0F634FBA2825}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gateway", "Src\Gateway\Gateway.csproj", "{00DE1D49-8F1F-4EAA-B06F-CDE0EFAA03D3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{489252FB-A44B-46EE-B065-21CDCB724441}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.External", "Src\Dlhis.External\Dlhis.External.csproj", "{8472596E-0DE7-4A17-93D6-F0FC7D44FDF5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Canteen", "Src\Dlhis.Canteen\Dlhis.Canteen.csproj", "{A54426E2-1CA0-48AB-BBA6-07CDE2807E35}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Message", "Message", "{65E76F97-E78A-4C95-B788-4091236B1A79}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Message", "Src\Dlhis.Message\Dlhis.Message.csproj", "{053BF7B2-B1A0-435F-9C77-2EF5622CC5C5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.InfoCheck", "Src\Dlhis.InfoCheck\Dlhis.InfoCheck.csproj", "{4D656761-8CE7-4316-A3DF-8C1722D69CCE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Middle", "Src\Dlhis.Middle\Dlhis.Middle.csproj", "{762C944C-36A1-4F1A-803F-08F9BD8891D1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.DataPermission.Model", "Src\Dlhis.DataPermission.Model\Dlhis.DataPermission.Model.csproj", "{CA1427E2-CC70-4489-8653-1C05630C8392}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dlhis.InfoCheck.Api", "Src\Dlhis.InfoCheck.Api\Dlhis.InfoCheck.Api.csproj", "{A501D16E-638F-4156-989C-2BACCC2FAC2B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dlhis.Jip.Api", "Src\Dlhis.Jip.Api\Dlhis.Jip.Api.csproj", "{841B7B43-5394-413F-9D68-A07EBDD6D4CD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dlhis.Dh.Api", "Src\Dlhis.Dh.Api\Dlhis.Dh.Api.csproj", "{E673CA04-3567-4E03-9A86-994F50291ACC}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dlhis.Constants", "Src\Dlhis.Constants\Dlhis.Constants.csproj", "{F98329D8-F8CA-4794-B1BF-8659112119F7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dlhis.Canteen.Api", "Src\Dlhis.Canteen.Api\Dlhis.Canteen.Api.csproj", "{7934BE46-9409-4D28-8B35-82A0F900DD01}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dlhis.ExcelHelper", "Src\Dlhis.ExcelHelper\Dlhis.ExcelHelper.csproj", "{F8287775-E641-479D-952B-FFE7D826E52E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {53884925-C9B9-4965-8B0D-100076CA0F43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53884925-C9B9-4965-8B0D-100076CA0F43}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53884925-C9B9-4965-8B0D-100076CA0F43}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53884925-C9B9-4965-8B0D-100076CA0F43}.Release|Any CPU.Build.0 = Release|Any CPU - {0F1F7144-0BA3-4BDC-814E-E57A4E4A6392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {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 - {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 - {D1F81CB7-F3EF-4196-A751-468248368020}.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 - {925048C9-5940-4B51-8480-4DC908C754A1}.Release|Any CPU.Build.0 = Release|Any CPU - {85A345C7-913E-4C1B-BE1C-600DE408A02F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85A345C7-913E-4C1B-BE1C-600DE408A02F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85A345C7-913E-4C1B-BE1C-600DE408A02F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85A345C7-913E-4C1B-BE1C-600DE408A02F}.Release|Any CPU.Build.0 = Release|Any CPU - {1F337648-8A22-4601-A842-0F634FBA2825}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F337648-8A22-4601-A842-0F634FBA2825}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F337648-8A22-4601-A842-0F634FBA2825}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F337648-8A22-4601-A842-0F634FBA2825}.Release|Any CPU.Build.0 = Release|Any CPU - {00DE1D49-8F1F-4EAA-B06F-CDE0EFAA03D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00DE1D49-8F1F-4EAA-B06F-CDE0EFAA03D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00DE1D49-8F1F-4EAA-B06F-CDE0EFAA03D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00DE1D49-8F1F-4EAA-B06F-CDE0EFAA03D3}.Release|Any CPU.Build.0 = Release|Any CPU - {8472596E-0DE7-4A17-93D6-F0FC7D44FDF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8472596E-0DE7-4A17-93D6-F0FC7D44FDF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8472596E-0DE7-4A17-93D6-F0FC7D44FDF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8472596E-0DE7-4A17-93D6-F0FC7D44FDF5}.Release|Any CPU.Build.0 = Release|Any CPU - {A54426E2-1CA0-48AB-BBA6-07CDE2807E35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A54426E2-1CA0-48AB-BBA6-07CDE2807E35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A54426E2-1CA0-48AB-BBA6-07CDE2807E35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A54426E2-1CA0-48AB-BBA6-07CDE2807E35}.Release|Any CPU.Build.0 = Release|Any CPU - {053BF7B2-B1A0-435F-9C77-2EF5622CC5C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {053BF7B2-B1A0-435F-9C77-2EF5622CC5C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {053BF7B2-B1A0-435F-9C77-2EF5622CC5C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {053BF7B2-B1A0-435F-9C77-2EF5622CC5C5}.Release|Any CPU.Build.0 = Release|Any CPU - {4D656761-8CE7-4316-A3DF-8C1722D69CCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D656761-8CE7-4316-A3DF-8C1722D69CCE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D656761-8CE7-4316-A3DF-8C1722D69CCE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D656761-8CE7-4316-A3DF-8C1722D69CCE}.Release|Any CPU.Build.0 = Release|Any CPU - {762C944C-36A1-4F1A-803F-08F9BD8891D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {762C944C-36A1-4F1A-803F-08F9BD8891D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {762C944C-36A1-4F1A-803F-08F9BD8891D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {762C944C-36A1-4F1A-803F-08F9BD8891D1}.Release|Any CPU.Build.0 = Release|Any CPU - {CA1427E2-CC70-4489-8653-1C05630C8392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA1427E2-CC70-4489-8653-1C05630C8392}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA1427E2-CC70-4489-8653-1C05630C8392}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA1427E2-CC70-4489-8653-1C05630C8392}.Release|Any CPU.Build.0 = Release|Any CPU - {A501D16E-638F-4156-989C-2BACCC2FAC2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A501D16E-638F-4156-989C-2BACCC2FAC2B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A501D16E-638F-4156-989C-2BACCC2FAC2B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A501D16E-638F-4156-989C-2BACCC2FAC2B}.Release|Any CPU.Build.0 = Release|Any CPU - {841B7B43-5394-413F-9D68-A07EBDD6D4CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {841B7B43-5394-413F-9D68-A07EBDD6D4CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {841B7B43-5394-413F-9D68-A07EBDD6D4CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {841B7B43-5394-413F-9D68-A07EBDD6D4CD}.Release|Any CPU.Build.0 = Release|Any CPU - {E673CA04-3567-4E03-9A86-994F50291ACC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E673CA04-3567-4E03-9A86-994F50291ACC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E673CA04-3567-4E03-9A86-994F50291ACC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E673CA04-3567-4E03-9A86-994F50291ACC}.Release|Any CPU.Build.0 = Release|Any CPU - {F98329D8-F8CA-4794-B1BF-8659112119F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F98329D8-F8CA-4794-B1BF-8659112119F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F98329D8-F8CA-4794-B1BF-8659112119F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F98329D8-F8CA-4794-B1BF-8659112119F7}.Release|Any CPU.Build.0 = Release|Any CPU - {7934BE46-9409-4D28-8B35-82A0F900DD01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7934BE46-9409-4D28-8B35-82A0F900DD01}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7934BE46-9409-4D28-8B35-82A0F900DD01}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7934BE46-9409-4D28-8B35-82A0F900DD01}.Release|Any CPU.Build.0 = Release|Any CPU - {F8287775-E641-479D-952B-FFE7D826E52E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8287775-E641-479D-952B-FFE7D826E52E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8287775-E641-479D-952B-FFE7D826E52E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8287775-E641-479D-952B-FFE7D826E52E}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {0F1F7144-0BA3-4BDC-814E-E57A4E4A6392} = {AA987BDF-EF63-467B-AD04-59F9B10D9000} - {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} - {1F337648-8A22-4601-A842-0F634FBA2825} = {4EBCE46B-CE3A-4A47-9432-82A1854CA58A} - {8472596E-0DE7-4A17-93D6-F0FC7D44FDF5} = {489252FB-A44B-46EE-B065-21CDCB724441} - {A54426E2-1CA0-48AB-BBA6-07CDE2807E35} = {3D8A98C1-83C9-4375-AEAB-4F72AFAF365B} - {053BF7B2-B1A0-435F-9C77-2EF5622CC5C5} = {65E76F97-E78A-4C95-B788-4091236B1A79} - {4D656761-8CE7-4316-A3DF-8C1722D69CCE} = {4EBCE46B-CE3A-4A47-9432-82A1854CA58A} - {A501D16E-638F-4156-989C-2BACCC2FAC2B} = {4EBCE46B-CE3A-4A47-9432-82A1854CA58A} - {841B7B43-5394-413F-9D68-A07EBDD6D4CD} = {4EBCE46B-CE3A-4A47-9432-82A1854CA58A} - {E673CA04-3567-4E03-9A86-994F50291ACC} = {4EBCE46B-CE3A-4A47-9432-82A1854CA58A} - {7934BE46-9409-4D28-8B35-82A0F900DD01} = {3D8A98C1-83C9-4375-AEAB-4F72AFAF365B} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {7439494A-E2FD-4FEA-8ABF-74AE57A4A5A0} - EndGlobalSection -EndGlobal diff --git a/Dlhis.Jinko.Face.slnx b/Dlhis.Jinko.Face.slnx new file mode 100644 index 00000000..6115dc44 --- /dev/null +++ b/Dlhis.Jinko.Face.slnx @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Src/Gateway/Dockerfile b/Src/Gateway/Dockerfile deleted file mode 100644 index 03f81a4b..00000000 --- a/Src/Gateway/Dockerfile +++ /dev/null @@ -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/Gateway/Gateway.csproj", "Src/Gateway/"] -RUN dotnet restore "Src/Gateway/Gateway.csproj" -COPY . . -WORKDIR "/src/Src/Gateway" -RUN dotnet build "Gateway.csproj" -c Release -o /app/build - -FROM build AS publish -RUN dotnet publish "Gateway.csproj" -c Release -o /app/publish /p:UseAppHost=false - -FROM base AS final -WORKDIR /app -COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "Gateway.dll"] \ No newline at end of file diff --git a/Src/Gateway/Gateway.csproj b/Src/Gateway/Gateway.csproj deleted file mode 100644 index b68b6edf..00000000 --- a/Src/Gateway/Gateway.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - net6.0 - enable - enable - Linux - ..\.. - - - - - - - - - - - PreserveNewest - true - PreserveNewest - - - - diff --git a/Src/Gateway/Program.cs b/Src/Gateway/Program.cs deleted file mode 100644 index c8fd2e8b..00000000 --- a/Src/Gateway/Program.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Gateway; - -public class Program -{ - public static void Main(string[] args) - { - Host.CreateDefaultBuilder(args) - .ConfigureAppConfiguration((context, builder) => - { - if (context.HostingEnvironment.IsProduction()) - { - builder.AddJsonFile("ocelot.json", true, true); - } - - builder.AddJsonFile($"ocelot.{context.HostingEnvironment.EnvironmentName}.json", true, true); - }) - .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }) - .Build().Run(); - } -} \ No newline at end of file diff --git a/Src/Gateway/Properties/launchSettings.json b/Src/Gateway/Properties/launchSettings.json deleted file mode 100644 index c9a8e63f..00000000 --- a/Src/Gateway/Properties/launchSettings.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "profiles": { - "Gateway": { - "commandName": "Project", - "launchBrowser": false, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "dotnetRunMessages": true, - "applicationUrl": "http://localhost:5000" - } - }, - "$schema": "https://json.schemastore.org/launchsettings.json" -} \ No newline at end of file diff --git a/Src/Gateway/Startup.cs b/Src/Gateway/Startup.cs deleted file mode 100644 index faa2187a..00000000 --- a/Src/Gateway/Startup.cs +++ /dev/null @@ -1,37 +0,0 @@ -using Microsoft.OpenApi.Models; -using Ocelot.DependencyInjection; -using Ocelot.Middleware; - -namespace Gateway; - -public class Startup -{ - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - public void ConfigureServices(IServiceCollection services) - { - services.AddEndpointsApiExplorer(); - services.AddSwaggerGen(c => { c.SwaggerDoc("v1", new OpenApiInfo { Title = "Gateway API", Version = "v1", Description = "gateway api" }); }); - - services.AddOcelot(); - } - - public void Configure(IApplicationBuilder app) - { - app.UseSwagger(); - app.UseSwaggerUI(c => - { - var services = Configuration.GetSection("Services").Get>(); - foreach (var s in services) - { - c.SwaggerEndpoint($"/{s.ToLower()}/swagger/v1/swagger.json", s); - } - }); - app.UseOcelot().Wait(); - } -} \ No newline at end of file diff --git a/Src/Gateway/appsettings.Development.json b/Src/Gateway/appsettings.Development.json deleted file mode 100644 index 0c208ae9..00000000 --- a/Src/Gateway/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/Src/Gateway/appsettings.json b/Src/Gateway/appsettings.json deleted file mode 100644 index 45319d79..00000000 --- a/Src/Gateway/appsettings.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "AllowedHosts": "*", - "Services": [ - "Basic", - "Common", - "Canteen", - "Scheduled", - "Sys", - "Visitor", - "Message", - "External" - ] -} diff --git a/Src/Gateway/ocelot.Development.json b/Src/Gateway/ocelot.Development.json deleted file mode 100644 index 810f246f..00000000 --- a/Src/Gateway/ocelot.Development.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "Routes": [ - { - "UpstreamPathTemplate": "/api/oauth2/{url}", - "DownstreamPathTemplate": "/api/{url}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 5000 - } - ] - }, - { - "UpstreamPathTemplate": "/api/common/{url}", - "DownstreamPathTemplate": "/api/{url}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 5001 - } - ] - }, - { - "UpstreamPathTemplate": "/api/sys/{url}", - "DownstreamPathTemplate": "/api/{url}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 5003 - } - ] - }, - { - "UpstreamPathTemplate": "/api/basic/{url}", - "DownstreamPathTemplate": "/api/{url}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 5002 - } - ] - }, - { - "UpstreamPathTemplate": "/basic/swagger/v1/swagger.json", - "DownstreamPathTemplate": "/swagger/v1/swagger.json", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 5002 - } - ] - }, - { - "UpstreamPathTemplate": "/api/scheduled/{url}", - "DownstreamPathTemplate": "/api/{url}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 5010 - } - ] - }, - { - "UpstreamPathTemplate": "/api/canteen/{url}", - "DownstreamPathTemplate": "/api/{url}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 5008 - } - ] - }, - { - "UpstreamPathTemplate": "/api/external/{url}", - "DownstreamPathTemplate": "/api/{url}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 5020 - } - ] - }, - { - "UpstreamPathTemplate": "/{url}/swagger/v1/swagger.json", - "DownstreamPathTemplate": "/{url}/swagger/v1/swagger.json", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 5000 - } - ] - } - ], - "GlobalConfiguration": {} -} \ No newline at end of file diff --git a/Src/Gateway/ocelot.json b/Src/Gateway/ocelot.json deleted file mode 100644 index 9d73c2e7..00000000 --- a/Src/Gateway/ocelot.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "Routes": [ - { - "UpstreamPathTemplate": "/api/oauth2/{url}", - "DownstreamPathTemplate": "/api/{url}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "192.168.199.30", - "Port": 31001 - } - ] - }, - { - "UpstreamPathTemplate": "/api/common/{url}", - "DownstreamPathTemplate": "/api/{url}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "192.168.199.30", - "Port": 31002 - } - ] - }, - { - "UpstreamPathTemplate": "/api/sys/{url}", - "DownstreamPathTemplate": "/api/{url}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "192.168.199.30", - "Port": 31003 - } - ] - }, - { - "UpstreamPathTemplate": "/api/basic/{url}", - "DownstreamPathTemplate": "/api/{url}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "192.168.199.30", - "Port": 31005 - } - ] - }, - { - "UpstreamPathTemplate": "/api/scheduled/{url}", - "DownstreamPathTemplate": "/api/{url}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "192.168.199.30", - "Port": 31006 - } - ] - }, - { - "UpstreamPathTemplate": "/api/canteen/{url}", - "DownstreamPathTemplate": "/api/{url}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "192.168.199.30", - "Port": 31007 - } - ] - }, - { - "UpstreamPathTemplate": "/api/visitor/{url}", - "DownstreamPathTemplate": "/api/{url}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "192.168.199.30", - "Port": 31008 - } - ] - }, - { - "UpstreamPathTemplate": "/api/message/{url}", - "DownstreamPathTemplate": "/api/{url}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "192.168.199.30", - "Port": 31009 - } - ] - }, - { - "UpstreamPathTemplate": "/api/external/{url}", - "DownstreamPathTemplate": "/api/{url}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "192.168.199.30", - "Port": 30882 - } - ] - }, - { - "UpstreamPathTemplate": "/{url}/swagger/v1/swagger.json", - "DownstreamPathTemplate": "/{url}/swagger/v1/swagger.json", - "DownstreamScheme": "https", - "DownstreamHostAndPorts": [ - { - "Host": "yikatong.isawesome.cn", - "Port": 443 - } - ] - } - ], - "GlobalConfiguration": {} -} \ No newline at end of file diff --git a/global.json b/global.json new file mode 100644 index 00000000..87aef9f1 --- /dev/null +++ b/global.json @@ -0,0 +1,7 @@ +{ + "sdk": { + "version": "6.0.0", + "rollForward": "latestMajor", + "allowPrerelease": false + } +} \ No newline at end of file