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

1.0.0.427

Browse Source 
Former-commit-id: 41ce293b562498f2835ab8b16ae54d80ffafb9a1
TangShanKaiPing
wanggang 5 years ago
parent 974330abed
commit 2493c3929b
13 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File

2
projects/Infrastructure/Infrastructure.csproj
Unescape View File

@ -5,7 +5,7 @@
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest> <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<Version>1.0.0-beta.422</Version> <Version>1.0.0.427</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

5
projects/Infrastructure/Views/Shared/_Paged.cshtml
Unescape View File

@ -1,9 +1,10 @@
@model Infrastructure.Application.IPagedList @model Infrastructure.Application.IPagedList
@{ @{
var links = Model.GetPageIndexs(); var links = Model.GetPageIndexs();
var url = this.Context.Request.GetUrl(); var url = Url.Content("~") + this.Context.Request.Path + this.Context.Request.QueryString;
var pageIndexParam = "PageIndex"; var pageIndexParam = "PageIndex";
var firstUrl = url.RemoveParam("PageIndex"); var firstUrl = url.RemoveParam("PageIndex");
var prevUrl = Model.PageIndex - 1 == 1 ? firstUrl : url.SetParam(pageIndexParam, Model.PageIndex - 1);
<ul class="pagination pagination-sm m-0 float-right"> <ul class="pagination pagination-sm m-0 float-right">
<li class="page-item"><a class="page-link" href="@firstUrl">首页</a></li> <li class="page-item"><a class="page-link" href="@firstUrl">首页</a></li>
@if (Model.HasPrev()) @if (Model.HasPrev())
@ -18,7 +19,7 @@
{ {
if (item == Model.PageIndex) if (item == Model.PageIndex)
{ {
<li class="page-item active"><a class="page-link" href="@url.SetParam(pageIndexParam,item)">@item</a></li> <li class="page-item active"><a class="page-link" href="@(item==1?firstUrl:url.SetParam(pageIndexParam,item))">@item</a></li>
} }
else else
{ {

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

@ -5,7 +5,7 @@
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest> <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<Version>1.0.0-beta.422</Version> <Version>1.0.0.427</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
projects/IoTCenter/IoTCenter.csproj
Unescape View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<Version>1.0.0-beta.422</Version> <Version>1.0.0.427</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Infrastructure\Infrastructure.csproj" /> <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />

30
projects/IoTCenter/Views/Shared/_Layout.cshtml
Unescape View File

@ -99,26 +99,26 @@
<a href="@Url.Action("Index","Home",new { area="Admin" })">管理</a> <a href="@Url.Action("Index","Home",new { area="Admin" })">管理</a>
} }
</div> </div>
<div class="row"> @*<div class="row">
<canvas id="android_app" style="width:180px;height:180px;"></canvas> <canvas id="android_app" style="width:180px;height:180px;"></canvas>
<canvas id="ios_app" style="width:180px;height:180px;"></canvas> <canvas id="ios_app" style="width:180px;height:180px;"></canvas>
</div> </div>*@
</div> </div>
</footer> </footer>
</div> </div>
@(await Html.PartialAsync("_Footer")) @(await Html.PartialAsync("_Footer"))
@RenderSection("scripts", required: false) @RenderSection("scripts", required: false)
<script src="~/js/site.js"></script> <script src="~/js/site.js"></script>
<script src="~/lib/qrcode/qrcode.min.js"></script> @*<script src="~/lib/qrcode/qrcode.min.js"></script>
<script> <script>
var androidUrl = location.protocol + '//' + location.host + '@Url.Content("~/app.apk")'; var androidUrl = location.protocol + '//' + location.host + '@Url.Content("~/app.apk")';
QRCode.toCanvas(document.getElementById('android_app'), androidUrl, {width:150}, function (error) { QRCode.toCanvas(document.getElementById('android_app'), androidUrl, {width:150}, function (error) {
if (error) console.error(error) if (error) console.error(error)
}) })
var iosUrl = '@iosAppUrl'; 'itms-services://?action=download-manifest&url='+ location.protocol + '//' + location.host + '@Url.Content("~/Info.plist")'; var iosUrl = '@iosAppUrl'; 'itms-services://?action=download-manifest&url='+ location.protocol + '//' + location.host + '@Url.Content("~/Info.plist")';
QRCode.toCanvas(document.getElementById('ios_app'), iosUrl, { width: 150 },function (error) { QRCode.toCanvas(document.getElementById('ios_app'), iosUrl, { width: 150 },function (error) {
if (error) console.error(error) if (error) console.error(error)
}) })
</script> </script>*@
</body> </body>
</html> </html>

4
projects/IoTNode/DbConfig.cs
Unescape View File

@ -84,8 +84,8 @@ namespace IoTNode
set.Add(new Setting { Name = "camera.usr", Value = "admin" }); set.Add(new Setting { Name = "camera.usr", Value = "admin" });
set.Add(new Setting { Name = "camera.pwd", Value = "dsideal123" }); set.Add(new Setting { Name = "camera.pwd", Value = "dsideal123" });
set.Add(new Setting { Name = "stream.rtmp", Value = stream }); set.Add(new Setting { Name = "stream.rtmp", Value = stream });
set.Add(new Setting { Name = "stream.flv", Value = $"{stream}" }); //set.Add(new Setting { Name = "stream.flv", Value = $"{stream}" });
set.Add(new Setting { Name = "stream.hls", Value = $"{stream}" }); //set.Add(new Setting { Name = "stream.hls", Value = $"{stream}" });
set.Add(new Setting { Name = "ffmpeg.args", Value = " -y -threads {0} -rtsp_transport tcp -use_wallclock_as_timestamps 1 -stimeout 3000000 -i \"{1}\" -fflags +genpts -c copy -f flv \"{2}\"" }); set.Add(new Setting { Name = "ffmpeg.args", Value = " -y -threads {0} -rtsp_transport tcp -use_wallclock_as_timestamps 1 -stimeout 3000000 -i \"{1}\" -fflags +genpts -c copy -f flv \"{2}\"" });
set.Add(new Setting { Name = "fbee.writelist", Value = "" }); set.Add(new Setting { Name = "fbee.writelist", Value = "" });
set.Add(new Setting { Name = "camera.writelist", Value = "" }); set.Add(new Setting { Name = "camera.writelist", Value = "" });

2
projects/IoTNode/IoTNode.csproj
Unescape View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<Version>1.0.0-beta.422</Version> <Version>1.0.0.427</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Hangfire.Core" Version="1.7.11" /> <PackageReference Include="Hangfire.Core" Version="1.7.11" />

2
projects/JobServer/JobServer.csproj
Unescape View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<Version>1.0.0-beta.422</Version> <Version>1.0.0.427</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
projects/StudyCenter/StudyCenter.csproj
Unescape View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<Version>1.0.0-beta.422</Version> <Version>1.0.0.427</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<None Include="..\.editorconfig" Link=".editorconfig" /> <None Include="..\.editorconfig" Link=".editorconfig" />

2
projects/UserCenter/UserCenter.csproj
Unescape View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<Version>1.0.0-beta.422</Version> <Version>1.0.0.427</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="3.1.0" /> <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="3.1.0" />

2
projects/WebMVC/WebMVC.csproj
Unescape View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-beta.414</Version> <Version>1.0.0.427</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
projects/WebSPA/WebSPA.csproj
Unescape View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-beta.414</Version> <Version>1.0.0.427</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

9
tools/nginx-1.16.0/conf/nginx.conf
Unescape View File

@ -71,10 +71,16 @@ http {
location ^~ /UserCenter/ { location ^~ /UserCenter/ {
proxy_pass http://localhost:8010/UserCenter/; proxy_pass http://localhost:8010/UserCenter/;
proxy_set_header Host $host:$server_port;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
} }
location ^~ /IoTCenter/ { location ^~ /IoTCenter/ {
proxy_pass http://localhost:8011/IoTCenter/; proxy_pass http://localhost:8011/IoTCenter/;
proxy_set_header Host $host:$server_port;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
} }
location ^~ /IoTCenter/hub { location ^~ /IoTCenter/hub {
@ -86,6 +92,9 @@ http {
location ^~ /JobServer/ { location ^~ /JobServer/ {
proxy_pass http://localhost:8013/JobServer/; proxy_pass http://localhost:8013/JobServer/;
proxy_set_header Host $host:$server_port;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
} }
error_page 500 502 503 504 /50x.html; error_page 500 502 503 504 /50x.html;

Write Preview
Loading…
Cancel
Save