From cfcf0808aab961feb9b08f2e8ac6498b1c75b6d0 Mon Sep 17 00:00:00 2001
From: ChenYi <296215406@outlook.com>
Date: Fri, 20 Jun 2025 09:27:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E8=BF=9B=E8=A1=8C=E9=A1=B9=E7=9B=AE=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=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

---
 .gitignore                                       | 16 ++++++++++++++++
 Directory.Build.props                            |  7 +------
 JiShe.ServicePro                                 |  2 +-
 .../JiShe.IoT.HttpApi.Host.csproj                |  4 ++--
 host/JiShe.IoT.HttpApi.Host/Pages/Login.cshtml   |  2 +-
 .../JiShe.IoT.Application.Contracts.csproj       |  4 ++--
 .../JiShe.IoT.Application.csproj                 |  6 +++---
 .../JiShe.IoT.Domain.Shared.csproj               |  4 ++--
 src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj     |  4 ++--
 .../JiShe.IoT.EntityFrameworkCore.csproj         |  4 ++--
 .../JiShe.IoT.HttpApi.Client.csproj              |  4 ++--
 src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj   |  6 +++---
 12 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4b8b936..0b0b735 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,19 @@
 /src/JiShe.IoT.Application/obj
 /src/JiShe.IoT.Application.Contracts/obj
 /src/JiShe.IoT.Domain.Shared/obj
+/src/JiShe.IoT.Application/bin/Release/net9.0
+/src/JiShe.IoT.Application.Contracts/bin/Release/net9.0
+/src/JiShe.IoT.Domain/bin/Release/net9.0
+/src/JiShe.IoT.Domain.Shared/bin/Release/net9.0
+/src/JiShe.IoT.EntityFrameworkCore/bin/Release/net9.0
+/src/JiShe.IoT.HttpApi/bin/Release/net9.0
+/gateways/JiShe.IoT.WebGateway/bin/Release/net9.0
+/host/JiShe.IoT.HttpApi.Host/bin/Release/net9.0
+/host/JiShe.IoT.HttpApi.Host/bin/Release/net9.0/ca/Hangfire.Core.resources.dll
+/src/JiShe.IoT.DbMigrator/bin/Release/net9.0
+/src/JiShe.IoT.HttpApi.Client/bin/Release/net9.0
+/test/JiShe.IoT.Application.Tests/bin/Release/net9.0
+/test/JiShe.IoT.Domain.Tests/bin/Release/net9.0
+/test/JiShe.IoT.EntityFrameworkCore.Tests/bin/Release/net9.0
+/test/JiShe.IoT.HttpApi.Client.ConsoleTestApp/bin/Release/net9.0
+/test/JiShe.IoT.TestBase/bin/Release/net9.0
diff --git a/Directory.Build.props b/Directory.Build.props
index 2aa808b..3051f1d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,10 +11,5 @@
 
 		<!--Dotnet 框架 版本-->
 		<DotnetTargetFrameworkVersion>net9.0</DotnetTargetFrameworkVersion>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<!--包引入方式 0 Debug，1 Release-->
-		<UsePackage Condition="'$(UsePackage)' == ''">0</UsePackage>
-	</PropertyGroup>
+	</PropertyGroup> 
 </Project>
\ No newline at end of file
diff --git a/JiShe.ServicePro b/JiShe.ServicePro
index 106ec6d..a07f2f5 160000
--- a/JiShe.ServicePro
+++ b/JiShe.ServicePro
@@ -1 +1 @@
-Subproject commit 106ec6dde92123461fc44a94f594367bdc111243
+Subproject commit a07f2f5c2aedd6515e5af30db40e961113afb987
diff --git a/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj b/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj
index 6c483d1..4027a34 100644
--- a/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj
+++ b/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj
@@ -49,14 +49,14 @@
         <ProjectReference Include="..\..\src\JiShe.IoT.HttpApi\JiShe.IoT.HttpApi.csproj" />
     </ItemGroup>
 
