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

Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0

Browse Source 
Former-commit-id: 6d77da7a161073839de1364bc7bdae8a248d6274
TangShanKaiPing
zhengpengju 5 years ago
parent 524d88b9af 2493c3929b
commit f2eb456dd0
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>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<Version>1.0.0-beta.422</Version>
<Version>1.0.0.427</Version>
</PropertyGroup>
<ItemGroup>

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

@ -1,9 +1,10 @@
@model Infrastructure.Application.IPagedList
@{
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 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">
<li class="page-item"><a class="page-link" href="@firstUrl">首页</a></li>
@if (Model.HasPrev())
@ -18,7 +19,7 @@
{
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
{

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

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

2
projects/IoTCenter/IoTCenter.csproj
Unescape View File

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

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

@ -99,17 +99,17 @@
<a href="@Url.Action("Index","Home",new { area="Admin" })">管理</a>
}
</div>
<div class="row">
@*<div class="row">
<canvas id="android_app" style="width:180px;height:180px;"></canvas>
<canvas id="ios_app" style="width:180px;height:180px;"></canvas>
</div>
</div>*@
</div>
</footer>
</div>
@(await Html.PartialAsync("_Footer"))
@RenderSection("scripts", required: false)
<script src="~/js/site.js"></script>
<script src="~/lib/qrcode/qrcode.min.js"></script>
@*<script src="~/lib/qrcode/qrcode.min.js"></script>
<script>
var androidUrl = location.protocol + '//' + location.host + '@Url.Content("~/app.apk")';
QRCode.toCanvas(document.getElementById('android_app'), androidUrl, {width:150}, function (error) {
@ -119,6 +119,6 @@
QRCode.toCanvas(document.getElementById('ios_app'), iosUrl, { width: 150 },function (error) {
if (error) console.error(error)
})
</script>
</script>*@
</body>
</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.pwd", Value = "dsideal123" });
set.Add(new Setting { Name = "stream.rtmp", 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.flv", 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 = "fbee.writelist", Value = "" });
set.Add(new Setting { Name = "camera.writelist", Value = "" });

2
projects/IoTNode/IoTNode.csproj
Unescape View File

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

2
projects/JobServer/JobServer.csproj
Unescape View File

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

2
projects/StudyCenter/StudyCenter.csproj
Unescape View File

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

2
projects/UserCenter/UserCenter.csproj
Unescape View File

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

2
projects/WebMVC/WebMVC.csproj
Unescape View File

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

2
projects/WebSPA/WebSPA.csproj
Unescape View File

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

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

@ -71,10 +71,16 @@ http {
location ^~ /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/ {
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 {
@ -86,6 +92,9 @@ http {
location ^~ /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;

Write Preview
Loading…
Cancel
Save