Merge branch 'master' of https://310.jisheyun.com/daizan/JiShe.IOT.Admin

Dev.Dockerfile

@@ -0,0 +1,32 @@
+# 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
+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/"]
+COPY ["JiShe.ServicePro/", "JiShe.ServicePro/"]
+
+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"]
+
+
+

Directory.Build.props

@@ -2,7 +2,7 @@
 	<!-- 定义项目加载属性 --> 
 	<PropertyGroup>
 		<!--JiShe.ServicePro版本-->
-		<ServiceProVersion>1.0.5.39</ServiceProVersion>
+		<ServiceProVersion>1.0.5.40</ServiceProVersion>
 		<!--Volo Abp 版本-->
 		<VoloAbpVersion>9.1.1</VoloAbpVersion>
 

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

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

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")]
+    [Migration("20250620054425_initCreat")]
-    partial class initCreate
+    partial class initCreat
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)

src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.cs

@@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 namespace JiShe.IoT.Migrations
 {
     /// <inheritdoc />
-    public partial class initCreate : Migration
+    public partial class initCreat : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)