-	<ItemGroup Condition="'$(UsePackage)' == '0'" Label="Debug">
+	<ItemGroup Condition=" '$(Configuration)' == 'Debug'" Label="Debug">
 		<ProjectReference Include="..\..\JiShe.ServicePro\frameworks\src\JiShe.ServicePro.CAP.EntityFrameworkCore\JiShe.ServicePro.CAP.EntityFrameworkCore.csproj" />
 		<ProjectReference Include="..\..\JiShe.ServicePro\frameworks\src\JiShe.ServicePro.CAP\JiShe.ServicePro.CAP.csproj" />
 		<ProjectReference Include="..\..\JiShe.ServicePro\shared\JiShe.ServicePro.Shared.Hosting.Microservices\JiShe.ServicePro.Shared.Hosting.Microservices.csproj" />
 		<ProjectReference Include="..\..\src\JiShe.IoT.Application\JiShe.IoT.Application.csproj" />
 	</ItemGroup>
 
-    <ItemGroup Condition="'$(UsePackage)' == '1'" Label="Release">
+	<ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release">
         <PackageReference Include="JiShe.ServicePro.Shared.Hosting.Microservices" />
 		<PackageReference Include="JiShe.ServicePro.CAP" />
 		<PackageReference Include="JiShe.ServicePro.CAP.EntityFrameworkCore" />
diff --git a/host/JiShe.IoT.HttpApi.Host/Pages/Login.cshtml b/host/JiShe.IoT.HttpApi.Host/Pages/Login.cshtml
index da3684e..ff8d399 100644
--- a/host/JiShe.IoT.HttpApi.Host/Pages/Login.cshtml
+++ b/host/JiShe.IoT.HttpApi.Host/Pages/Login.cshtml
@@ -6,7 +6,7 @@
 }
 
 <!DOCTYPE html>
-
+ 
 <html>
 <head>
     <title>后台服务登录</title>
diff --git a/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj b/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj
index c98b9b9..c5ac73a 100644
--- a/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj
+++ b/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj
@@ -15,7 +15,7 @@
         <PackageReference Include="Volo.Abp.ObjectExtending" />
     </ItemGroup>
 
-	<ItemGroup Condition="'$(UsePackage)' == '0'" Label="Debug">
+	<ItemGroup Condition=" '$(Configuration)' == 'Debug'" Label="Debug">
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\BasicManagement\src\JiShe.ServicePro.BasicManagement.Application.Contracts\JiShe.ServicePro.BasicManagement.Application.Contracts.csproj" />
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\CTWingManagement\src\JiShe.ServicePro.CTWingManagement.Application.Contracts\JiShe.ServicePro.CTWingManagement.Application.Contracts.csproj" />
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\DataDictionaryManagement\src\JiShe.ServicePro.DataDictionaryManagement.Application.Contracts\JiShe.ServicePro.DataDictionaryManagement.Application.Contracts.csproj" />
@@ -28,7 +28,7 @@
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.Application.Contracts\JiShe.ServicePro.TemplateManagement.Application.Contracts.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(UsePackage)' == '1'" Label="Release">
+	<ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release">
         <PackageReference Include="JiShe.ServicePro.BasicManagement.Application.Contracts" />
         <PackageReference Include="JiShe.ServicePro.NotificationManagement.Application.Contracts" />
         <PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.Application.Contracts" />
diff --git a/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj b/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj
index 9921789..3fe5415 100644
--- a/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj
+++ b/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj
@@ -5,8 +5,8 @@
         <TargetFramework>$(DotnetTargetFrameworkVersion)</TargetFramework>
         <RootNamespace>JiShe.IoT</RootNamespace>
     </PropertyGroup>
