From 5c3a5136b626d6d89b1f9297e30322e08eef5c21 Mon Sep 17 00:00:00 2001
From: ChenYi <296215406@outlook.com>
Date: Fri, 25 Jul 2025 11:54:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95=EF=BC=8C?=
=?UTF-8?q?=E5=8D=87=E7=BA=A7Abp=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Directory.Build.props | 4 +-
Directory.Build.targets | 120 ++++++++++--------
.../DeviceAggregationService.cs | 4 +-
... 20250725034846_InitialCreate.Designer.cs} | 8 +-
...ate.cs => 20250725034846_InitialCreate.cs} | 2 +
.../Migrations/IoTDbContextModelSnapshot.cs | 6 +-
6 files changed, 82 insertions(+), 62 deletions(-)
rename src/JiShe.IoT.EntityFrameworkCore/Migrations/{20250724092610_InitialCreate.Designer.cs => 20250725034846_InitialCreate.Designer.cs} (99%)
rename src/JiShe.IoT.EntityFrameworkCore/Migrations/{20250724092610_InitialCreate.cs => 20250725034846_InitialCreate.cs} (99%)
diff --git a/Directory.Build.props b/Directory.Build.props
index 12bd30a..e3dea23 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,10 +4,10 @@
1.0.5.40
- 9.1.1
+ 9.2.1
- 9.0.0
+ 9.0.4
net9.0
diff --git a/Directory.Build.targets b/Directory.Build.targets
index d873e17..8342f78 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -27,72 +27,82 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs b/src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs
index 34d3253..5fcc51f 100644
--- a/src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs
+++ b/src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs
@@ -30,7 +30,7 @@ namespace JiShe.IoT.DeviceAggregation
///
///
///
- [Authorize(DeviceManagementPermissions.MeterManagement.Create)]
+ [Authorize(DeviceManagementPermissions.DeviceInfoManagement.Create)]
public async Task CreateAsync(CreateDeviceAggregationInput input)
{
@@ -85,7 +85,7 @@ namespace JiShe.IoT.DeviceAggregation
///
///
///
- [Authorize(DeviceManagementPermissions.MeterManagement.Delete)]
+ [Authorize(DeviceManagementPermissions.DeviceInfoManagement.Delete)]
public async Task DeleteAsync(IdInput input)
{
return await deviceAppService.DeleteAsync(input);
diff --git a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250724092610_InitialCreate.Designer.cs b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725034846_InitialCreate.Designer.cs
similarity index 99%
rename from src/JiShe.IoT.EntityFrameworkCore/Migrations/20250724092610_InitialCreate.Designer.cs
rename to src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725034846_InitialCreate.Designer.cs
index cb24e82..d445ea8 100644
--- a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250724092610_InitialCreate.Designer.cs
+++ b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725034846_InitialCreate.Designer.cs
@@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
namespace JiShe.IoT.Migrations
{
[DbContext(typeof(IoTDbContext))]
- [Migration("20250724092610_InitialCreate")]
+ [Migration("20250725034846_InitialCreate")]
partial class InitialCreate
{
///
@@ -22,7 +22,7 @@ namespace JiShe.IoT.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
- .HasAnnotation("ProductVersion", "9.0.0")
+ .HasAnnotation("ProductVersion", "9.0.4")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
@@ -1821,6 +1821,10 @@ namespace JiShe.IoT.Migrations
b.Property("Id")
.HasColumnType("char(36)");
+ b.Property("ApplicationName")
+ .HasMaxLength(96)
+ .HasColumnType("varchar(96)");
+
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
diff --git a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250724092610_InitialCreate.cs b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725034846_InitialCreate.cs
similarity index 99%
rename from src/JiShe.IoT.EntityFrameworkCore/Migrations/20250724092610_InitialCreate.cs
rename to src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725034846_InitialCreate.cs
index 0e7ac94..5df6d3b 100644
--- a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250724092610_InitialCreate.cs
+++ b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725034846_InitialCreate.cs
@@ -70,6 +70,8 @@ namespace JiShe.IoT.Migrations
columns: table => new
{
Id = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+ ApplicationName = table.Column(type: "varchar(96)", maxLength: 96, nullable: true)
+ .Annotation("MySql:CharSet", "utf8mb4"),
JobName = table.Column(type: "varchar(128)", maxLength: 128, nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
JobArgs = table.Column(type: "longtext", maxLength: 1048576, nullable: false)
diff --git a/src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs b/src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs
index 908a7f5..a3871c6 100644
--- a/src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs
+++ b/src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs
@@ -19,7 +19,7 @@ namespace JiShe.IoT.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
- .HasAnnotation("ProductVersion", "9.0.0")
+ .HasAnnotation("ProductVersion", "9.0.4")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
@@ -1818,6 +1818,10 @@ namespace JiShe.IoT.Migrations
b.Property("Id")
.HasColumnType("char(36)");
+ b.Property("ApplicationName")
+ .HasMaxLength(96)
+ .HasColumnType("varchar(96)");
+
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()