From e06c7c8be0bd83da98b095a618ff099d0e4fddb8 Mon Sep 17 00:00:00 2001
From: coco1986509808 <1986509808@qq.com>
Date: Wed, 29 Mar 2023 20:41:53 +0800
Subject: [PATCH] =?UTF-8?q?3.29=E4=BA=BA=E8=84=B8=E6=AF=94=E5=AF=B9?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/vo/search/FaceCompareVO.java      |  4 ++--
 .../services/impl/CompareServiceImpl.java     |  2 +-
 .../src/main/resources/application-dev.yml    | 21 ++++++++++++-------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/face-common/src/main/java/com/dkha/common/modules/vo/search/FaceCompareVO.java b/face-common/src/main/java/com/dkha/common/modules/vo/search/FaceCompareVO.java
index eb62468..753b36c 100644
--- a/face-common/src/main/java/com/dkha/common/modules/vo/search/FaceCompareVO.java
+++ b/face-common/src/main/java/com/dkha/common/modules/vo/search/FaceCompareVO.java
@@ -27,7 +27,7 @@ public class FaceCompareVO {
     private String image1;
     @ApiModelProperty(value = "人脸图片2")
     private String image2;
-    @ApiModelProperty(value = "拓展字段")
-    private String extraMeta;
+//    @ApiModelProperty(value = "拓展字段")
+//    private String extraMeta;
 
 }
\ No newline at end of file
diff --git a/face-server/src/main/java/com/dkha/server/services/impl/CompareServiceImpl.java b/face-server/src/main/java/com/dkha/server/services/impl/CompareServiceImpl.java
index a196db0..bc64283 100644
--- a/face-server/src/main/java/com/dkha/server/services/impl/CompareServiceImpl.java
+++ b/face-server/src/main/java/com/dkha/server/services/impl/CompareServiceImpl.java
@@ -169,7 +169,7 @@ public class CompareServiceImpl implements ICompareService {
     private void validateSingleFaceImage(String image) {
         //人脸检测url
         //String faceSearchUrl = apiRequestPrefix + ApiUrlEnum.FACE_SEARCH.getUrl();
-        String faceSearchUrltest ="http://192.168.3.134:5000/message/mask";
+        String faceSearchUrltest ="http://192.168.3.135:5000/message/mask";
         //组装api请求数据
         ReturnVO returnVO = (ReturnVO) httpUtil.post(faceSearchUrltest + "?url=" + image, null, ReturnVO.class);
         System.out.println(returnVO.getCode()+returnVO.getMessage());
diff --git a/face-task/src/main/resources/application-dev.yml b/face-task/src/main/resources/application-dev.yml
index 37b665e..a79d2c8 100644
--- a/face-task/src/main/resources/application-dev.yml
+++ b/face-task/src/main/resources/application-dev.yml
@@ -7,7 +7,7 @@ spring:
     druid:
       #MySQL
       driver-class-name: com.mysql.jdbc.Driver
-      url: jdbc:mysql://192.168.1.127:3306/face_application?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://192.168.1.127:3306/face_application_23_3?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
       username: root
       password: Dkha123
       initial-size: 10
@@ -77,8 +77,10 @@ mybatis-plus:
 swagger:
   show: true
 face:
-  warning-url: http://192.168.1.127:8889/face/warning/alarm
-  bayonet-url: http://192.168.1.127:8889/face/warning/todayBayonetBySize
+  warning-url: http://127.0.0.1:8889/face/warning/alarm
+  bayonet-url: http://127.0.0.1:8889/face/warning/todayBayonetBySize
+#  warning-url: http://192.168.1.127:8889/face/warning/alarm
+#  bayonet-url: http://192.168.1.127:8889/face/warning/todayBayonetBySize
   #用于轨迹中比对最小比中分值
   minScore: 0.8
   #返回一条比中数据即可
@@ -87,7 +89,8 @@ face:
 #人脸API统一请求地址定义
 api:
   server:
-    prefix: http://192.168.1.127:8013/dkha/
+    prefix: http://192.168.1.196:5001/
+#    prefix: http://192.168.1.127:8013/dkha/
   #人脸检索最大返回值
   max:
     result: 100
@@ -102,7 +105,11 @@ api:
 
 #minio 配置
 minio:
-  url: http://192.168.1.127:9000
-  accessKey: admin
-  secretKey: Dkha123.
+  url: http://192.168.1.133:9000
+  accessKey: minioadmin
+  secretKey: minioadmin
   bucketName: middleware
+#  url: http://192.168.1.127:9000
+#  accessKey: admin
+#  secretKey: Dkha123.
+#  bucketName: middleware