-
-	<ItemGroup Condition="'$(UsePackage)' == '0'" Label="Debug">
+	 
+	<ItemGroup Condition=" '$(Configuration)' == 'Debug'" Label="Debug">
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\BasicManagement\src\JiShe.ServicePro.BasicManagement.Application\JiShe.ServicePro.BasicManagement.Application.csproj" />
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\CTWingManagement\src\JiShe.ServicePro.CTWingManagement.Application\JiShe.ServicePro.CTWingManagement.Application.csproj" />
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\DataDictionaryManagement\src\JiShe.ServicePro.DataDictionaryManagement.Application\JiShe.ServicePro.DataDictionaryManagement.Application.csproj" />
@@ -20,7 +20,7 @@
 		<ProjectReference Include="..\..\JiShe.ServicePro\frameworks\src\JiShe.ServicePro.FreeRedisProvider\JiShe.ServicePro.FreeRedisProvider.csproj" />
 	</ItemGroup>
 
-    <ItemGroup Condition="'$(UsePackage)' == '1'" Label="Release">
+    <ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release">
         <PackageReference Include="JiShe.ServicePro.BasicManagement.Application" />
         <PackageReference Include="JiShe.ServicePro.DeviceManagement.Application" />
         <PackageReference Include="JiShe.ServicePro.NotificationManagement.Application" />
diff --git a/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj b/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj
index 37ef2ab..f49c788 100644
--- a/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj
+++ b/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj
@@ -10,7 +10,7 @@
         <Content Remove="Localization\IoT\*.json" />
     </ItemGroup>
 
-	<ItemGroup Condition="'$(UsePackage)' == '0'" Label="Debug">
+	<ItemGroup Condition=" '$(Configuration)' == 'Debug'" Label="Debug">
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\BasicManagement\src\JiShe.ServicePro.BasicManagement.Domain.Shared\JiShe.ServicePro.BasicManagement.Domain.Shared.csproj" />
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\CTWingManagement\src\JiShe.ServicePro.CTWingManagement.Domain.Shared\JiShe.ServicePro.CTWingManagement.Domain.Shared.csproj" />
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\DataDictionaryManagement\src\JiShe.ServicePro.DataDictionaryManagement.Domain.Shared\JiShe.ServicePro.DataDictionaryManagement.Domain.Shared.csproj" />
@@ -27,7 +27,7 @@
 	</ItemGroup>
 
 
-	<ItemGroup Condition="'$(UsePackage)' == '1'" Label="Release">
+	<ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release">
         <PackageReference Include="JiShe.ServicePro.BasicManagement.Domain.Shared" />
         <PackageReference Include="JiShe.ServicePro.NotificationManagement.Domain.Shared" />
         <PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.Domain.Shared" />
diff --git a/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj b/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj
index e2d8520..28737c2 100644
--- a/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj
+++ b/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj
@@ -6,7 +6,7 @@
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
     </PropertyGroup>
 
-	<ItemGroup Condition="'$(UsePackage)' == '0'" Label="Debug">
+	<ItemGroup Condition=" '$(Configuration)' == 'Debug'" Label="Debug">
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\BasicManagement\src\JiShe.ServicePro.BasicManagement.Domain\JiShe.ServicePro.BasicManagement.Domain.csproj" />
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\CTWingManagement\src\JiShe.ServicePro.CTWingManagement.Domain\JiShe.ServicePro.CTWingManagement.Domain.csproj" />
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\DataDictionaryManagement\src\JiShe.ServicePro.DataDictionaryManagement.Domain\JiShe.ServicePro.DataDictionaryManagement.Domain.csproj" />
@@ -19,7 +19,7 @@
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.Domain\JiShe.ServicePro.TemplateManagement.Domain.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(UsePackage)' == '1'" Label="Release">
+	<ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release">
         <PackageReference Include="JiShe.ServicePro.BasicManagement.Domain" />
         <PackageReference Include="JiShe.ServicePro.NotificationManagement.Domain" />
         <PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.Domain" />
diff --git a/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj b/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj
index 13b8b51..9763175 100644
--- a/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj
+++ b/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj
@@ -9,7 +9,7 @@
         <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" />
     </ItemGroup>
 
