Merge branch 'master' of http://101.132.182.216:3000/cgx/petwash

PetWash.Api/Controllers/OrdersController.cs

@@ -50,7 +50,7 @@ public class OrdersController : ControllerBase
         if (order == null)
             return NotFound();
 
-        return Ok(order);
+        return Ok(order);  
     }
 
     [HttpGet("{id}/payment-status")]

PetWash.Api/Dockerfile

@@ -1,30 +1,30 @@
-# 使用 .NET 8.0 SDK 作为构建镜像
+# 请参阅 https://aka.ms/customizecontainer 以了解如何自定义调试容器，以及 Visual Studio 如何使用此 Dockerfile 生成映像以更快地进行调试。
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
-WORKDIR /src
 
-# 复制项目文件并还原依赖
+# 此阶段用于在快速模式(默认为调试配置)下从 VS 运行时
-COPY ["PetWash.Api/PetWash.Api.csproj", "PetWash.Api/"]
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
-RUN dotnet restore "PetWash.Api/PetWash.Api.csproj"
+USER $APP_UID
-
-# 复制所有文件并构建
-COPY . .
-WORKDIR "/src/PetWash.Api"
-RUN dotnet build "PetWash.Api.csproj" -c Release -o /app/build
-
-# 发布应用
-FROM build AS publish
-RUN dotnet publish "PetWash.Api.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-# 使用运行时镜像
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final
 WORKDIR /app
-EXPOSE 80
+EXPOSE 8080
-EXPOSE 443
+EXPOSE 8081
 
-# 复制发布的文件
+
+# 此阶段用于生成服务项目
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /src
+COPY ["PetWash.Api.csproj", "."]
+RUN dotnet restore "./PetWash.Api.csproj"
+COPY . .
+WORKDIR "/src/."
+RUN dotnet build "./PetWash.Api.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+# 此阶段用于发布要复制到最终阶段的服务项目
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./PetWash.Api.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+# 此阶段在生产中使用，或在常规模式下从 VS 运行时使用(在不使用调试配置时为默认值)
+FROM base AS final
+WORKDIR /app
 COPY --from=publish /app/publish .
-
+ENTRYPOINT ["dotnet", "PetWash.Api.dll"]
-# 设置环境变量
-ENV ASPNETCORE_URLS=http://+:80
-
-ENTRYPOINT ["dotnet", "PetWash.Api.dll"]

PetWash.Api/Services/MqttService.cs

@@ -16,7 +16,7 @@ public class MqttService : IHostedService
         
         var optionsBuilder = new MqttServerOptionsBuilder()
             .WithDefaultEndpoint()
-            .WithDefaultEndpointPort(1883);
+            .WithDefaultEndpointPort(1883);  
 
         _mqttServer = new MqttFactory().CreateMqttServer(optionsBuilder.Build());