admin/JiShe.IOT.Admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升级为9.3.4

Browse Source
This commit is contained in:
陈益 2025-12-07 13:21:07 +08:00
parent 8fb245d8c6
commit 1a4777f86f
11 changed files with 594 additions and 805 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Directory.Build.Microsoft.targets
View File

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

1
Directory.Build.Volo.targets
View File

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

4
Directory.Build.props
View File

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

3
Directory.Build.targets
View File

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

22
host/JiShe.IoT.HttpApi.Host/configs/appsettings.Development.json
View File

@ -4,19 +4,19 @@
"CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100,http://localhost:80,http://10.10.90.3:4200" "CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100,http://localhost:80,http://10.10.90.3:4200"
}, },
"ConnectionStrings": { "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=JiSheIoTProDB4;uid=root;pwd=123456789;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;TreatTinyAsBoolean=false;SslMode=None;Pooling=true;"
}, },
"Hangfire": { "Hangfire": {
"Redis": { "Redis": {
"Host": "192.168.111.174:30712,password=1q3J@BGf!yhTaD46nS#", "Host": "47.110.53.196:30712,password=1q3J@BGf!yhTaD46nS#",
"DB": "2" "DB": "2"
} }
}, },
"Redis": { "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": { "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, "EnableFilter": true,
"EnableAuthorization": false, "EnableAuthorization": false,
"SaslUserName": "lixiao", "SaslUserName": "lixiao",
@ -26,8 +26,8 @@
"TaskThreadCount": -1 "TaskThreadCount": -1
}, },
"Pulsar": { "Pulsar": {
"ServiceUrl": "pulsar+ssl://iot-north-mq.heclouds.com:6651", //pulsar+ssl://iot-north-mq.heclouds.com:6651 ，pulsar://192.168.111.174:26974 "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://192.168.111.174:9094", "WebUrl": "http://47.110.53.196:9094",
"UserName": "admin", "UserName": "admin",
"TenantName": "1YMVZZkAkRArjxSD8457", "TenantName": "1YMVZZkAkRArjxSD8457",
"Namespace": "OneNET", "Namespace": "OneNET",
@ -57,10 +57,10 @@
"IoTDBOptions": { "IoTDBOptions": {
"UserName": "root", "UserName": "root",
"Password": "Lixiao@1980", "Password": "Lixiao@1980",
//"TreeModelClusterList": [ "192.168.111.174:6667", "47.110.60.222:6667", "47.110.62.104:6667" ], //"TreeModelClusterList": [ "47.110.53.196: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" ], //"TableModelClusterList": [ "47.110.53.196:6667", "47.110.60.222:6667", "47.110.62.104:6667" ],
"TreeModelClusterList": [ "192.168.111.174:30710" ], "TreeModelClusterList": [ "47.110.53.196:30710" ],
"TableModelClusterList": [ "192.168.111.174:30710" ], "TableModelClusterList": [ "47.110.53.196:30710" ],
"PoolSize": 32, "PoolSize": 32,
"DataBaseName": "jisheiotdata", "DataBaseName": "jisheiotdata",
"OpenDebugMode": true, "OpenDebugMode": true,
@ -97,7 +97,7 @@
} }
}, },
"FreeRedisOptions": { "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 "UseDistributedCache": true
}, },
"FreeSqlProviderOptions": { "FreeSqlProviderOptions": {

6
src/JiShe.IoT.DbMigrator/appsettings.json
View File

@ -1,14 +1,14 @@
{ {
"ConnectionStrings": { "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=JiSheIoTProDB4;uid=root;pwd=123456789;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;TreatTinyAsBoolean=false;SslMode=None;Pooling=true;"
}, },
"IoTDBOptions": { "IoTDBOptions": {
"UserName": "root", "UserName": "root",
"Password": "Lixiao@1980", "Password": "Lixiao@1980",
//"TreeModelClusterList": [ "47.110.53.196:6667", "47.110.60.222:6667", "47.110.62.104:6667" ], //"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" ], //"TableModelClusterList": [ "47.110.53.196:6667", "47.110.60.222:6667", "47.110.62.104:6667" ],
"TreeModelClusterList": [ "192.168.111.174:30710" ], "TreeModelClusterList": [ "47.110.53.196:30710" ],
"TableModelClusterList": [ "192.168.111.174:30710" ], "TableModelClusterList": [ "47.110.53.196:30710" ],
"PoolSize": 32, "PoolSize": 32,
"DataBaseName": "jisheiotdata", "DataBaseName": "jisheiotdata",
"OpenDebugMode": false, "OpenDebugMode": false,

2
src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTDbContext.cs
View File

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

2
src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTMigrationsDbContextFactory.cs
View File

@ -11,7 +11,7 @@ namespace JiShe.IoT.EntityFrameworkCore
var configuration = BuildConfiguration(); var configuration = BuildConfiguration();
var builder = new DbContextOptionsBuilder<IoTDbContext>() var builder = new DbContextOptionsBuilder<IoTDbContext>()
.UseMySql(configuration.GetConnectionString("Default"), MySqlServerVersion.LatestSupportedServerVersion); .UseMySQL(configuration.GetConnectionString("Default") ?? string.Empty);
return new IoTDbContext(builder.Options); return new IoTDbContext(builder.Options);
} }

42
src/JiShe.IoT.EntityFrameworkCore/Migrations/20251205064351_InitialCreate.Designer.cs → src/JiShe.IoT.EntityFrameworkCore/Migrations/20251207050159_InitialCreate.Designer.cs generated
View File

@ -3,17 +3,15 @@ using System;
using JiShe.IoT.EntityFrameworkCore; using JiShe.IoT.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Volo.Abp.EntityFrameworkCore;
#nullable disable #nullable disable
namespace JiShe.IoT.Migrations namespace JiShe.IoT.Migrations
{ {
[DbContext(typeof(IoTDbContext))] [DbContext(typeof(IoTDbContext))]
[Migration("20251205064351_InitialCreate")] [Migration("20251207050159_InitialCreate")]
partial class InitialCreate partial class InitialCreate
{ {
/// <inheritdoc /> /// <inheritdoc />
@ -21,12 +19,9 @@ namespace JiShe.IoT.Migrations
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql) .HasAnnotation("ProductVersion", "9.0.6")
.HasAnnotation("ProductVersion", "9.0.4")
.HasAnnotation("Relational:MaxIdentifierLength", 64); .HasAnnotation("Relational:MaxIdentifierLength", 64);
MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
modelBuilder.Entity("JiShe.ServicePro.BasicManagement.UserRefreshTokens.UserRefreshToken", b => modelBuilder.Entity("JiShe.ServicePro.BasicManagement.UserRefreshTokens.UserRefreshToken", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
@ -813,7 +808,7 @@ namespace JiShe.IoT.Migrations
.HasColumnType("int") .HasColumnType("int")
.HasComment("旧系统授权最后修改者Id"); .HasComment("旧系统授权最后修改者Id");
b.PrimitiveCollection<string>("PropertyArray") b.Property<string>("PropertyArray")
.IsRequired() .IsRequired()
.HasMaxLength(1024) .HasMaxLength(1024)
.HasColumnType("varchar(1024)") .HasColumnType("varchar(1024)")
@ -2355,6 +2350,33 @@ namespace JiShe.IoT.Migrations
b.ToTable("AbpAuditLogActions", (string)null); 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 => modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
@ -2997,7 +3019,7 @@ namespace JiShe.IoT.Migrations
.HasColumnName("LastModifierId"); .HasColumnName("LastModifierId");
b.Property<DateTimeOffset?>("LastPasswordChangeTime") b.Property<DateTimeOffset?>("LastPasswordChangeTime")
.HasColumnType("datetime(6)"); .HasColumnType("datetime");
b.Property<bool>("LockoutEnabled") b.Property<bool>("LockoutEnabled")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
@ -3006,7 +3028,7 @@ namespace JiShe.IoT.Migrations
.HasColumnName("LockoutEnabled"); .HasColumnName("LockoutEnabled");
b.Property<DateTimeOffset?>("LockoutEnd") b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("datetime(6)"); .HasColumnType("datetime");
b.Property<string>("Name") b.Property<string>("Name")
.HasMaxLength(64) .HasMaxLength(64)

1270
src/JiShe.IoT.EntityFrameworkCore/Migrations/20251205064351_InitialCreate.cs → src/JiShe.IoT.EntityFrameworkCore/Migrations/20251207050159_InitialCreate.cs
View File

File diff suppressed because it is too large Load Diff

40
src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs
View File

@ -3,9 +3,7 @@ using System;
using JiShe.IoT.EntityFrameworkCore; using JiShe.IoT.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Volo.Abp.EntityFrameworkCore;
#nullable disable #nullable disable
@ -18,12 +16,9 @@ namespace JiShe.IoT.Migrations
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql) .HasAnnotation("ProductVersion", "9.0.6")
.HasAnnotation("ProductVersion", "9.0.4")
.HasAnnotation("Relational:MaxIdentifierLength", 64); .HasAnnotation("Relational:MaxIdentifierLength", 64);
MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
modelBuilder.Entity("JiShe.ServicePro.BasicManagement.UserRefreshTokens.UserRefreshToken", b => modelBuilder.Entity("JiShe.ServicePro.BasicManagement.UserRefreshTokens.UserRefreshToken", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
@ -810,7 +805,7 @@ namespace JiShe.IoT.Migrations
.HasColumnType("int") .HasColumnType("int")
.HasComment("旧系统授权最后修改者Id"); .HasComment("旧系统授权最后修改者Id");
b.PrimitiveCollection<string>("PropertyArray") b.Property<string>("PropertyArray")
.IsRequired() .IsRequired()
.HasMaxLength(1024) .HasMaxLength(1024)
.HasColumnType("varchar(1024)") .HasColumnType("varchar(1024)")
@ -2352,6 +2347,33 @@ namespace JiShe.IoT.Migrations
b.ToTable("AbpAuditLogActions", (string)null); 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 => modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
@ -2994,7 +3016,7 @@ namespace JiShe.IoT.Migrations
.HasColumnName("LastModifierId"); .HasColumnName("LastModifierId");
b.Property<DateTimeOffset?>("LastPasswordChangeTime") b.Property<DateTimeOffset?>("LastPasswordChangeTime")
.HasColumnType("datetime(6)"); .HasColumnType("datetime");
b.Property<bool>("LockoutEnabled") b.Property<bool>("LockoutEnabled")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
@ -3003,7 +3025,7 @@ namespace JiShe.IoT.Migrations
.HasColumnName("LockoutEnabled"); .HasColumnName("LockoutEnabled");
b.Property<DateTimeOffset?>("LockoutEnd") b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("datetime(6)"); .HasColumnType("datetime");
b.Property<string>("Name") b.Property<string>("Name")
.HasMaxLength(64) .HasMaxLength(64)