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

Compare commits

base: admin:1a66b61749f9bf40bd71012a7672bef76898e8c2
Branches Tags
admin:master
admin:master_net9_Pomelo
...
compare: admin:7882e52f67f856f518cf95db8196b9456c52c476
Branches Tags
admin:master
admin:master_net9_Pomelo

3 Commits
1a66b61749 ... 7882e52f67

Author SHA1 Message Date
zenghongyao
7882e52f67 引入设备管理 2025-06-04 16:44:21 +08:00
zenghongyao
ec8956392d 暂存代码 2025-06-04 16:40:12 +08:00
zenghongyao
3a7bc1d494 代码暂存 2025-06-04 16:39:03 +08:00
12 changed files with 38 additions and 24 deletions
Show Stats Expand all files Collapse all files

18
Directory.Build.JiShe.targets
View File

@ -91,13 +91,17 @@
<PackageReference Update="JiShe.ServicePro.IoTDBManagement.HttpApi" Version="$(ServiceProVersion)"/> <PackageReference Update="JiShe.ServicePro.IoTDBManagement.HttpApi" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.IoTDBManagement.HttpApi.Client" Version="$(ServiceProVersion)"/> <PackageReference Update="JiShe.ServicePro.IoTDBManagement.HttpApi.Client" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DeviceManagement.Application" Version="$(ServiceProVersion)"/> <PackageReference Update="JiShe.CollectBus.IoTDB" Version="$(ServiceProVersion)"/>
<PackageReference Update="JiShe.ServicePro.DeviceManagement.Application.Contracts" Version="$(ServiceProVersion)"/> <PackageReference Update="JiShe.ServicePro.Kafka" 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.Application" Version="$(ServiceProVersion)" />
<PackageReference Update="JiShe.ServicePro.DeviceManagement.HttpApi" Version="$(ServiceProVersion)"/> <PackageReference Update="JiShe.ServicePro.DeviceManagement.Domain" Version="$(ServiceProVersion)" />
<PackageReference Update="JiShe.ServicePro.DeviceManagement.HttpApi.Client" 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> </ItemGroup>
</Project> </Project>

2
Directory.Build.props
View File

@ -2,7 +2,7 @@
<!-- 定义项目加载属性 --> <!-- 定义项目加载属性 -->
<PropertyGroup> <PropertyGroup>
<!--JiShe.ServicePro版本--> <!--JiShe.ServicePro版本-->
<ServiceProVersion>1.0.1</ServiceProVersion> <ServiceProVersion>1.0.5.5</ServiceProVersion>
<!--Volo Abp 版本--> <!--Volo Abp 版本-->
<VoloAbpVersion>9.1.1</VoloAbpVersion> <VoloAbpVersion>9.1.1</VoloAbpVersion>

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

@ -6,21 +6,22 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\JiShe.IoT.Domain.Shared\JiShe.IoT.Domain.Shared.csproj"/> <ProjectReference Include="..\JiShe.IoT.Domain.Shared\JiShe.IoT.Domain.Shared.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.ObjectExtending"/> <PackageReference Include="JiShe.ServicePro.DeviceManagement.Application.Contracts" />
<PackageReference Include="Volo.Abp.ObjectExtending" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JiShe.ServicePro.BasicManagement.Application.Contracts"/> <PackageReference Include="JiShe.ServicePro.BasicManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.NotificationManagement.Application.Contracts"/> <PackageReference Include="JiShe.ServicePro.NotificationManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.Application.Contracts"/> <PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.LanguageManagement.Application.Contracts"/> <PackageReference Include="JiShe.ServicePro.LanguageManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.TemplateManagement.Application.Contracts"/> <PackageReference Include="JiShe.ServicePro.TemplateManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Application.Contracts"/> <PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.FileManagement.Application.Contracts"/> <PackageReference Include="JiShe.ServicePro.FileManagement.Application.Contracts" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

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

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

@ -16,7 +16,7 @@ namespace JiShe.IoT
typeof(TemplateManagementApplicationModule), typeof(TemplateManagementApplicationModule),
typeof(DynamicMenuManagementApplicationModule), typeof(DynamicMenuManagementApplicationModule),
typeof(FileManagementApplicationModule), typeof(FileManagementApplicationModule),
typeof(FreeRedisProviderModule) typeof(ServiceProFreeSqlProviderModule)
)] )]
public class IoTApplicationModule : AbpModule public class IoTApplicationModule : AbpModule
{ {

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

@ -13,6 +13,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="JiShe.ServicePro.BasicManagement.Application" /> <PackageReference Include="JiShe.ServicePro.BasicManagement.Application" />
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Application" />
<PackageReference Include="JiShe.ServicePro.NotificationManagement.Application" /> <PackageReference Include="JiShe.ServicePro.NotificationManagement.Application" />
<PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.Application" /> <PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.Application" />
<PackageReference Include="JiShe.ServicePro.LanguageManagement.Application" /> <PackageReference Include="JiShe.ServicePro.LanguageManagement.Application" />
@ -20,6 +21,7 @@
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Application" /> <PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Application" />
<PackageReference Include="JiShe.ServicePro.FileManagement.Application" /> <PackageReference Include="JiShe.ServicePro.FileManagement.Application" />
<PackageReference Include="JiShe.ServicePro.FreeRedisProvider" /> <PackageReference Include="JiShe.ServicePro.FreeRedisProvider" />
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Application.Contracts" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@ -13,7 +13,7 @@ namespace JiShe.IoT
typeof(TemplateManagementDomainSharedModule), typeof(TemplateManagementDomainSharedModule),
typeof(DynamicMenuManagementDomainSharedModule), typeof(DynamicMenuManagementDomainSharedModule),
typeof(FileManagementDomainSharedModule), typeof(FileManagementDomainSharedModule),
typeof(AbpFreeSqlProviderModule), typeof(ServiceProFreeSqlProviderModule),
typeof(ServiceProCoreModule) typeof(ServiceProCoreModule)
)] )]
public class IoTDomainSharedModule : AbpModule public class IoTDomainSharedModule : AbpModule

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

@ -22,5 +22,6 @@
<PackageReference Include="JiShe.ServicePro.FileManagement.Domain.Shared"/> <PackageReference Include="JiShe.ServicePro.FileManagement.Domain.Shared"/>
<PackageReference Include="JiShe.ServicePro.FreeSqlProvider" /> <PackageReference Include="JiShe.ServicePro.FreeSqlProvider" />
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Domain.Shared" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@ -17,6 +17,8 @@
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Domain"/> <PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Domain"/>
<PackageReference Include="JiShe.ServicePro.FileManagement.Domain"/> <PackageReference Include="JiShe.ServicePro.FileManagement.Domain"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" />
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Domain" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

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

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

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

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

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