From 8d55ccb4a76b7afbf224558bd188b08c466caf7b Mon Sep 17 00:00:00 2001 From: zenghongyao <873884283@qq.com> Date: Fri, 20 Jun 2025 10:15:59 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=8E=AF=E5=A2=83dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dev.Dockerfile | 30 ++++++++++++++++++++++++++++++ JiShe.IoT.Admin.sln | 1 + JiShe.ServicePro | 2 +- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 Dev.Dockerfile diff --git a/Dev.Dockerfile b/Dev.Dockerfile new file mode 100644 index 0000000..95fec04 --- /dev/null +++ b/Dev.Dockerfile @@ -0,0 +1,30 @@ +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base +WORKDIR /app +EXPOSE 8080 +EXPOSE 443 +ENV TZ=Asia/Shanghai +ENV ASPNETCORE_ENVIRONMENT=Production + +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build +COPY ["JiShe.IoT.Admin.sln", "."] +COPY ["Directory.Build.JiShe.targets", "."] +COPY ["Directory.Build.Microsoft.targets", "."] +COPY ["Directory.Build.props", "."] +COPY ["Directory.Build.targets", "."] +COPY ["Directory.Build.Volo.targets", "."] +COPY ["NuGet.Config", "."] +COPY ["host/", "host/"] +COPY ["src/", "src/"] + +WORKDIR /host/JiShe.IoT.HttpApi.Host + +FROM build AS publish +RUN dotnet publish "JiShe.IoT.HttpApi.Host.csproj" -c Debug -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "JiShe.IoT.HttpApi.Host.dll"] + + + diff --git a/JiShe.IoT.Admin.sln b/JiShe.IoT.Admin.sln index a4afb50..3da7bb7 100644 --- a/JiShe.IoT.Admin.sln +++ b/JiShe.IoT.Admin.sln @@ -34,6 +34,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.DbMigrator", "src EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Solution Items", "0.Solution Items", "{2C4A6DB8-8D9E-42E6-B7C3-1EDB7B3DE22E}" ProjectSection(SolutionItems) = preProject + Dev.Dockerfile = Dev.Dockerfile Directory.Build.JiShe.targets = Directory.Build.JiShe.targets Directory.Build.Microsoft.targets = Directory.Build.Microsoft.targets Directory.Build.props = Directory.Build.props diff --git a/JiShe.ServicePro b/JiShe.ServicePro index 1930aef..2e2ff42 160000 --- a/JiShe.ServicePro +++ b/JiShe.ServicePro @@ -1 +1 @@ -Subproject commit 1930aef81bda3a411cad2c05798975abc6b4597a +Subproject commit 2e2ff42c38196c6e03ec9b4c51b500ad41bc8a4c From 81ff2c93a0ff1856028f18f7666f285fb0033509 Mon Sep 17 00:00:00 2001 From: zenghongyao <873884283@qq.com> Date: Fri, 20 Jun 2025 10:59:34 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=BC=95=E7=94=A8=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3051f1d..12bd30a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 1.0.5.39 + 1.0.5.40 9.1.1 From 4a52911d1d7377e778cf77a86d9210f2d5fe7e94 Mon Sep 17 00:00:00 2001 From: zenghongyao <873884283@qq.com> Date: Fri, 20 Jun 2025 11:04:18 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=8E=AF=E5=A2=83dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dev.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dev.Dockerfile b/Dev.Dockerfile index 95fec04..8d361cb 100644 --- a/Dev.Dockerfile +++ b/Dev.Dockerfile @@ -15,6 +15,7 @@ COPY ["Directory.Build.Volo.targets", "."] COPY ["NuGet.Config", "."] COPY ["host/", "host/"] COPY ["src/", "src/"] +COPY ["SubModules/", "SubModules/"] WORKDIR /host/JiShe.IoT.HttpApi.Host From c9869fdd34f815d55b5b56cca225ca2f2e078a38 Mon Sep 17 00:00:00 2001 From: zenghongyao <873884283@qq.com> Date: Fri, 20 Jun 2025 11:07:36 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=8E=AF=E5=A2=83dockerffile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dev.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dev.Dockerfile b/Dev.Dockerfile index 8d361cb..006c737 100644 --- a/Dev.Dockerfile +++ b/Dev.Dockerfile @@ -15,7 +15,7 @@ COPY ["Directory.Build.Volo.targets", "."] COPY ["NuGet.Config", "."] COPY ["host/", "host/"] COPY ["src/", "src/"] -COPY ["SubModules/", "SubModules/"] +COPY ["JiShe.ServicePro/", "JiShe.ServicePro/"] WORKDIR /host/JiShe.IoT.HttpApi.Host From 904dec1c74cbdbebbf4b7f8144161dc97cc712c3 Mon Sep 17 00:00:00 2001 From: zenghongyao <873884283@qq.com> Date: Fri, 20 Jun 2025 11:16:46 +0800 Subject: [PATCH 5/8] =?UTF-8?q?swagger=E6=96=87=E6=A1=A3=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=EF=BC=8C=E4=BD=BF=E7=94=A8xml=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs index 11880f2..5e47abb 100644 --- a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs +++ b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs @@ -174,7 +174,7 @@ public partial class IoTHttpApiHostModule return description.GroupName == docName; }); - options.EnableAnnotations(enableAnnotationsForInheritance: true, enableAnnotationsForPolymorphism: true); // 启用注解 + //options.EnableAnnotations(enableAnnotationsForInheritance: true, enableAnnotationsForPolymorphism: true); // 启用注解 options.DocumentFilter(); options.SchemaFilter(); // 加载所有xml注释，这里会导致swagger加载有点缓慢 From 12edad05c87420d9bfe21171a37348d11598ca6f Mon Sep 17 00:00:00 2001 From: zenghongyao <873884283@qq.com> Date: Fri, 20 Jun 2025 11:54:04 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dev.Dockerfile | 3 ++- Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dev.Dockerfile b/Dev.Dockerfile index 006c737..e6ffe07 100644 --- a/Dev.Dockerfile +++ b/Dev.Dockerfile @@ -1,4 +1,5 @@ -FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base +# FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base +FROM registry.cn-qingdao.aliyuncs.com/jisheyun/aspnetcore:9.0.6_ub24_simsun_pdp_v341 AS base WORKDIR /app EXPOSE 8080 EXPOSE 443 diff --git a/Dockerfile b/Dockerfile index b48da64..f34140f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base +#FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base +FROM registry.cn-qingdao.aliyuncs.com/jisheyun/aspnetcore:9.0.6_ub24_simsun_pdp_v341 AS base WORKDIR /app EXPOSE 8080 EXPOSE 443 From ec2e460325cfd51a8f25fb021280cae71a9cc812 Mon Sep 17 00:00:00 2001 From: zenghongyao <873884283@qq.com> Date: Fri, 20 Jun 2025 11:59:01 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AD=90=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JiShe.ServicePro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JiShe.ServicePro b/JiShe.ServicePro index 2e2ff42..9de12a2 160000 --- a/JiShe.ServicePro +++ b/JiShe.ServicePro @@ -1 +1 @@ -Subproject commit 2e2ff42c38196c6e03ec9b4c51b500ad41bc8a4c +Subproject commit 9de12a22b086ae78a064f6946985f5150db17787 From eaa98bad83bcc6e3a935549558dd4688215b005f Mon Sep 17 00:00:00 2001 From: zenghongyao <873884283@qq.com> Date: Fri, 20 Jun 2025 14:56:43 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JiShe.ServicePro | 2 +- ...reate.Designer.cs => 20250620054425_initCreat.Designer.cs} | 4 ++-- ...250611083124_initCreate.cs => 20250620054425_initCreat.cs} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/JiShe.IoT.EntityFrameworkCore/Migrations/{20250611083124_initCreate.Designer.cs => 20250620054425_initCreat.Designer.cs} (99%) rename src/JiShe.IoT.EntityFrameworkCore/Migrations/{20250611083124_initCreate.cs => 20250620054425_initCreat.cs} (99%) diff --git a/JiShe.ServicePro b/JiShe.ServicePro index 9de12a2..6a10df1 160000 --- a/JiShe.ServicePro +++ b/JiShe.ServicePro @@ -1 +1 @@ -Subproject commit 9de12a22b086ae78a064f6946985f5150db17787 +Subproject commit 6a10df1cb13cd905d8d032f7837230d130a5705e diff --git a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250611083124_initCreate.Designer.cs b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.Designer.cs similarity index 99% rename from src/JiShe.IoT.EntityFrameworkCore/Migrations/20250611083124_initCreate.Designer.cs rename to src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.Designer.cs index 2d49600..8100c0a 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250611083124_initCreate.Designer.cs +++ b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.Designer.cs @@ -13,8 +13,8 @@ using Volo.Abp.EntityFrameworkCore; namespace JiShe.IoT.Migrations { [DbContext(typeof(IoTDbContext))] - [Migration("20250611083124_initCreate")] - partial class initCreate + [Migration("20250620054425_initCreat")] + partial class initCreat { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) diff --git a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250611083124_initCreate.cs b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.cs similarity index 99% rename from src/JiShe.IoT.EntityFrameworkCore/Migrations/20250611083124_initCreate.cs rename to src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.cs index 6382685..fca9040 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250611083124_initCreate.cs +++ b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace JiShe.IoT.Migrations { /// - public partial class initCreate : Migration + public partial class initCreat : Migration { /// protected override void Up(MigrationBuilder migrationBuilder)