迁移更新

.gitignore

@@ -57,3 +57,6 @@
 /test/JiShe.IoT.TestBase/bin/Release/net9.0
 /host/JiShe.IoT.HttpApi.Host/UploadFile/20250729/host/abp-file-management
 /host/JiShe.IoT.HttpApi.Host/UploadFile/20250731/host/abp-file-management/3a1b7059-f930-8a33-5a5b-a67f48f2feec
+/gateways/JiShe.IoT.WebGateway/bin/Debug/net10.0
+/host/JiShe.IoT.HttpApi.Host/bin/Debug/net10.0
+/src/JiShe.IoT.Application/bin/Debug/net10.0

Directory.Build.Microsoft.targets

@@ -17,9 +17,10 @@
         <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="$(DotnetInfoVersion)" />
         <PackageReference Update="Microsoft.Extensions.Http" Version="$(DotnetInfoVersion)"/>
         
-        <PackageReference Update="Microsoft.AspNetCore.Mvc.Core" Version="2.2.0"/>
-        <PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0"/>
-        <PackageReference Update="Microsoft.CSharp" Version="4.12.0"/>
+        <PackageReference Update="Microsoft.AspNetCore.Mvc.Core" Version="2.3.0"/>
+        <PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0"/>
+		<PackageReference Update="Microsoft.AspNetCore.Http.Features" Version="2.3.0"/>
+		<PackageReference Update="Microsoft.CSharp" Version="4.12.0"/>
         <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.12.0"/>
         <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
     </ItemGroup>

Directory.Build.Volo.targets

@@ -94,5 +94,6 @@
         <PackageReference Update="Volo.Abp.EventBus" Version="$(VoloAbpVersion)"/>
         <PackageReference Update="Volo.Abp.Localization" Version="$(VoloAbpVersion)" />
         <PackageReference Update="Volo.Abp.DistributedLocking" Version="$(VoloAbpVersion)" />
+	    <PackageReference Update="Volo.Abp.EntityFrameworkCore.MySQL.Pomelo" Version="$(VoloAbpVersion)" />
     </ItemGroup>
 </Project>

Directory.Build.props

@@ -4,10 +4,10 @@
 		<!--JiShe.ServicePro版本-->
 		<ServiceProVersion>1.0.5.40</ServiceProVersion>
 		<!--Volo Abp 版本-->
-		<VoloAbpVersion>9.2.1</VoloAbpVersion>
+		<VoloAbpVersion>9.3.4</VoloAbpVersion>
 
 		<!--Dotnet 组件 版本-->
-		<DotnetInfoVersion>9.0.4</DotnetInfoVersion>
+		<DotnetInfoVersion>9.0.6</DotnetInfoVersion>
 
 		<!--Dotnet 框架 版本-->
 		<DotnetTargetFrameworkVersion>net9.0</DotnetTargetFrameworkVersion>

Directory.Build.targets

@@ -104,6 +104,9 @@
 		<PackageReference Update="Otp.NET" Version="1.4.0" />
 		<PackageReference Update="QRCoder" Version="1.6.0" />
 
+		<!--SixLabors.ImageSharp-->
+		<PackageReference Update="SixLabors.ImageSharp" Version="3.1.12" />
+		
 		
 	</ItemGroup>
 </Project>

JiShe.ServicePro

@@ -1 +1 @@
-Subproject commit 323492e10b2937a063c9e60b26bc40c6954503c7
+Subproject commit c3d3ced4b1a82967373e389877632349afee0de0

NuGet.Config

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <configuration>
 	<packageSources>
-		<add key="JiSheTeam" value="http://192.168.111.248:9511/nuget/JiSheTeam/v3/index.json" protocolVersion="3" allowInsecureConnections="true" />
-		<add key="nuget" value="https://api.nuget.org/v3/index.json" />
+		<add key="JiSheTeam" value="http://localhost:5020/v3/index.json" protocolVersion="3" allowInsecureConnections="true" />
+		<add key="nuget" value="https://api.nuget.org/v3/index.json" allowInsecureConnections="True" />
 	</packageSources>
 </configuration>

host/JiShe.IoT.HttpApi.Host/configs/appsettings.Development.json

