From 02d4d1b83f8d3ba8c97d0db9e47523e6adbccd71 Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Mon, 28 Jul 2025 20:06:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=86=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 3 +++
HJGL_DS/BLL/BLL.csproj | 4 ++--
HJGL_DS/BLL/app.config | 2 +-
HJGL_DS/BLL/packages.config | 2 +-
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj | 7 +++----
.../FineUIPro.Web/FineUIPro.Web.csproj.user | 4 ++--
HJGL_DS/FineUIPro.Web/Web.config | 19 +++++++++++++++++--
.../WeldMat/UsingSentMat/FaceRecognition.aspx | 2 +-
.../UsingSentMat/FaceRecognition.aspx.cs | 3 ++-
HJGL_DS/FineUIPro.Web/packages.config | 2 +-
HJGL_DS/Model/Model.csproj | 3 +++
HJGL_DS/Model/packages.config | 2 +-
HJGL_DS/SgManager.AI/packages.config | 2 +-
HJGL_DS/WebAPI/WebAPI.csproj | 6 +++---
HJGL_DS/WebAPI/WebAPI.csproj.user | 4 ++--
HJGL_DS/WebAPI/packages.config | 2 +-
16 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8ae8878..af1b134 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,6 @@ bin-release/
/HJGL_DS/FineUIPro.Web/.vs
/HJGL_DS/SgManager.AI/.vs
/HJGL_DS/packages
+/HJGL_DSPackFile/PackFile
+/HJGL_DSPackFile/版本日志
+/HJGL_DS/FineUIPro.Web/FileUpload/FaceRecognition
diff --git a/HJGL_DS/BLL/BLL.csproj b/HJGL_DS/BLL/BLL.csproj
index 383d710..dce8a56 100644
--- a/HJGL_DS/BLL/BLL.csproj
+++ b/HJGL_DS/BLL/BLL.csproj
@@ -74,8 +74,8 @@
False
..\Lib\Microsoft.SQLServer.ManagedDTS.dll
-
- ..\FineUIPro\Net40\Newtonsoft.Json.dll
+
+ ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
..\packages\NPOI.2.5.5\lib\net45\NPOI.dll
diff --git a/HJGL_DS/BLL/app.config b/HJGL_DS/BLL/app.config
index b69f873..3e98c00 100644
--- a/HJGL_DS/BLL/app.config
+++ b/HJGL_DS/BLL/app.config
@@ -4,7 +4,7 @@
-
+
diff --git a/HJGL_DS/BLL/packages.config b/HJGL_DS/BLL/packages.config
index 447c26f..70c9fa9 100644
--- a/HJGL_DS/BLL/packages.config
+++ b/HJGL_DS/BLL/packages.config
@@ -1,6 +1,6 @@
-
+
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
index 5e19096..8f6b207 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
@@ -81,7 +81,7 @@
False
..\FineUIPro\Reference BLL\FastReport.Web.dll
-
+
False
..\FineUIPro\FineUIPro.dll
@@ -90,9 +90,8 @@
-
- False
- ..\FineUIPro\Net40\Newtonsoft.Json.dll
+
+ ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
..\packages\NPOI.2.5.5\lib\net45\NPOI.dll
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index 8aa7c11..a6b1c54 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,8 +1,8 @@
-
+
true
- Release|Any CPU
+ Debug|Any CPU
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index a8f4002..f85cb83 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -60,13 +60,15 @@
-
+
+
+
-
+
@@ -159,4 +161,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx
index f1eea7f..852793f 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx
@@ -55,7 +55,7 @@
});
video.srcObject = stream;
} catch (err) {
- console.error("摄像头访问错误:", err);
+ console.log("摄像头访问错误:", err);
alert(`无法访问摄像头: ${err.message}`);
}
}, 1000)
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx.cs
index 57777a1..7f24801 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx.cs
@@ -5,11 +5,12 @@ using System.Drawing;
using System.IO;
using System.Linq;
using System.Web.Services;
+using System.Web.UI;
namespace FineUIPro.Web.WeldMat.UsingSentMat
{
- public partial class FaceRecognition : PageBase
+ public partial class FaceRecognition : Page
{
protected void Page_Load(object sender, EventArgs e)
{
diff --git a/HJGL_DS/FineUIPro.Web/packages.config b/HJGL_DS/FineUIPro.Web/packages.config
index a0baa88..70c9fa9 100644
--- a/HJGL_DS/FineUIPro.Web/packages.config
+++ b/HJGL_DS/FineUIPro.Web/packages.config
@@ -1,6 +1,6 @@
-
+
diff --git a/HJGL_DS/Model/Model.csproj b/HJGL_DS/Model/Model.csproj
index 88c1dab..4f5bf29 100644
--- a/HJGL_DS/Model/Model.csproj
+++ b/HJGL_DS/Model/Model.csproj
@@ -39,6 +39,9 @@
4
+
+ ..\packages\Newtonsoft.Json.12.0.1\lib\net40\Newtonsoft.Json.dll
+
diff --git a/HJGL_DS/Model/packages.config b/HJGL_DS/Model/packages.config
index 7c276ed..0c8f272 100644
--- a/HJGL_DS/Model/packages.config
+++ b/HJGL_DS/Model/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/HJGL_DS/SgManager.AI/packages.config b/HJGL_DS/SgManager.AI/packages.config
index 7f83af3..466ab76 100644
--- a/HJGL_DS/SgManager.AI/packages.config
+++ b/HJGL_DS/SgManager.AI/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj b/HJGL_DS/WebAPI/WebAPI.csproj
index aa50f8f..fd79a37 100644
--- a/HJGL_DS/WebAPI/WebAPI.csproj
+++ b/HJGL_DS/WebAPI/WebAPI.csproj
@@ -46,6 +46,9 @@
+
+ ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
+
@@ -66,9 +69,6 @@
True
..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
-
- ..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll
-
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index 28be9c4..ef14066 100644
--- a/HJGL_DS/WebAPI/WebAPI.csproj.user
+++ b/HJGL_DS/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
-
+
- Release|Any CPU
+ Debug|Any CPU
FolderProfile
true
diff --git a/HJGL_DS/WebAPI/packages.config b/HJGL_DS/WebAPI/packages.config
index ca1fba8..0e5648f 100644
--- a/HJGL_DS/WebAPI/packages.config
+++ b/HJGL_DS/WebAPI/packages.config
@@ -22,6 +22,6 @@
-
+
\ No newline at end of file