From 15066e09ef05d34eefa7e7e9a5ad2836412187da Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 23 Jul 2019 10:13:30 +0800
Subject: [PATCH] update

Former-commit-id: 2848693d23e46a329d594b26662e67c67636c96e
---
 labs/FRT/Controllers/HomeController.cs               |  5 ++++-
 labs/FRT/FRT.csproj                                  | 12 ++----------
 labs/FRT/Program.cs                                  |  2 ++
 projects/UserCenter/Controllers/AccountController.cs |  1 +
 .../UserCenter/Services/FaceRecognitionService.cs    |  9 ++++++---
 projects/UserCenter/UserCenter.csproj                |  1 +
 projects/UserCenter/install.txt                      |  2 +-
 7 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/labs/FRT/Controllers/HomeController.cs b/labs/FRT/Controllers/HomeController.cs
index 07aacc87..e3ce878b 100644
--- a/labs/FRT/Controllers/HomeController.cs
+++ b/labs/FRT/Controllers/HomeController.cs
@@ -27,7 +27,10 @@ namespace FRT.Controllers
             var result = 0;
             DateTime start;
             DateTime end;
-            this._FaceRecognition = FaceRecognition.Create(Path.Combine(this._env.WebRootPath, "face"));
+            Console.WriteLine(this._env.WebRootPath == null ? "web root is null" : this._env.WebRootPath);
+            var basePath = Path.Combine(this._env.WebRootPath, "face");
+            Console.WriteLine(basePath);
+            this._FaceRecognition = FaceRecognition.Create(basePath);
             //
             var path = Path.Combine(this._env.WebRootPath, "TestImages", $"1.jpg");
             byte[] data = null;
diff --git a/labs/FRT/FRT.csproj b/labs/FRT/FRT.csproj
index 143c6536..4ae0919d 100644
--- a/labs/FRT/FRT.csproj
+++ b/labs/FRT/FRT.csproj
@@ -1,22 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="wwwroot\face\dlib_face_recognition_resnet_model_v1.dat">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-
   <ItemGroup>
     <PackageReference Include="FaceRecognitionDotNet" Version="1.2.3.13" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
     <PackageReference Include="System.Drawing.Common" Version="4.5.1" />
   </ItemGroup>
-
-</Project>
+</Project>
\ No newline at end of file
diff --git a/labs/FRT/Program.cs b/labs/FRT/Program.cs
index 41d16bbc..f890a66d 100644
--- a/labs/FRT/Program.cs
+++ b/labs/FRT/Program.cs
@@ -19,6 +19,8 @@ namespace FRT
 
         public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
+                .UseWebRoot(Path.Combine(Directory.GetCurrentDirectory(), "publish/wwwroot"))
+                .UseUrls("http://*:5000")
                 .UseStartup<Startup>();
     }
 }
\ No newline at end of file
diff --git a/projects/UserCenter/Controllers/AccountController.cs b/projects/UserCenter/Controllers/AccountController.cs
index 6ceb6901..e8897c3a 100644
--- a/projects/UserCenter/Controllers/AccountController.cs
+++ b/projects/UserCenter/Controllers/AccountController.cs
@@ -130,6 +130,7 @@ namespace UserCenter.Controllers
             {
                 using (var bitmap = new System.Drawing.Bitmap(stream))
                 {
+                    Console.WriteLine($"face length:{face.Length}");
                     var userName = this._frs.FindFace(bitmap);
                     if (!string.IsNullOrEmpty(userName))
                     {
diff --git a/projects/UserCenter/Services/FaceRecognitionService.cs b/projects/UserCenter/Services/FaceRecognitionService.cs
index 6e1df35a..f3e5e69d 100644
--- a/projects/UserCenter/Services/FaceRecognitionService.cs
+++ b/projects/UserCenter/Services/FaceRecognitionService.cs
@@ -49,6 +49,7 @@ namespace UserCenter.Services
         private FaceEncoding GetFaceImageEncoding(string faceImage)
         {
             var faceImagePath = Path.Combine(this._env.WebRootPath, faceImage.TrimStart('/'));
+            Console.WriteLine(faceImage);
             using (var img = FaceRecognition.LoadImageFile(faceImagePath))
             {
                 var faceEncodings = this._faceRecognition.FaceEncodings(img).ToArray();
@@ -84,6 +85,10 @@ namespace UserCenter.Services
                         }
                     }
                 }
+                else
+                {
+                    Console.WriteLine("can't find face from image");
+                }
                 foreach (var encoding in encodings)
                 {
                     encoding.Dispose();
@@ -109,7 +114,7 @@ namespace UserCenter.Services
             face.Dispose();
         }
 
-        private byte[] ToManaged(System.Drawing.Bitmap bitmap)
+        public byte[] ToManaged(System.Drawing.Bitmap bitmap)
         {
             var format = bitmap.PixelFormat;
             var width = bitmap.Width;
@@ -125,9 +130,7 @@ namespace UserCenter.Services
             finally
             {
                 if (bitmapData != null)
-                {
                     bitmap.UnlockBits(bitmapData);
-                }
             }
 
             return array;
diff --git a/projects/UserCenter/UserCenter.csproj b/projects/UserCenter/UserCenter.csproj
index ca31e630..38040a73 100644
--- a/projects/UserCenter/UserCenter.csproj
+++ b/projects/UserCenter/UserCenter.csproj
@@ -14,6 +14,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
     <PackageReference Include="Ocelot" Version="13.5.2" />
     <PackageReference Include="RavenDB.Embedded" Version="4.2.1" />
+    <PackageReference Include="System.Drawing.Common" Version="4.5.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
diff --git a/projects/UserCenter/install.txt b/projects/UserCenter/install.txt
index 050375a7..44b08204 100644
--- a/projects/UserCenter/install.txt
+++ b/projects/UserCenter/install.txt
@@ -1,3 +1,3 @@
 ldd ./libDlibDotNetNative.so
 apt-get install libopenblas-base
-apt install libgdiplus-devel
\ No newline at end of file
+apt install libgdiplus
\ No newline at end of file