@@ -4,19 +4,19 @@
     "CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100,http://localhost:80,http://10.10.90.3:4200"
   },
   "ConnectionStrings": {
-    "Default": "Data Source=192.168.111.174;Port=13306;Database=JiSheIoTProDB;uid=root;pwd=JiShe!aqG#5kGgh&0;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;TreatTinyAsBoolean=false;SslMode=None;Pooling=true;"
+    "Default": "Data Source=localhost;Port=33306;Database=JiSheIoTProDB54;uid=root;pwd=123456789;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;TreatTinyAsBoolean=false;SslMode=None;Pooling=true;"
   },
   "Hangfire": {
     "Redis": {
-      "Host": "192.168.111.174:30712,password=1q3J@BGf!yhTaD46nS#",
+      "Host": "47.110.53.196:30712,password=1q3J@BGf!yhTaD46nS#",
       "DB": "2"
     }
   },
   "Redis": {
-    "Configuration": "192.168.111.174:30712,password=1q3J@BGf!yhTaD46nS#,defaultdatabase=5"
+    "Configuration": "47.110.53.196:30712,password=1q3J@BGf!yhTaD46nS#,defaultdatabase=5"
   },
   "Kafka": {
-    "BootstrapServers": "47.110.62.104:9094,192.168.111.174:9094,47.110.60.222:9094",
+    "BootstrapServers": "47.110.62.104:9094,47.110.53.196:9094,47.110.60.222:9094",
     "EnableFilter": true,
     "EnableAuthorization": false,
     "SaslUserName": "lixiao",
@@ -26,8 +26,8 @@
     "TaskThreadCount": -1
   },
   "Pulsar": {
-    "ServiceUrl": "pulsar+ssl://iot-north-mq.heclouds.com:6651", //pulsar+ssl://iot-north-mq.heclouds.com:6651     ，pulsar://192.168.111.174:26974
-    "WebUrl": "http://192.168.111.174:9094",
+    "ServiceUrl": "pulsar+ssl://iot-north-mq.heclouds.com:6651", //pulsar+ssl://iot-north-mq.heclouds.com:6651     ，pulsar://47.110.53.196:26974
+    "WebUrl": "http://47.110.53.196:9094",
     "UserName": "admin",
     "TenantName": "1YMVZZkAkRArjxSD8457",
     "Namespace": "OneNET",
@@ -57,10 +57,10 @@
   "IoTDBOptions": {
     "UserName": "root",
     "Password": "Lixiao@1980",
-    //"TreeModelClusterList": [ "192.168.111.174:6667", "47.110.60.222:6667", "47.110.62.104:6667" ],
-    //"TableModelClusterList": [ "192.168.111.174:6667", "47.110.60.222:6667", "47.110.62.104:6667" ],
-    "TreeModelClusterList": [ "192.168.111.174:30710" ],
-    "TableModelClusterList": [ "192.168.111.174:30710" ],
+    //"TreeModelClusterList": [ "47.110.53.196:6667", "47.110.60.222:6667", "47.110.62.104:6667" ],
+    //"TableModelClusterList": [ "47.110.53.196:6667", "47.110.60.222:6667", "47.110.62.104:6667" ],
+    "TreeModelClusterList": [ "47.110.53.196:30710" ],
+    "TableModelClusterList": [ "47.110.53.196:30710" ],
     "PoolSize": 32,
     "DataBaseName": "jisheiotdata",
     "OpenDebugMode": true,
@@ -97,7 +97,7 @@
     }
   },
   "FreeRedisOptions": {
-    "ConnectionString": "192.168.111.174:30712,password=1q3J@BGf!yhTaD46nS#,abortConnect=false,connectTimeout=30000,allowAdmin=true,maxPoolSize=500,defaultdatabase=14",
+    "ConnectionString": "47.110.53.196:30712,password=1q3J@BGf!yhTaD46nS#,abortConnect=false,connectTimeout=30000,allowAdmin=true,maxPoolSize=500,defaultdatabase=14",
     "UseDistributedCache": true
   },
   "FreeSqlProviderOptions": {

src/JiShe.IoT.DbMigrator/appsettings.json

@@ -1,14 +1,14 @@
 {
   "ConnectionStrings": {
-    "Default": "Data Source=192.168.111.174;Port=13306;Database=JiSheIoTProDB;uid=root;pwd=JiShe!aqG#5kGgh&0;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;TreatTinyAsBoolean=false;SslMode=None;Pooling=true;"
+    "Default": "Data Source=localhost;Port=33306;Database=JiSheIoTProDB54;uid=root;pwd=123456789;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;TreatTinyAsBoolean=false;SslMode=None;Pooling=true;"
   },
   "IoTDBOptions": {
     "UserName": "root",
     "Password": "Lixiao@1980",
     //"TreeModelClusterList": [ "47.110.53.196:6667", "47.110.60.222:6667", "47.110.62.104:6667" ],
     //"TableModelClusterList": [ "47.110.53.196:6667", "47.110.60.222:6667", "47.110.62.104:6667" ],
-    "TreeModelClusterList": [ "192.168.111.174:30710" ],
-    "TableModelClusterList": [ "192.168.111.174:30710" ],
+    "TreeModelClusterList": [ "47.110.53.196:30710" ],
+    "TableModelClusterList": [ "47.110.53.196:30710" ],
     "PoolSize": 32,
     "DataBaseName": "jisheiotdata",
     "OpenDebugMode": false,

src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTDbContext.cs

@@ -50,6 +50,8 @@ namespace JiShe.IoT.EntityFrameworkCore
         public DbSet<TenantConnectionString> TenantConnectionStrings { get; set; }
         public DbSet<BackgroundJobRecord> BackgroundJobs { get; set; }
         public DbSet<AuditLog> AuditLogs { get; set; }
+        public DbSet<AuditLogExcelFile> AuditLogExcelFiles { get; set; }
+
         public DbSet<Notification> Notifications { get; set; }
         public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
         public DbSet<DataDictionary> DataDictionaries { get; set; }

src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTEntityFrameworkCoreModule.cs

@@ -10,7 +10,7 @@ namespace JiShe.IoT.EntityFrameworkCore
 {
     [DependsOn(
         typeof(IoTDomainModule),
-        typeof(AbpEntityFrameworkCoreMySQLModule),
+        typeof(AbpEntityFrameworkCoreMySQLPomeloModule),
         typeof(BasicManagementEntityFrameworkCoreModule),
         typeof(DataDictionaryManagementEntityFrameworkCoreModule),
         typeof(NotificationManagementEntityFrameworkCoreModule),

src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTMigrationsDbContextFactory.cs

@@ -1,3 +1,5 @@
+using Microsoft.EntityFrameworkCore;
+
 namespace JiShe.IoT.EntityFrameworkCore
 {
     /* This class is needed for EF Core console commands
@@ -9,9 +11,9 @@ namespace JiShe.IoT.EntityFrameworkCore
             IoTEfCoreEntityExtensionMappings.Configure();
 
             var configuration = BuildConfiguration();
-
+            var serverVersion = new MySqlServerVersion(new Version(8, 4, 6));
             var builder = new DbContextOptionsBuilder<IoTDbContext>()
-                .UseMySql(configuration.GetConnectionString("Default"), MySqlServerVersion.LatestSupportedServerVersion);
+                .UseMySql(configuration.GetConnectionString("Default") , serverVersion);
 
             return new IoTDbContext(builder.Options);
         }

src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj

@@ -6,7 +6,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\JiShe.IoT.Domain\JiShe.IoT.Domain.csproj" />
-        <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" />
+        <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL.Pomelo" />
     </ItemGroup>
 
 	<ItemGroup Condition=" '$(Configuration)' == 'Debug'" Label="Debug">

src/JiShe.IoT.EntityFrameworkCore/Migrations/20251207055002_InitialCreate.Designer.cs

@@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
 namespace JiShe.IoT.Migrations
 {
     [DbContext(typeof(IoTDbContext))]
-    [Migration("20251205064351_InitialCreate")]
+    [Migration("20251207055002_InitialCreate")]
     partial class InitialCreate
     {
         /// <inheritdoc />
@@ -22,7 +22,7 @@ namespace JiShe.IoT.Migrations
 #pragma warning disable 612, 618
             modelBuilder
                 .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
-                .HasAnnotation("ProductVersion", "9.0.4")
+                .HasAnnotation("ProductVersion", "9.0.6")
                 .HasAnnotation("Relational:MaxIdentifierLength", 64);
 
             MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
@@ -813,7 +813,7 @@ namespace JiShe.IoT.Migrations
                         .HasColumnType("int")
                         .HasComment("旧系统授权最后修改者Id");
 
-                    b.PrimitiveCollection<string>("PropertyArray")
+                    b.Property<string>("PropertyArray")
                         .IsRequired()
                         .HasMaxLength(1024)
                         .HasColumnType("varchar(1024)")
@@ -2355,6 +2355,33 @@ namespace JiShe.IoT.Migrations
                     b.ToTable("AbpAuditLogActions", (string)null);
                 });
 
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogExcelFile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("FileName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)")
+                        .HasColumnName("FileName");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AbpAuditLogExcelFiles", (string)null);
+                });
+
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
                 {
                     b.Property<Guid>("Id")

src/JiShe.IoT.EntityFrameworkCore/Migrations/20251207055002_InitialCreate.cs

@@ -14,6 +14,23 @@ namespace JiShe.IoT.Migrations
             migrationBuilder.AlterDatabase()
                 .Annotation("MySql:CharSet", "utf8mb4");
 
+            migrationBuilder.CreateTable(
+                name: "AbpAuditLogExcelFiles",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    FileName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    CreationTime = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpAuditLogExcelFiles", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
             migrationBuilder.CreateTable(
                 name: "AbpAuditLogs",
                 columns: table => new
@@ -2040,6 +2057,9 @@ namespace JiShe.IoT.Migrations
             migrationBuilder.DropTable(
                 name: "AbpAuditLogActions");
 
+            migrationBuilder.DropTable(
+                name: "AbpAuditLogExcelFiles");
+
             migrationBuilder.DropTable(
                 name: "AbpBackgroundJobs");
 

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.4")
+                .HasAnnotation("ProductVersion", "9.0.6")
                 .HasAnnotation("Relational:MaxIdentifierLength", 64);
 
             MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
@@ -810,7 +810,7 @@ namespace JiShe.IoT.Migrations
                         .HasColumnType("int")
                         .HasComment("旧系统授权最后修改者Id");
 
-                    b.PrimitiveCollection<string>("PropertyArray")
+                    b.Property<string>("PropertyArray")
                         .IsRequired()
                         .HasMaxLength(1024)
                         .HasColumnType("varchar(1024)")
@@ -2352,6 +2352,33 @@ namespace JiShe.IoT.Migrations
                     b.ToTable("AbpAuditLogActions", (string)null);
                 });
 
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogExcelFile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("FileName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)")
+                        .HasColumnName("FileName");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AbpAuditLogExcelFiles", (string)null);
+                });
+
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
                 {
                     b.Property<Guid>("Id")