From 65f09bcbfe00b33613ec2d18c1b1c1cee76570c0 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Fri, 15 May 2020 13:42:57 +0800 Subject: [PATCH] 1.0.0.515 Former-commit-id: 0f614495c59815d7b497e2795c3a2b471eb18f99 --- projects/.dockerignore | 25 +++++++++++++++++++ projects/IoTCenter/Api/DeviceController.cs | 1 + projects/IoTCenter/Api/NodeController.cs | 3 ++- projects/IoTCenter/Api/ProductController.cs | 2 ++ projects/UserCenter/Dockerfile | 22 ++++++++++++++++ .../UserCenter/Properties/launchSettings.json | 6 +++++ projects/UserCenter/UserCenter.csproj | 2 ++ projects/Version.cs | 2 +- 8 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 projects/.dockerignore create mode 100644 projects/UserCenter/Dockerfile diff --git a/projects/.dockerignore b/projects/.dockerignore new file mode 100644 index 00000000..3729ff0c --- /dev/null +++ b/projects/.dockerignore @@ -0,0 +1,25 @@ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/bin +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE +README.md \ No newline at end of file diff --git a/projects/IoTCenter/Api/DeviceController.cs b/projects/IoTCenter/Api/DeviceController.cs index ccc27e07..418fcc6c 100644 --- a/projects/IoTCenter/Api/DeviceController.cs +++ b/projects/IoTCenter/Api/DeviceController.cs @@ -43,6 +43,7 @@ namespace IoTCenter.Api.Controllers .ThenInclude(o => o.Parameters) .Where(o => o.Number == number) .FirstOrDefault(); + model.Data = model.Data.OrderBy(o => o.Key).ToList(); return Ok(model); } catch (Exception ex) diff --git a/projects/IoTCenter/Api/NodeController.cs b/projects/IoTCenter/Api/NodeController.cs index 1b59ee9b..82ddd7e7 100644 --- a/projects/IoTCenter/Api/NodeController.cs +++ b/projects/IoTCenter/Api/NodeController.cs @@ -37,6 +37,7 @@ namespace IoTCenter.Api.Controllers { var model = this._nodeRepo.ReadOnlyTable() .Where(o => !o.Hidden) + .OrderBy(o => o.Name) .ToList() .Select(o => new { @@ -68,7 +69,7 @@ namespace IoTCenter.Api.Controllers .Include(o => o.Devices).ThenInclude(o => o.Data) .Where(o => o.Number == number) .FirstOrDefault(); - model.Scenes = model.Scenes.Where(o => !o.Hidden).ToList(); + model.Scenes = model.Scenes.Where(o => !o.Hidden).OrderBy(o => o.DisplayOrder).ToList(); return Ok(model); } catch (Exception ex) diff --git a/projects/IoTCenter/Api/ProductController.cs b/projects/IoTCenter/Api/ProductController.cs index a49247bb..f0927b0f 100644 --- a/projects/IoTCenter/Api/ProductController.cs +++ b/projects/IoTCenter/Api/ProductController.cs @@ -31,6 +31,7 @@ namespace IoTCenter.Api.Controllers { var model = this._productRepo.ReadOnlyTable() .OrderBy(o => o.DisplayOrder) + .ThenBy(o => o.Name) .ToList() .Select(o => new { @@ -62,6 +63,7 @@ namespace IoTCenter.Api.Controllers .ThenInclude(o => o.Node) .Where(o => o.Number == number) .FirstOrDefault(); + model.Devices = model.Devices.OrderBy(o => o.NodeId).ToList(); return Ok(model); } catch (Exception ex) diff --git a/projects/UserCenter/Dockerfile b/projects/UserCenter/Dockerfile new file mode 100644 index 00000000..676b782d --- /dev/null +++ b/projects/UserCenter/Dockerfile @@ -0,0 +1,22 @@ +#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. + +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base +WORKDIR /app +EXPOSE 80 + +FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build +WORKDIR /src +COPY ["UserCenter/UserCenter.csproj", "UserCenter/"] +COPY ["Infrastructure/Infrastructure.csproj", "Infrastructure/"] +RUN dotnet restore "UserCenter/UserCenter.csproj" +COPY . . +WORKDIR "/src/UserCenter" +RUN dotnet build "UserCenter.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "UserCenter.csproj" -c Release -o /app/publish + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "UserCenter.dll"] \ No newline at end of file diff --git a/projects/UserCenter/Properties/launchSettings.json b/projects/UserCenter/Properties/launchSettings.json index 025d6304..3475327c 100644 --- a/projects/UserCenter/Properties/launchSettings.json +++ b/projects/UserCenter/Properties/launchSettings.json @@ -22,6 +22,12 @@ "ASPNETCORE_ENVIRONMENT": "Development" }, "applicationUrl": "http://localhost:8010" + }, + "Docker": { + "commandName": "Docker", + "launchBrowser": true, + "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}", + "publishAllPorts": true } } } \ No newline at end of file diff --git a/projects/UserCenter/UserCenter.csproj b/projects/UserCenter/UserCenter.csproj index 79b5a1b5..7dc617ae 100644 --- a/projects/UserCenter/UserCenter.csproj +++ b/projects/UserCenter/UserCenter.csproj @@ -5,6 +5,7 @@ true false false + Linux @@ -12,6 +13,7 @@ + diff --git a/projects/Version.cs b/projects/Version.cs index d6bd90bd..d566ab42 100644 --- a/projects/Version.cs +++ b/projects/Version.cs @@ -1,4 +1,4 @@ using System.Reflection; [assembly: AssemblyVersion("1.0.0.*")] -[assembly: AssemblyInformationalVersion("1.0.0.514-2")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.0.0.515")] \ No newline at end of file