diff --git a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs b/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs index 7faea3fc..c27ad203 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs +++ b/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs @@ -3,6 +3,7 @@ using Dlhis.Basic.BusinessPlace.Response; using Dlhis.Basic.BusinessPlace.Services; using Dlhis.Basic.BusinessShift.Response; using Dlhis.Basic.BusinessShift.Services; +using Dlhis.Common.Api; using Kurisu.Core.DataAccess.Dto; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -19,12 +20,14 @@ public class BusinessPlacesController : ControllerBase { private readonly IBusinessPlaceService _businessPlaceService; private readonly IBusinessPlaceShiftService _businessPlaceShiftService; + private readonly IEnumSettingApi _enumSettingApi; public BusinessPlacesController(IBusinessPlaceService businessPlaceService, - IBusinessPlaceShiftService businessPlaceShiftService) + IBusinessPlaceShiftService businessPlaceShiftService, IEnumSettingApi enumSettingApi) { _businessPlaceService = businessPlaceService; _businessPlaceShiftService = businessPlaceShiftService; + _enumSettingApi = enumSettingApi; } /// @@ -35,6 +38,7 @@ public class BusinessPlacesController : ControllerBase [HttpGet("page")] public async Task> GetPageAsync([FromQuery] BusinessPlacePageRequest request) { + var enums = await _enumSettingApi.GetEnums(); return await _businessPlaceService.GetPageAsync(request); } diff --git a/Src/Dlhis.Basic/Dlhis.Basic.csproj b/Src/Dlhis.Basic/Dlhis.Basic.csproj index eba1dc8d..075efa3c 100644 --- a/Src/Dlhis.Basic/Dlhis.Basic.csproj +++ b/Src/Dlhis.Basic/Dlhis.Basic.csproj @@ -6,6 +6,7 @@ enable Linux True + ..\.. @@ -17,9 +18,11 @@ + + diff --git a/Src/Dlhis.Basic/Dockerfile b/Src/Dlhis.Basic/Dockerfile index e5e76d7e..074db035 100644 --- a/Src/Dlhis.Basic/Dockerfile +++ b/Src/Dlhis.Basic/Dockerfile @@ -6,11 +6,11 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Dlhis.Basic/Dlhis.Basic.csproj", "Dlhis.Basic/"] +COPY ["Src/Dlhis.Basic/Dlhis.Basic.csproj", "Src/Dlhis.Basic/"] COPY ["Src/Dlhis.Entity/Dlhis.Entity.csproj", "Src/Dlhis.Entity/"] -RUN dotnet restore "Dlhis.Basic/Dlhis.Basic.csproj" +RUN dotnet restore "Src/Dlhis.Basic/Dlhis.Basic.csproj" COPY . . -WORKDIR "/src/Dlhis.Basic" +WORKDIR "/src/Src/Dlhis.Basic" RUN dotnet build "Dlhis.Basic.csproj" -c Release -o /app/build FROM build AS publish diff --git a/Src/Dlhis.Basic/Properties/launchSettings.json b/Src/Dlhis.Basic/Properties/launchSettings.json index eec7b064..2321b0e1 100644 --- a/Src/Dlhis.Basic/Properties/launchSettings.json +++ b/Src/Dlhis.Basic/Properties/launchSettings.json @@ -2,7 +2,6 @@ "profiles": { "Dlhis.Basic": { "commandName": "Project", - "launchBrowser": false, "launchUrl": "swagger/index.html", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" diff --git a/Src/Dlhis.Basic/appsettings.Development.json b/Src/Dlhis.Basic/appsettings.Development.json index 0c208ae9..beca36f8 100644 --- a/Src/Dlhis.Basic/appsettings.Development.json +++ b/Src/Dlhis.Basic/appsettings.Development.json @@ -4,5 +4,8 @@ "Default": "Information", "Microsoft.AspNetCore": "Warning" } + }, + "InternalRequest": { + "CommonRequestUrl": "http://localhost:5001" } } diff --git a/Src/Dlhis.Common/Properties/launchSettings.json b/Src/Dlhis.Common/Properties/launchSettings.json index f3b4ecc0..ed0229c2 100644 --- a/Src/Dlhis.Common/Properties/launchSettings.json +++ b/Src/Dlhis.Common/Properties/launchSettings.json @@ -7,14 +7,6 @@ }, "dotnetRunMessages": true, "applicationUrl": "http://localhost:5001" - }, - "Docker": { - "commandName": "Docker", - "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}", - "environmentVariables": { - "ASPNETCORE_URLS": "http://+:80" - }, - "publishAllPorts": true } }, "$schema": "https://json.schemastore.org/launchsettings.json" diff --git a/Src/Dlhis.Permission/Dockerfile b/Src/Dlhis.Permission/Dockerfile index c8f50dba..d0ee9cec 100644 --- a/Src/Dlhis.Permission/Dockerfile +++ b/Src/Dlhis.Permission/Dockerfile @@ -7,6 +7,7 @@ EXPOSE 80 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src COPY ["Src/Dlhis.Permission/Dlhis.Permission.csproj", "Src/Dlhis.Permission/"] +COPY ["Src/Dlhis.Entity/Dlhis.Entity.csproj", "Src/Dlhis.Entity/"] RUN dotnet restore "Src/Dlhis.Permission/Dlhis.Permission.csproj" COPY . . WORKDIR "/src/Src/Dlhis.Permission"