-	<ItemGroup Condition="'$(UsePackage)' == '0'" Label="Debug">
+	<ItemGroup Condition=" '$(Configuration)' == 'Debug'" Label="Debug">
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\BasicManagement\src\JiShe.ServicePro.BasicManagement.EntityFrameworkCore\JiShe.ServicePro.BasicManagement.EntityFrameworkCore.csproj" />
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\CTWingManagement\src\JiShe.ServicePro.CTWingManagement.EntityFrameworkCore\JiShe.ServicePro.CTWingManagement.EntityFrameworkCore.csproj" />
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\DataDictionaryManagement\src\JiShe.ServicePro.DataDictionaryManagement.EntityFrameworkCore\JiShe.ServicePro.DataDictionaryManagement.EntityFrameworkCore.csproj" />
@@ -22,7 +22,7 @@
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.EntityFrameworkCore\JiShe.ServicePro.TemplateManagement.EntityFrameworkCore.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(UsePackage)' == '1'" Label="Release">
+	<ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release">
         <PackageReference Include="JiShe.ServicePro.BasicManagement.EntityFrameworkCore" />
         <PackageReference Include="JiShe.ServicePro.NotificationManagement.EntityFrameworkCore" />
         <PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.EntityFrameworkCore" />
diff --git a/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj b/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj
index 15fa139..5c992d3 100644
--- a/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj
+++ b/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj
@@ -8,7 +8,7 @@
         <ProjectReference Include="..\JiShe.IoT.Application.Contracts\JiShe.IoT.Application.Contracts.csproj" />
     </ItemGroup>
 
-	<ItemGroup Condition="'$(UsePackage)' == '0'" Label="Debug">
+	<ItemGroup Condition=" '$(Configuration)' == 'Debug'" Label="Debug">
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\BasicManagement\src\JiShe.ServicePro.BasicManagement.HttpApi.Client\JiShe.ServicePro.BasicManagement.HttpApi.Client.csproj" />
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\CTWingManagement\src\JiShe.ServicePro.CTWingManagement.HttpApi.Client\JiShe.ServicePro.CTWingManagement.HttpApi.Client.csproj" />
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\DataDictionaryManagement\src\JiShe.ServicePro.DataDictionaryManagement.HttpApi.Client\JiShe.ServicePro.DataDictionaryManagement.HttpApi.Client.csproj" />
@@ -21,7 +21,7 @@
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.HttpApi.Client\JiShe.ServicePro.TemplateManagement.HttpApi.Client.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(UsePackage)' == '1'" Label="Release">
+	<ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release">
         <PackageReference Include="JiShe.ServicePro.BasicManagement.HttpApi.Client" />
         <PackageReference Include="JiShe.ServicePro.NotificationManagement.HttpApi.Client" />
         <PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.HttpApi.Client" />
diff --git a/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj b/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj
index 7098b11..51bc296 100644
--- a/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj
+++ b/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj
@@ -12,8 +12,8 @@
 	<ItemGroup>
 		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
 	</ItemGroup>
-	
-	<ItemGroup Condition="'$(UsePackage)' == '0'" Label="Debug">
+
+	<ItemGroup Condition=" '$(Configuration)' == 'Debug'" Label="Debug">
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\BasicManagement\src\JiShe.ServicePro.BasicManagement.HttpApi\JiShe.ServicePro.BasicManagement.HttpApi.csproj" />
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\CTWingManagement\src\JiShe.ServicePro.CTWingManagement.HttpApi\JiShe.ServicePro.CTWingManagement.HttpApi.csproj" />
 		<ProjectReference Include="..\..\JiShe.ServicePro\modules\DataDictionaryManagement\src\JiShe.ServicePro.DataDictionaryManagement.HttpApi\JiShe.ServicePro.DataDictionaryManagement.HttpApi.csproj" />
@@ -27,7 +27,7 @@
 	</ItemGroup>
 
 
-	<ItemGroup Condition="'$(UsePackage)' == '1'" Label="Release">
+	<ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release">
         <PackageReference Include="JiShe.ServicePro.BasicManagement.HttpApi"/>
         <PackageReference Include="JiShe.ServicePro.NotificationManagement.HttpApi"/>
         <PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.HttpApi"/>