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

更新CTWing依赖

Browse Source
This commit is contained in:
ChenYi 2025-06-24 16:31:32 +08:00
parent 9107077252
commit e43b5361de
10 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dev.Dockerfile
View File

@ -4,7 +4,7 @@ WORKDIR /app
EXPOSE 8080 EXPOSE 8080
EXPOSE 443 EXPOSE 443
ENV TZ=Asia/Shanghai ENV TZ=Asia/Shanghai
ENV ASPNETCORE_ENVIRONMENT=Production ENV ASPNETCORE_ENVIRONMENT=Development
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
COPY ["JiShe.IoT.Admin.sln", "."] COPY ["JiShe.IoT.Admin.sln", "."]

2
JiShe.ServicePro

@ -1 +1 @@
Subproject commit 7d75c333eb91bf9b439b95e306e418e929588431 Subproject commit 44ae02f6792629a0e3939a433722857f794c5f54

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

@ -26,6 +26,7 @@
<ProjectReference Include="..\..\JiShe.ServicePro\modules\LanguageManagement\src\JiShe.ServicePro.LanguageManagement.Application.Contracts\JiShe.ServicePro.LanguageManagement.Application.Contracts.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\LanguageManagement\src\JiShe.ServicePro.LanguageManagement.Application.Contracts\JiShe.ServicePro.LanguageManagement.Application.Contracts.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\NotificationManagement\src\JiShe.ServicePro.NotificationManagement.Application.Contracts\JiShe.ServicePro.NotificationManagement.Application.Contracts.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\NotificationManagement\src\JiShe.ServicePro.NotificationManagement.Application.Contracts\JiShe.ServicePro.NotificationManagement.Application.Contracts.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.Application.Contracts\JiShe.ServicePro.TemplateManagement.Application.Contracts.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.Application.Contracts\JiShe.ServicePro.TemplateManagement.Application.Contracts.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\CTWingManagement\src\JiShe.ServicePro.CTWingManagement.Application.Contracts\JiShe.ServicePro.CTWingManagement.Application.Contracts.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release"> <ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release">
@ -38,6 +39,7 @@
<PackageReference Include="JiShe.ServicePro.FileManagement.Application.Contracts" /> <PackageReference Include="JiShe.ServicePro.FileManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Application.Contracts"/> <PackageReference Include="JiShe.ServicePro.IoTDBManagement.Application.Contracts"/>
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Application.Contracts"/> <PackageReference Include="JiShe.ServicePro.DeviceManagement.Application.Contracts"/>
<PackageReference Include="JiShe.ServicePro.CTWingManagement.Application.Contracts"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@ -41,7 +41,7 @@ namespace JiShe.IoT
public override void PostConfigureServices(ServiceConfigurationContext context) public override void PostConfigureServices(ServiceConfigurationContext context)
{ {
// 定时任务 // 定时任务
//ConfigureBackgroundJob(context); ConfigureBackgroundJob(context);
} }
private static void ConfigureBackgroundJob(ServiceConfigurationContext context) private static void ConfigureBackgroundJob(ServiceConfigurationContext context)

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

