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

Compare commits

base: admin:375b111d6532a5d86dfb03c7422d82050c6316aa
Branches Tags
admin:master
admin:master_net9_Pomelo
..
compare: admin:7882e52f67f856f518cf95db8196b9456c52c476
Branches Tags
admin:master
admin:master_net9_Pomelo

No commits in common. "375b111d6532a5d86dfb03c7422d82050c6316aa" and "7882e52f67f856f518cf95db8196b9456c52c476" have entirely different histories.
375b111d65 ... 7882e52f67

19 changed files with 92 additions and 134 deletions
Show Stats Expand all files Collapse all files

139
Directory.Build.JiShe.targets
View File

@ -1,72 +1,72 @@
<Project>
<!-- JiShe.ServicePro包-->
<ItemGroup>
<PackageReference Update="JiShe.ServicePro.Core" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CAP" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CAP.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.Localization" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.Oidc" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.TwoFactor" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.Shared.Hosting.Microservices" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.Shared.Hosting.Gateways" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.Application" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.Application.Contracts" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.Domain" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.Domain.Shared" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<!-- JiShe.ServicePro包-->
<ItemGroup>
<PackageReference Update="JiShe.ServicePro.Core" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CAP" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CAP.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.Localization" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.Oidc" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.TwoFactor" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.Shared.Hosting.Microservices" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.Shared.Hosting.Gateways" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.Application" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.Application.Contracts" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.Domain" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.Domain.Shared" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.Application" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.Application.Contracts" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.Domain" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.Domain.Shared" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.Application" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.Application.Contracts" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.Domain" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.Domain.Shared" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Application" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Application.Contracts" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Domain" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Domain.Shared" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Application" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Application.Contracts" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Domain" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Domain.Shared" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.Application" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.Application.Contracts" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.Domain" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.Domain.Shared" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.Application" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.Application.Contracts" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.Domain" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.Domain.Shared" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.Application" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.Application.Contracts" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.Domain" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.Domain.Shared" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.Application" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.Application.Contracts" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.Domain" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.Domain.Shared" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.Application" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.Application.Contracts" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.Domain" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.Domain.Shared" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.Application" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.Application.Contracts" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.Domain" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.Domain.Shared" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Application" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Application.Contracts" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Domain" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Domain.Shared" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Application" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Application.Contracts" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Domain" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Domain.Shared" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.FileManagement.Application" Version="$(ServiceProVersion)"/>
@ -91,14 +91,17 @@
<PackageReference Update="JiShe.ServicePro.IoTDBManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.IoTDBManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DeviceManagement.Application" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DeviceManagement.Application.Contracts" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DeviceManagement.Domain" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DeviceManagement.Domain.Shared" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DeviceManagement.EntityFrameworkCore" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DeviceManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DeviceManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.CollectBus.IoTDB" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.Kafka" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DeviceManagement.Application" Version="$(ServiceProVersion)" />
<PackageReference Update="JiShe.ServicePro.DeviceManagement.Domain" Version="$(ServiceProVersion)" />
<PackageReference Update="JiShe.ServicePro.DeviceManagement.Domain.Shared" Version="$(ServiceProVersion)" />
<PackageReference Update="JiShe.ServicePro.DeviceManagement.EntityFrameworkCore" Version="$(ServiceProVersion)" />
<PackageReference Update="JiShe.ServicePro.DeviceManagement.HttpApi" Version="$(ServiceProVersion)" />
<PackageReference Update="JiShe.ServicePro.DeviceManagement.HttpApi.Client" Version="$(ServiceProVersion)" />
<PackageReference Update="JiShe.ServicePro.DeviceManagement.Application.Contracts" Version="$(ServiceProVersion)" />
</ItemGroup>
</Project>

4
Directory.Build.props
View File

@ -2,11 +2,11 @@
<!-- 定义项目加载属性 -->
<PropertyGroup>
<!--JiShe.ServicePro版本-->
<ServiceProVersion>1.0.5.06</ServiceProVersion>
<ServiceProVersion>1.0.5.5</ServiceProVersion>
<!--Volo Abp 版本-->
<VoloAbpVersion>9.1.1</VoloAbpVersion>
<!--Dotnet Info 版本-->
<DotnetInfoVersion>9.0.0</DotnetInfoVersion>
<DotnetInfoVersion>9.0.0</DotnetInfoVersion>
</PropertyGroup>
</Project>

