From 3a7bc1d4943d3472b3bd49a288214a9fd4c8799f Mon Sep 17 00:00:00 2001
From: zenghongyao <873884283@qq.com>
Date: Wed, 4 Jun 2025 16:39:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Directory.Build.JiShe.targets | 12 ++++++++++--
Directory.Build.props | 2 +-
.../JiShe.IoT.Application.Contracts.csproj | 19 ++++++++++---------
.../JiShe.IoT.Application.csproj | 4 +++-
.../IoTDomainSharedModule.cs | 2 +-
.../JiShe.IoT.Domain.Shared.csproj | 3 ++-
src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj | 2 ++
.../JiShe.IoT.EntityFrameworkCore.csproj | 3 ++-
.../JiShe.IoT.HttpApi.Client.csproj | 1 +
.../JiShe.IoT.HttpApi.csproj | 1 +
10 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/Directory.Build.JiShe.targets b/Directory.Build.JiShe.targets
index 5b50c88..6cc6788 100644
--- a/Directory.Build.JiShe.targets
+++ b/Directory.Build.JiShe.targets
@@ -82,7 +82,15 @@
-
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
index 95cc910..819e633 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,7 +2,7 @@
- 1.0.1
+ 1.0.5.5
9.1.1
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 9456405..cb45288 100644
--- a/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj
+++ b/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj
@@ -6,21 +6,22 @@
-
+
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj b/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj
index 0181f96..3c88654 100644
--- a/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj
+++ b/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj
@@ -13,13 +13,15 @@
+
-
+
+
diff --git a/src/JiShe.IoT.Domain.Shared/IoTDomainSharedModule.cs b/src/JiShe.IoT.Domain.Shared/IoTDomainSharedModule.cs
index 478bad6..9d6ee02 100644
--- a/src/JiShe.IoT.Domain.Shared/IoTDomainSharedModule.cs
+++ b/src/JiShe.IoT.Domain.Shared/IoTDomainSharedModule.cs
@@ -13,7 +13,7 @@ namespace JiShe.IoT
typeof(TemplateManagementDomainSharedModule),
typeof(DynamicMenuManagementDomainSharedModule),
typeof(FileManagementDomainSharedModule),
- typeof(AbpFreeSqlProviderModule),
+ typeof(ServiceProFreeSqlProviderModule),
typeof(ServiceProCoreModule)
)]
public class IoTDomainSharedModule : AbpModule
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 04a0d59..273b4f3 100644
--- a/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj
+++ b/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj
@@ -21,6 +21,7 @@
-
+
+
\ No newline at end of file
diff --git a/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj b/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj
index b0d1af7..93219a3 100644
--- a/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj
+++ b/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj
@@ -17,6 +17,8 @@
+
+
\ No newline at end of file
diff --git a/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj b/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj
index f93378f..ad15f46 100644
--- a/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj
+++ b/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj
@@ -17,6 +17,7 @@
+
@@ -25,4 +26,4 @@
compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native
-
\ No newline at end of file
+
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 9ed4b82..452d07c 100644
--- a/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj
+++ b/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj
@@ -16,6 +16,7 @@
+
diff --git a/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj b/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj
index d0c084d..7047adb 100644
--- a/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj
+++ b/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj
@@ -21,6 +21,7 @@
+
From 7882e52f67f856f518cf95db8196b9456c52c476 Mon Sep 17 00:00:00 2001
From: zenghongyao <873884283@qq.com>
Date: Wed, 4 Jun 2025 16:44:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=95=E5=85=A5=E8=AE=BE=E5=A4=87?=
=?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Directory.Build.JiShe.targets | 1 +
src/JiShe.IoT.Application/IoTAppService.cs | 2 +-
src/JiShe.IoT.Application/IoTApplicationModule.cs | 2 +-
src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj | 1 +
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Directory.Build.JiShe.targets b/Directory.Build.JiShe.targets
index 1454f91..4c2a082 100644
--- a/Directory.Build.JiShe.targets
+++ b/Directory.Build.JiShe.targets
@@ -101,6 +101,7 @@
+
\ No newline at end of file
diff --git a/src/JiShe.IoT.Application/IoTAppService.cs b/src/JiShe.IoT.Application/IoTAppService.cs
index ec9ed93..4c93a35 100644
--- a/src/JiShe.IoT.Application/IoTAppService.cs
+++ b/src/JiShe.IoT.Application/IoTAppService.cs
@@ -8,7 +8,7 @@ namespace JiShe.IoT
public abstract class IoTAppService : ApplicationService
{
protected IFreeSqlProvider FreeSqlDbContext => LazyServiceProvider.LazyGetRequiredService();
- protected IFreeRedisProviderService FreeRedis => LazyServiceProvider.LazyGetRequiredService();
+ protected IFreeRedisProvider FreeRedis => LazyServiceProvider.LazyGetRequiredService();
protected IoTAppService()
{
diff --git a/src/JiShe.IoT.Application/IoTApplicationModule.cs b/src/JiShe.IoT.Application/IoTApplicationModule.cs
index dd7b35f..25f67b6 100644
--- a/src/JiShe.IoT.Application/IoTApplicationModule.cs
+++ b/src/JiShe.IoT.Application/IoTApplicationModule.cs
@@ -16,7 +16,7 @@ namespace JiShe.IoT
typeof(TemplateManagementApplicationModule),
typeof(DynamicMenuManagementApplicationModule),
typeof(FileManagementApplicationModule),
- typeof(FreeRedisProviderModule)
+ typeof(ServiceProFreeSqlProviderModule)
)]
public class IoTApplicationModule : AbpModule
{
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 452d07c..90dbf8e 100644
--- a/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj
+++ b/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj
@@ -17,6 +17,7 @@
+