From 2493c3929bcf6a30cd7e02170c73771bee2bd5b0 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Mon, 27 Apr 2020 17:01:12 +0800
Subject: [PATCH] 1.0.0.427

Former-commit-id: 41ce293b562498f2835ab8b16ae54d80ffafb9a1
---
 projects/Infrastructure/Infrastructure.csproj |  2 +-
 .../Infrastructure/Views/Shared/_Paged.cshtml |  5 ++--
 projects/IoT.Shared/IoT.Shared.csproj         |  2 +-
 projects/IoTCenter/IoTCenter.csproj           |  2 +-
 .../IoTCenter/Views/Shared/_Layout.cshtml     | 30 +++++++++----------
 projects/IoTNode/DbConfig.cs                  |  4 +--
 projects/IoTNode/IoTNode.csproj               |  2 +-
 projects/JobServer/JobServer.csproj           |  2 +-
 projects/StudyCenter/StudyCenter.csproj       |  2 +-
 projects/UserCenter/UserCenter.csproj         |  2 +-
 projects/WebMVC/WebMVC.csproj                 |  2 +-
 projects/WebSPA/WebSPA.csproj                 |  2 +-
 tools/nginx-1.16.0/conf/nginx.conf            |  9 ++++++
 13 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/projects/Infrastructure/Infrastructure.csproj b/projects/Infrastructure/Infrastructure.csproj
index b86eb0b3..ccfc2b87 100644
--- a/projects/Infrastructure/Infrastructure.csproj
+++ b/projects/Infrastructure/Infrastructure.csproj
@@ -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>
diff --git a/projects/Infrastructure/Views/Shared/_Paged.cshtml b/projects/Infrastructure/Views/Shared/_Paged.cshtml
index f694bb74..23e7d03a 100644
--- a/projects/Infrastructure/Views/Shared/_Paged.cshtml
+++ b/projects/Infrastructure/Views/Shared/_Paged.cshtml
@@ -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
             {
diff --git a/projects/IoT.Shared/IoT.Shared.csproj b/projects/IoT.Shared/IoT.Shared.csproj
index 7468393d..0888e8f2 100644
--- a/projects/IoT.Shared/IoT.Shared.csproj
+++ b/projects/IoT.Shared/IoT.Shared.csproj
@@ -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>
diff --git a/projects/IoTCenter/IoTCenter.csproj b/projects/IoTCenter/IoTCenter.csproj
index 25396cc6..a15969a4 100644
--- a/projects/IoTCenter/IoTCenter.csproj
+++ b/projects/IoTCenter/IoTCenter.csproj
@@ -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" />
diff --git a/projects/IoTCenter/Views/Shared/_Layout.cshtml b/projects/IoTCenter/Views/Shared/_Layout.cshtml
index f7fc3fa5..3e7c229a 100644
--- a/projects/IoTCenter/Views/Shared/_Layout.cshtml
+++ b/projects/IoTCenter/Views/Shared/_Layout.cshtml
@@ -99,26 +99,26 @@
                         <a href="@Url.Action("Index","Home",new { area="Admin" })">管理</a>
                     }
                 </div>
-                <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 class="row">
+                        <canvas id="android_app" style="width:180px;height:180px;"></canvas>
+                        <canvas id="ios_app" style="width:180px;height:180px;"></canvas>
+                    </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>
-        var androidUrl = location.protocol + '//' + location.host + '@Url.Content("~/app.apk")';
-        QRCode.toCanvas(document.getElementById('android_app'), androidUrl, {width:150}, function (error) {
-            if (error) console.error(error)
-        })
-        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) {
-            if (error) console.error(error)
-        })
-    </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) {
+                if (error) console.error(error)
+            })
+            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) {
+                if (error) console.error(error)
+            })
+        </script>*@
 </body>
 </html>
\ No newline at end of file
diff --git a/projects/IoTNode/DbConfig.cs b/projects/IoTNode/DbConfig.cs
index 4e7233fe..0a2a33d1 100644
--- a/projects/IoTNode/DbConfig.cs
+++ b/projects/IoTNode/DbConfig.cs
@@ -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 = "" });
diff --git a/projects/IoTNode/IoTNode.csproj b/projects/IoTNode/IoTNode.csproj
index e650d49d..33929e03 100644
--- a/projects/IoTNode/IoTNode.csproj
+++ b/projects/IoTNode/IoTNode.csproj
@@ -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" />
diff --git a/projects/JobServer/JobServer.csproj b/projects/JobServer/JobServer.csproj
index 6a1e84a9..14f1921e 100644
--- a/projects/JobServer/JobServer.csproj
+++ b/projects/JobServer/JobServer.csproj
@@ -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>
diff --git a/projects/StudyCenter/StudyCenter.csproj b/projects/StudyCenter/StudyCenter.csproj
index bd62d5cb..77e043e1 100644
--- a/projects/StudyCenter/StudyCenter.csproj
+++ b/projects/StudyCenter/StudyCenter.csproj
@@ -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" />
diff --git a/projects/UserCenter/UserCenter.csproj b/projects/UserCenter/UserCenter.csproj
index 5faf1dbc..564f9d77 100644
--- a/projects/UserCenter/UserCenter.csproj
+++ b/projects/UserCenter/UserCenter.csproj
@@ -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" />
diff --git a/projects/WebMVC/WebMVC.csproj b/projects/WebMVC/WebMVC.csproj
index 7d1836c9..5871e44e 100644
--- a/projects/WebMVC/WebMVC.csproj
+++ b/projects/WebMVC/WebMVC.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>1.0.0-beta.414</Version>
+    <Version>1.0.0.427</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/projects/WebSPA/WebSPA.csproj b/projects/WebSPA/WebSPA.csproj
index 7327732e..8257692b 100644
--- a/projects/WebSPA/WebSPA.csproj
+++ b/projects/WebSPA/WebSPA.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>1.0.0-beta.414</Version>
+    <Version>1.0.0.427</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tools/nginx-1.16.0/conf/nginx.conf b/tools/nginx-1.16.0/conf/nginx.conf
index f7b36b73..661e17db 100644
--- a/tools/nginx-1.16.0/conf/nginx.conf
+++ b/tools/nginx-1.16.0/conf/nginx.conf
@@ -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;