8
host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj
View File

@ -30,7 +30,9 @@
<PackageReference Include="Serilog.Sinks.Async" />
<PackageReference Include="Hangfire.Redis.StackExchange" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" />
<PackageReference Include="JiShe.ServicePro.CAP" />
<PackageReference Include="JiShe.ServicePro.CAP.EntityFrameworkCore" />
<PackageReference Include="DotNetCore.CAP.MySql" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" />
<PackageReference Include="DotNetCore.CAP.Dashboard" />
@ -51,10 +53,8 @@
<ItemGroup>
<PackageReference Include="JiShe.ServicePro.Shared.Hosting.Microservices"/>
<PackageReference Include="JiShe.ServicePro.CAP" />
<PackageReference Include="JiShe.ServicePro.CAP.EntityFrameworkCore" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Logs\**"/>
<Content Remove="Logs\**"/>

2
src/JiShe.IoT.Application.Contracts/IoTApplicationContractsModule.cs
View File

@ -1,6 +1,5 @@
using JiShe.ServicePro.DynamicMenuManagement;
using JiShe.ServicePro.FileManagement;
using JiShe.ServicePro.IoTDBManagement;
using JiShe.ServicePro.TemplateManagement;
namespace JiShe.IoT
@ -14,7 +13,6 @@ namespace JiShe.IoT
typeof(LanguageManagementApplicationContractsModule),
typeof(TemplateManagementApplicationContractsModule),
typeof(FileManagementApplicationContractsModule),
typeof(IoTDBManagementApplicationContractsModule),
typeof(DynamicMenuManagementApplicationContractsModule)
)]
public class IoTApplicationContractsModule : AbpModule

2
src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj
View File

@ -22,8 +22,6 @@
<PackageReference Include="JiShe.ServicePro.TemplateManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.FileManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Application.Contracts"/>
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Application.Contracts"/>
</ItemGroup>
</Project>

2
src/JiShe.IoT.Application/IoTAppService.cs
View File

@ -8,7 +8,7 @@ namespace JiShe.IoT
public abstract class IoTAppService : ApplicationService
{
protected IFreeSqlProvider FreeSqlDbContext => LazyServiceProvider.LazyGetRequiredService<IFreeSqlProvider>();
protected IFreeRedisProvider RedisProvider => LazyServiceProvider.LazyGetRequiredService<IFreeRedisProvider>();
protected IFreeRedisProvider FreeRedis => LazyServiceProvider.LazyGetRequiredService<IFreeRedisProvider>();
protected IoTAppService()
{

4
src/JiShe.IoT.Application/IoTApplicationModule.cs
View File

@ -2,7 +2,6 @@ using JiShe.ServicePro.DynamicMenuManagement;
using JiShe.ServicePro.FileManagement;
using JiShe.ServicePro.FreeRedisProvider;
using JiShe.ServicePro.FreeSqlProvider;
using JiShe.ServicePro.IoTDBManagement;
using JiShe.ServicePro.TemplateManagement;
namespace JiShe.IoT
@ -17,8 +16,7 @@ namespace JiShe.IoT
typeof(TemplateManagementApplicationModule),
typeof(DynamicMenuManagementApplicationModule),
typeof(FileManagementApplicationModule),
typeof(IoTDBManagementApplicationModule),
typeof(ServiceProFreeRedisProviderModule)
typeof(ServiceProFreeSqlProviderModule)
)]
public class IoTApplicationModule : AbpModule
{

1
src/JiShe.IoT.Application/JiShe.IoT.Application.csproj
View File

@ -19,7 +19,6 @@
<PackageReference Include="JiShe.ServicePro.LanguageManagement.Application" />
<PackageReference Include="JiShe.ServicePro.TemplateManagement.Application" />
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Application" />
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Application" />
<PackageReference Include="JiShe.ServicePro.FileManagement.Application" />
<PackageReference Include="JiShe.ServicePro.FreeRedisProvider" />
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Application.Contracts" />

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

@ -1,15 +1,5 @@
{
"ConnectionStrings": {
"Default": "Data Source=47.110.60.222;Port=13306;Database=JiSheIoTProDB;uid=root;pwd=JiShe!aqG#5kGgh&0;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;"
},
"IoTDBOptions": {
"UserName": "root",
"Password": "root",
"TreeModelClusterList": [ "121.42.175.177:16667" ],
"TableModelClusterList": [ "121.42.175.177:16667" ],
"PoolSize": 32,
"TableModelDataBaseName": "energy",
"OpenDebugMode": true,
"UseTableSessionPoolByDefault": false
}
}

2
src/JiShe.IoT.Domain.Shared/IoTDomainSharedModule.cs
View File

@ -1,7 +1,6 @@
using JiShe.ServicePro.DynamicMenuManagement;
using JiShe.ServicePro.FileManagement;
using JiShe.ServicePro.FreeSqlProvider;
using JiShe.ServicePro.IoTDBManagement;
using JiShe.ServicePro.TemplateManagement;
namespace JiShe.IoT
@ -14,7 +13,6 @@ namespace JiShe.IoT
typeof(TemplateManagementDomainSharedModule),
typeof(DynamicMenuManagementDomainSharedModule),
typeof(FileManagementDomainSharedModule),
typeof(IoTDBManagementDomainSharedModule),
typeof(ServiceProFreeSqlProviderModule),
typeof(ServiceProCoreModule)
)]

