From 1dcc7b63a20daad7c7060f18878d8e8dbaad02de Mon Sep 17 00:00:00 2001
From: qiuyao <qiuyao@hnkhzn.com>
Date: 星期一, 28 四月 2025 16:41:31 +0800
Subject: [PATCH] 解决冲突
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/BaiDuFaceHelper.cs | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/BaiDuFaceHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/BaiDuFaceHelper.cs"
index 5f19dce..067fd8d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/BaiDuFaceHelper.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/BaiDuFaceHelper.cs"
@@ -6,11 +6,13 @@
using System.Net;
using System.Text;
using System.Threading.Tasks;
+using FaceAI;
namespace WIDESEAWCS_Common
{
public class BaiDuFaceHelper
{
+ #region 浜鸿劯璇嗗埆API
/// <summary>
/// 鑾峰彇AccessToken
/// </summary>
@@ -62,7 +64,7 @@
catch { return ""; }
}
-
+
/// <summary>
/// 浜鸿劯妫�娴嬩笌灞炴�у垎鏋�
/// </summary>
@@ -76,7 +78,7 @@
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(host);
request.Method = "POST";
request.KeepAlive = true;
- String str = "{\"image\":\""+ imgbase64 + "\",\"image_type\":\"BASE64\"}";
+ String str = "{\"image\":\"" + imgbase64 + "\",\"image_type\":\"BASE64\"}";
byte[] buffer = encoding.GetBytes(str);
request.ContentLength = buffer.Length;
request.GetRequestStream().Write(buffer, 0, buffer.Length);
@@ -101,7 +103,7 @@
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(host);
request.Method = "post";
request.KeepAlive = true;
- String str = "{\"group_id\":\""+ group + "\"}";
+ String str = "{\"group_id\":\"" + group + "\"}";
byte[] buffer = encoding.GetBytes(str);
request.ContentLength = buffer.Length;
request.GetRequestStream().Write(buffer, 0, buffer.Length);
@@ -172,7 +174,7 @@
string result = reader.ReadToEnd();
NLog.LogManager.GetCurrentClassLogger().Trace("浜鸿劯娉ㄥ唽锛�" + result);
- CreateUserResult res= JsonConvert.DeserializeObject<CreateUserResult>(result);//闇�瑕佸皢log_id鍜宖ace_token淇濆瓨鍒扮敤鎴疯〃涓紝鍦ㄤ汉鑴稿垹闄や腑闇�瑕佺敤鍒�
+ CreateUserResult res = JsonConvert.DeserializeObject<CreateUserResult>(result);//闇�瑕佸皢log_id鍜宖ace_token淇濆瓨鍒扮敤鎴疯〃涓紝鍦ㄤ汉鑴稿垹闄や腑闇�瑕佺敤鍒�
return res;
}
@@ -229,7 +231,7 @@
/// 浜鸿劯鎼滅储
/// </summary>
/// <returns></returns>
- public static SearchResult FaceSearch(string path,string group_id_list)
+ public static SearchResult FaceSearch(string path, string group_id_list)
{
string token = GetAccessToken();
var imgbase64 = GetFileContentAsBase64(path);
@@ -239,7 +241,7 @@
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(host);
request.Method = "POST";
request.KeepAlive = true;
- String str = "{\"image\":\"" + imgbase64 + "\",\"image_type\":\"BASE64\",\"group_id_list\":\""+ group_id_list + "\",\"quality_control\":\"LOW\",\"liveness_control\":\"NORMAL\"}";
+ String str = "{\"image\":\"" + imgbase64 + "\",\"image_type\":\"BASE64\",\"group_id_list\":\"" + group_id_list + "\",\"quality_control\":\"LOW\",\"liveness_control\":\"NORMAL\"}";
byte[] buffer = encoding.GetBytes(str);
request.ContentLength = buffer.Length;
request.GetRequestStream().Write(buffer, 0, buffer.Length);
@@ -252,6 +254,7 @@
return searchResult;
}
+ #endregion
}
@@ -351,7 +354,7 @@
/// <summary>
/// 璇锋眰鏍囪瘑鐮侊紝闅忔満鏁帮紝鍞竴
/// </summary>
- public int log_id { get; set;}
+ public string log_id { get; set;}
/// <summary>
/// 鐢ㄦ埛id锛堢敱鏁板瓧銆佸瓧姣嶃�佷笅鍒掔嚎缁勬垚锛夛紝闀垮害闄愬埗48B
/// </summary>
--
Gitblit v1.9.3