@ -18,6 +18,7 @@
<ProjectReference Include="..\..\JiShe.ServicePro\modules\NotificationManagement\src\JiShe.ServicePro.NotificationManagement.Application\JiShe.ServicePro.NotificationManagement.Application.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\NotificationManagement\src\JiShe.ServicePro.NotificationManagement.Application\JiShe.ServicePro.NotificationManagement.Application.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.Application\JiShe.ServicePro.TemplateManagement.Application.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.Application\JiShe.ServicePro.TemplateManagement.Application.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\frameworks\src\JiShe.ServicePro.FreeRedisProvider\JiShe.ServicePro.FreeRedisProvider.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\frameworks\src\JiShe.ServicePro.FreeRedisProvider\JiShe.ServicePro.FreeRedisProvider.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\CTWingManagement\src\JiShe.ServicePro.CTWingManagement.Application\JiShe.ServicePro.CTWingManagement.Application.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release"> <ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release">
@ -32,6 +33,7 @@
<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" /> <PackageReference Include="JiShe.ServicePro.DeviceManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.CTWingManagement.Application" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@ -21,7 +21,7 @@
<ProjectReference Include="..\..\JiShe.ServicePro\modules\LanguageManagement\src\JiShe.ServicePro.LanguageManagement.Domain.Shared\JiShe.ServicePro.LanguageManagement.Domain.Shared.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\LanguageManagement\src\JiShe.ServicePro.LanguageManagement.Domain.Shared\JiShe.ServicePro.LanguageManagement.Domain.Shared.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\NotificationManagement\src\JiShe.ServicePro.NotificationManagement.Domain.Shared\JiShe.ServicePro.NotificationManagement.Domain.Shared.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\NotificationManagement\src\JiShe.ServicePro.NotificationManagement.Domain.Shared\JiShe.ServicePro.NotificationManagement.Domain.Shared.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.Domain.Shared\JiShe.ServicePro.TemplateManagement.Domain.Shared.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.Domain.Shared\JiShe.ServicePro.TemplateManagement.Domain.Shared.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\CTWingManagement\src\JiShe.ServicePro.CTWingManagement.Domain.Shared\JiShe.ServicePro.CTWingManagement.Domain.Shared.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\frameworks\src\JiShe.ServicePro.Core\JiShe.ServicePro.Core.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\frameworks\src\JiShe.ServicePro.Core\JiShe.ServicePro.Core.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\frameworks\src\JiShe.ServicePro.FreeSqlProvider\JiShe.ServicePro.FreeSqlProvider.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\frameworks\src\JiShe.ServicePro.FreeSqlProvider\JiShe.ServicePro.FreeSqlProvider.csproj" />
</ItemGroup> </ItemGroup>
@ -39,6 +39,7 @@
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Domain.Shared" /> <PackageReference Include="JiShe.ServicePro.DeviceManagement.Domain.Shared" />
<PackageReference Include="JiShe.ServicePro.FreeSqlProvider" /> <PackageReference Include="JiShe.ServicePro.FreeSqlProvider" />
<PackageReference Include="JiShe.ServicePro.Core" /> <PackageReference Include="JiShe.ServicePro.Core" />
<PackageReference Include="JiShe.ServicePro.CTWingManagement.Domain.Shared" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@ -17,6 +17,7 @@
<ProjectReference Include="..\..\JiShe.ServicePro\modules\LanguageManagement\src\JiShe.ServicePro.LanguageManagement.Domain\JiShe.ServicePro.LanguageManagement.Domain.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\LanguageManagement\src\JiShe.ServicePro.LanguageManagement.Domain\JiShe.ServicePro.LanguageManagement.Domain.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\NotificationManagement\src\JiShe.ServicePro.NotificationManagement.Domain\JiShe.ServicePro.NotificationManagement.Domain.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\NotificationManagement\src\JiShe.ServicePro.NotificationManagement.Domain\JiShe.ServicePro.NotificationManagement.Domain.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.Domain\JiShe.ServicePro.TemplateManagement.Domain.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.Domain\JiShe.ServicePro.TemplateManagement.Domain.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\CTWingManagement\src\JiShe.ServicePro.CTWingManagement.Domain\JiShe.ServicePro.CTWingManagement.Domain.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release"> <ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release">
@ -29,6 +30,7 @@
<PackageReference Include="JiShe.ServicePro.FileManagement.Domain" /> <PackageReference Include="JiShe.ServicePro.FileManagement.Domain" />
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Domain" /> <PackageReference Include="JiShe.ServicePro.IoTDBManagement.Domain" />
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Domain" /> <PackageReference Include="JiShe.ServicePro.DeviceManagement.Domain" />
<PackageReference Include="JiShe.ServicePro.CTWingManagement.Domain" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@ -20,6 +20,7 @@
<ProjectReference Include="..\..\JiShe.ServicePro\modules\LanguageManagement\src\JiShe.ServicePro.LanguageManagement.EntityFrameworkCore\JiShe.ServicePro.LanguageManagement.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\LanguageManagement\src\JiShe.ServicePro.LanguageManagement.EntityFrameworkCore\JiShe.ServicePro.LanguageManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\NotificationManagement\src\JiShe.ServicePro.NotificationManagement.EntityFrameworkCore\JiShe.ServicePro.NotificationManagement.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\NotificationManagement\src\JiShe.ServicePro.NotificationManagement.EntityFrameworkCore\JiShe.ServicePro.NotificationManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.EntityFrameworkCore\JiShe.ServicePro.TemplateManagement.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.EntityFrameworkCore\JiShe.ServicePro.TemplateManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\CTWingManagement\src\JiShe.ServicePro.CTWingManagement.EntityFrameworkCore\JiShe.ServicePro.CTWingManagement.EntityFrameworkCore.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release"> <ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release">
@ -32,6 +33,7 @@
<PackageReference Include="JiShe.ServicePro.FileManagement.EntityFrameworkCore" /> <PackageReference Include="JiShe.ServicePro.FileManagement.EntityFrameworkCore" />
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.EntityFrameworkCore" /> <PackageReference Include="JiShe.ServicePro.IoTDBManagement.EntityFrameworkCore" />
<PackageReference Include="JiShe.ServicePro.DeviceManagement.EntityFrameworkCore" /> <PackageReference Include="JiShe.ServicePro.DeviceManagement.EntityFrameworkCore" />
<PackageReference Include="JiShe.ServicePro.CTWingManagement.EntityFrameworkCore" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@ -19,6 +19,7 @@
<ProjectReference Include="..\..\JiShe.ServicePro\modules\LanguageManagement\src\JiShe.ServicePro.LanguageManagement.HttpApi.Client\JiShe.ServicePro.LanguageManagement.HttpApi.Client.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\LanguageManagement\src\JiShe.ServicePro.LanguageManagement.HttpApi.Client\JiShe.ServicePro.LanguageManagement.HttpApi.Client.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\NotificationManagement\src\JiShe.ServicePro.NotificationManagement.HttpApi.Client\JiShe.ServicePro.NotificationManagement.HttpApi.Client.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\NotificationManagement\src\JiShe.ServicePro.NotificationManagement.HttpApi.Client\JiShe.ServicePro.NotificationManagement.HttpApi.Client.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.HttpApi.Client\JiShe.ServicePro.TemplateManagement.HttpApi.Client.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.HttpApi.Client\JiShe.ServicePro.TemplateManagement.HttpApi.Client.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\CTWingManagement\src\JiShe.ServicePro.CTWingManagement.HttpApi.Client\JiShe.ServicePro.CTWingManagement.HttpApi.Client.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release"> <ItemGroup Condition=" '$(Configuration)' == 'Release'" Label="Release">
@ -31,6 +32,7 @@
<PackageReference Include="JiShe.ServicePro.FileManagement.HttpApi.Client" /> <PackageReference Include="JiShe.ServicePro.FileManagement.HttpApi.Client" />
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.HttpApi.Client" /> <PackageReference Include="JiShe.ServicePro.IoTDBManagement.HttpApi.Client" />
<PackageReference Include="JiShe.ServicePro.DeviceManagement.HttpApi.Client" /> <PackageReference Include="JiShe.ServicePro.DeviceManagement.HttpApi.Client" />
<PackageReference Include="JiShe.ServicePro.CTWingManagement.HttpApi.Client" />
</ItemGroup> </ItemGroup>

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