1
src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj
View File

@ -20,7 +20,6 @@
<PackageReference Include="JiShe.ServicePro.TemplateManagement.Domain.Shared"/>
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Domain.Shared"/>
<PackageReference Include="JiShe.ServicePro.FileManagement.Domain.Shared"/>
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Domain.Shared"/>
<PackageReference Include="JiShe.ServicePro.FreeSqlProvider" />
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Domain.Shared" />

18
src/JiShe.IoT.Domain/Data/IoTDbMigrationService.cs
View File

@ -1,5 +1,3 @@
using JiShe.ServicePro.IoTDBManagement.SessionPools;
namespace JiShe.IoT.Data
{
public class IoTDbMigrationService : ITransientDependency
@ -10,20 +8,17 @@ namespace JiShe.IoT.Data
private readonly IEnumerable<IIoTDbSchemaMigrator> _dbSchemaMigrators;
private readonly ITenantRepository _tenantRepository;
private readonly ICurrentTenant _currentTenant;
private readonly IIoTDBSessionPoolProvider _ioTDBSessionPoolProvider;
public IoTDbMigrationService(
IDataSeeder dataSeeder,
IEnumerable<IIoTDbSchemaMigrator> dbSchemaMigrators,
ITenantRepository tenantRepository,
ICurrentTenant currentTenant,
IIoTDBSessionPoolProvider ioTDBSessionPoolProvider)
ICurrentTenant currentTenant)
{
_dataSeeder = dataSeeder;
_dbSchemaMigrators = dbSchemaMigrators;
_tenantRepository = tenantRepository;
_currentTenant = currentTenant;
_ioTDBSessionPoolProvider = ioTDBSessionPoolProvider;
Logger = NullLogger<IoTDbMigrationService>.Instance;
}
@ -41,7 +36,6 @@ namespace JiShe.IoT.Data
await MigrateDatabaseSchemaAsync();
await SeedDataAsync();
await InitIoTDBTable();
Logger.LogInformation($"Successfully completed host database migrations.");
@ -87,16 +81,6 @@ namespace JiShe.IoT.Data
}
}
/// <summary>
/// ³õʼ»¯IoTDB±íÄ£ÐÍ
/// </summary>
/// <returns></returns>
private async Task InitIoTDBTable()
{
//³õʼ»¯IoTDB±íÄ£ÐÍ
await _ioTDBSessionPoolProvider.GetSessionPool(true).InitTableSessionModelAsync();
}
private async Task SeedDataAsync(Tenant tenant = null)
{
Logger.LogInformation($"Executing {(tenant == null ? "host" : tenant.Name + " tenant")} database seed...");

2
src/JiShe.IoT.Domain/IoTDomainModule.cs
View File

@ -1,6 +1,5 @@
using JiShe.ServicePro.DynamicMenuManagement;
using JiShe.ServicePro.FileManagement;
using JiShe.ServicePro.IoTDBManagement;
using JiShe.ServicePro.TemplateManagement;
namespace JiShe.IoT
@ -13,7 +12,6 @@ namespace JiShe.IoT
typeof(LanguageManagementDomainModule),
typeof(TemplateManagementDomainModule),
typeof(FileManagementDomainModule),
typeof(IoTDBManagementDomainModule),
typeof(DynamicMenuManagementDomainModule)
)]
public class IoTDomainModule : AbpModule

