wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1.0.0.514-1

Browse Source 
Former-commit-id: 72685838a4811c628187b92e318de3ad71b1bbaa
TangShanKaiPing
wanggang 5 years ago
parent a9f06980bd
commit d5edbaed5c
10 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File

14
projects/Infrastructure/Infrastructure.csproj
Unescape View File

@ -17,14 +17,14 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="CS-Script.Core" Version="1.3.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.1.1" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.3" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.3" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.4" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.4" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="nacos-sdk-csharp-unofficial" Version="0.2.6" />
<PackageReference Include="nacos-sdk-csharp-unofficial.AspNetCore" Version="0.2.6" />

6
projects/IoT.Shared/IoT.Shared.csproj
Unescape View File

@ -11,9 +11,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.3" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.3" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.4" />
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.1.4" />
<PackageReference Include="SSH.NET" Version="2016.1.0" />
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.1.4" />

2
projects/IoTNode/IoTNode.csproj
Unescape View File

@ -13,7 +13,7 @@
<PackageReference Include="Hangfire.Core" Version="1.7.11" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.11" />
<PackageReference Include="Hangfire.LiteDB" Version="0.3.1" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.3" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />

13
projects/IoTNode/Services/CustomDashboardAuthorizationFilter.cs
Unescape View File

@ -0,0 +1,13 @@
using Hangfire.Annotations;
using Hangfire.Dashboard;
namespace IoTNode.Services
{
public class CustomDashboardAuthorizationFilter : IDashboardAuthorizationFilter
{
public bool Authorize([NotNull] DashboardContext context)
{
return context.GetHttpContext().User.Identity.IsAuthenticated;
}
}
}

19
projects/IoTNode/Startup.cs
Unescape View File

@ -47,20 +47,15 @@ namespace IoTNode
public override void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
{
base.Configure(app, env, loggerFactory);
app.UseHangfireDashboard(pathMatch: "/job");
app.UseHangfireServer();
var options = new DashboardOptions
{
Authorization = new[] { new CustomDashboardAuthorizationFilter() }
};
app.UseHangfireDashboard("/job", options);
//Task.Run(() =>
//{
// using var scope = app.ApplicationServices.CreateScope();
// var timerRepo = scope.ServiceProvider.GetService<IRepository<SceneTimer>>();
// var timers = timerRepo.ReadOnlyTable().Where(o => o.Scene.NodeId != null).ToList();
// foreach (var timer in timers)
// {
// RecurringJob.AddOrUpdate<IoTNodeJob>(timer.Id.ToString(), o => o.TimerHanle(timer.Id), timer.Cron, TimeZoneInfo.Local);
// }
//});
app.UseHangfireServer();
}
}
}

4
projects/IoTNode/appsettings.json
Unescape View File

@ -25,5 +25,9 @@
"key": "111111111111111111111111",
"issuer": "111111111111111111111111",
"audience": "111111111111111111111111"
},
"auth": {
"usr": "admin",
"pwd": "admin"
}
}

4
projects/UserCenter/UserCenter.csproj
Unescape View File

@ -10,8 +10,8 @@
<Compile Include="..\Version.cs" Link="Version.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="3.1.0" />
<PackageReference Include="AspNet.Security.OAuth.QQ" Version="3.1.0" />
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="3.1.1" />
<PackageReference Include="AspNet.Security.OAuth.QQ" Version="3.1.1" />
<PackageReference Include="RavenDB.Embedded" Version="4.2.102" />
</ItemGroup>
<ItemGroup>

2
projects/Version.cs
Unescape View File

@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("1.0.0.*")]
[assembly: AssemblyInformationalVersion("1.0.0.514")]
[assembly: AssemblyInformationalVersion("1.0.0.514-1")]

2
projects/WebMVC/WebMVC.csproj
Unescape View File

@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.3" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.4" />
</ItemGroup>
</Project>

2
projects/WebSPA/WebSPA.csproj
Unescape View File

@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.3" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.4" />
</ItemGroup>
</Project>
Write Preview
Loading…
Cancel
Save