@ -24,6 +24,7 @@
<ProjectReference Include="..\..\JiShe.ServicePro\modules\LanguageManagement\src\JiShe.ServicePro.LanguageManagement.HttpApi\JiShe.ServicePro.LanguageManagement.HttpApi.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\LanguageManagement\src\JiShe.ServicePro.LanguageManagement.HttpApi\JiShe.ServicePro.LanguageManagement.HttpApi.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\NotificationManagement\src\JiShe.ServicePro.NotificationManagement.HttpApi\JiShe.ServicePro.NotificationManagement.HttpApi.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\NotificationManagement\src\JiShe.ServicePro.NotificationManagement.HttpApi\JiShe.ServicePro.NotificationManagement.HttpApi.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.HttpApi\JiShe.ServicePro.TemplateManagement.HttpApi.csproj" /> <ProjectReference Include="..\..\JiShe.ServicePro\modules\TemplateManagement\src\JiShe.ServicePro.TemplateManagement.HttpApi\JiShe.ServicePro.TemplateManagement.HttpApi.csproj" />
<ProjectReference Include="..\..\JiShe.ServicePro\modules\CTWingManagement\src\JiShe.ServicePro.CTWingManagement.HttpApi\JiShe.ServicePro.CTWingManagement.HttpApi.csproj" />
</ItemGroup> </ItemGroup>
@ -37,6 +38,7 @@
<PackageReference Include="JiShe.ServicePro.FileManagement.HttpApi"/> <PackageReference Include="JiShe.ServicePro.FileManagement.HttpApi"/>
<PackageReference Include="JiShe.ServicePro.DeviceManagement.HttpApi"/> <PackageReference Include="JiShe.ServicePro.DeviceManagement.HttpApi"/>
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.HttpApi" /> <PackageReference Include="JiShe.ServicePro.IoTDBManagement.HttpApi" />
<PackageReference Include="JiShe.ServicePro.CTWingManagement.HttpApi" />
</ItemGroup> </ItemGroup>
</Project> </Project>