1
src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj
View File

@ -16,7 +16,6 @@
<PackageReference Include="JiShe.ServicePro.TemplateManagement.Domain"/>
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Domain"/>
<PackageReference Include="JiShe.ServicePro.FileManagement.Domain"/>
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Domain"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" />
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Domain" />

1
src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj
View File

@ -17,7 +17,6 @@
<PackageReference Include="JiShe.ServicePro.TemplateManagement.EntityFrameworkCore"/>
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.EntityFrameworkCore"/>
<PackageReference Include="JiShe.ServicePro.FileManagement.EntityFrameworkCore"/>
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.EntityFrameworkCore"/>
<PackageReference Include="JiShe.ServicePro.DeviceManagement.EntityFrameworkCore"/>
</ItemGroup>

2
src/JiShe.IoT.HttpApi.Client/IoTHttpApiClientModule.cs
View File

@ -2,7 +2,6 @@ using JiShe.ServicePro.BasicManagement;
using JiShe.ServicePro.DataDictionaryManagement;
using JiShe.ServicePro.DynamicMenuManagement;
using JiShe.ServicePro.FileManagement;
using JiShe.ServicePro.IoTDBManagement;
using JiShe.ServicePro.LanguageManagement;
using JiShe.ServicePro.NotificationManagement;
using JiShe.ServicePro.TemplateManagement;
@ -17,7 +16,6 @@ namespace JiShe.IoT
typeof(LanguageManagementHttpApiClientModule),
typeof(TemplateManagementHttpApiClientModule),
typeof(FileManagementHttpApiClientModule),
typeof(IoTDBManagementHttpApiClientModule),
typeof(DynamicMenuManagementHttpApiClientModule)
)]
public class IoTHttpApiClientModule : AbpModule

2
src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj
View File

@ -16,7 +16,7 @@
<PackageReference Include="JiShe.ServicePro.TemplateManagement.HttpApi.Client"/>
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.HttpApi.Client"/>
<PackageReference Include="JiShe.ServicePro.FileManagement.HttpApi.Client"/>
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.HttpApi.Client"/>
<PackageReference Include="JiShe.ServicePro.DeviceManagement.HttpApi.Client"/>
<PackageReference Include="JiShe.ServicePro.DeviceManagement.HttpApi.Client"/>
</ItemGroup>

2
src/JiShe.IoT.HttpApi/IoTHttpApiModule.cs
View File

@ -1,7 +1,6 @@
using JiShe.ServicePro.DataDictionaryManagement;
using JiShe.ServicePro.DynamicMenuManagement;
using JiShe.ServicePro.FileManagement;
using JiShe.ServicePro.IoTDBManagement;
using JiShe.ServicePro.LanguageManagement;
using JiShe.ServicePro.TemplateManagement;
@ -15,7 +14,6 @@ namespace JiShe.IoT
typeof(LanguageManagementHttpApiModule),
typeof(TemplateManagementHttpApiModule),
typeof(FileManagementHttpApiModule),
typeof(IoTDBManagementHttpApiModule),
typeof(DynamicMenuManagementHttpApiModule)
)]
public class IoTHttpApiModule : AbpModule

23
src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj
View File

@ -1,19 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>JiShe.IoT</RootNamespace>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>JiShe.IoT</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\JiShe.IoT.Application.Contracts\JiShe.IoT.Application.Contracts.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\JiShe.IoT.Application.Contracts\JiShe.IoT.Application.Contracts.csproj"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore.Annotations"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="JiShe.ServicePro.BasicManagement.HttpApi"/>
<PackageReference Include="JiShe.ServicePro.NotificationManagement.HttpApi"/>
@ -23,7 +22,7 @@
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.HttpApi"/>
<PackageReference Include="JiShe.ServicePro.FileManagement.HttpApi"/>
<PackageReference Include="JiShe.ServicePro.DeviceManagement.HttpApi"/>
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.HttpApi" />
</ItemGroup>
</Project>