1.0.0.515

Former-commit-id: 0f614495c59815d7b497e2795c3a2b471eb18f99

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

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)

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)

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)

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"]

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
     }
   }
 }

projects/UserCenter/UserCenter.csproj

@@ -5,6 +5,7 @@
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Deterministic>false</Deterministic>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\Version.cs" Link="Version.cs" />
@@ -12,6 +13,7 @@
   <ItemGroup>
     <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="3.1.1" />
     <PackageReference Include="AspNet.Security.OAuth.QQ" Version="3.1.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
     <PackageReference Include="RavenDB.Embedded" Version="4.2.102" />
   </ItemGroup>
   <ItemGroup>

projects/Version.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("1.0.0.*")]
-[assembly: AssemblyInformationalVersion("1.0.0.514-2")]
+[assembly: AssemblyInformationalVersion("1.0.0.515")]