From 78ae92c90b6cd27efe5ac846d85da9a91ddc6bee Mon Sep 17 00:00:00 2001 From: divenswu Date: Thu, 13 Jul 2023 15:16:23 +0800 Subject: [PATCH] update: version set 2.1.0 --- README.md | 40 ++++++++++++++++----------- face-search-client/pom.xml | 2 +- pom.xml | 6 ++-- scripts/docker-compose-opensearch.yml | 6 ++-- scripts/docker_build.sh | 2 +- 5 files changed, 32 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 33d899f..d745a6c 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,14 @@     2、[PCN](https://github.com/Rock-100/FaceKit/tree/master/PCN) +### 版本2.1.0更新 + +* 1、InsightScrfdFaceDetection升级模型，使检测更加稳定，同时添加了人脸角度检测。 +* 2、InsightScrfdFaceDetection正对不能正常检出人脸的图片增加了补边操作，防止因为人脸过大导致不能检测到人脸。 +* 3、添加SeetaFaceOpenRecognition的人脸特征提取器，目前人脸特征提取器支持InsightArcFaceRecognition与SeetaFaceOpenRecognition。 +* 4、修复由于人脸过小，导致对齐异常的BUG。 +* 5、程序添加了SeetaFace6的人脸关键点遮挡模型。 + ### 版本2.0.1更新 * 1、修复PCN模型存在的潜在内存泄露问题 @@ -89,22 +97,22 @@ * 部署参数 -| 参数 | 描述 | 默认值 | 可选值| -| -------- | -----: | :----: |--------| -| VISUAL_SWAGGER_ENABLE | 是否开启swagger | true | | -| SPRING_DATASOURCE_URL | 数据库地址 | | | -| SPRING_DATASOURCE_USERNAME | 数据库用户名 | root | | -| SPRING_DATASOURCE_PASSWORD | 数据库密码 | root | | -| VISUAL_ENGINE_OPENSEARCH_HOST | OPENSEARCH地址 | | | -| VISUAL_ENGINE_OPENSEARCH_PORT | OPENSEARCH端口 | 9200 | | -| VISUAL_ENGINE_OPENSEARCH_SCHEME | OPENSEARCH协议 | https | | -| VISUAL_ENGINE_OPENSEARCH_USERNAME | OPENSEARCH用户名 | admin | | -| VISUAL_ENGINE_OPENSEARCH_PASSWORD | OPENSEARCH密码 | admin | | -| VISUAL_MODEL_FACEDETECTION_NAME | 人脸检测模型名称 | PcnNetworkFaceDetection |PcnNetworkFaceDetection，InsightScrfdFaceDetection| -| VISUAL_MODEL_FACEDETECTION_BACKUP_NAME | 备用人脸检测模型名称 | InsightScrfdFaceDetection |PcnNetworkFaceDetection，InsightScrfdFaceDetection| -| VISUAL_MODEL_FACEKEYPOINT_NAME | 人脸关键点模型名称 | InsightCoordFaceKeyPoint |InsightCoordFaceKeyPoint| -| VISUAL_MODEL_FACEALIGNMENT_NAME | 人脸对齐模型名称 | Simple106pFaceAlignment |Simple106pFaceAlignment，Simple005pFaceAlignment| -| VISUAL_MODEL_FACERECOGNITION_NAME | 人脸特征提取模型名称 | InsightArcFaceRecognition |InsightArcFaceRecognition| +| 参数 | 描述 | 默认值 | 可选值 | +| -------- | -----: | :----: |---------------------------------------------------| +| VISUAL_SWAGGER_ENABLE | 是否开启swagger | true | | +| SPRING_DATASOURCE_URL | 数据库地址 | | | +| SPRING_DATASOURCE_USERNAME | 数据库用户名 | root | | +| SPRING_DATASOURCE_PASSWORD | 数据库密码 | root | | +| VISUAL_ENGINE_OPENSEARCH_HOST | OPENSEARCH地址 | | | +| VISUAL_ENGINE_OPENSEARCH_PORT | OPENSEARCH端口 | 9200 | | +| VISUAL_ENGINE_OPENSEARCH_SCHEME | OPENSEARCH协议 | https | | +| VISUAL_ENGINE_OPENSEARCH_USERNAME | OPENSEARCH用户名 | admin | | +| VISUAL_ENGINE_OPENSEARCH_PASSWORD | OPENSEARCH密码 | admin | | +| VISUAL_MODEL_FACEDETECTION_NAME | 人脸检测模型名称 | InsightScrfdFaceDetection | PcnNetworkFaceDetection，InsightScrfdFaceDetection | +| VISUAL_MODEL_FACEDETECTION_BACKUP_NAME | 备用人脸检测模型名称 | PcnNetworkFaceDetection | PcnNetworkFaceDetection，InsightScrfdFaceDetection | +| VISUAL_MODEL_FACEKEYPOINT_NAME | 人脸关键点模型名称 | InsightCoordFaceKeyPoint | InsightCoordFaceKeyPoint | +| VISUAL_MODEL_FACEALIGNMENT_NAME | 人脸对齐模型名称 | Simple106pFaceAlignment | Simple106pFaceAlignment，Simple005pFaceAlignment | +| VISUAL_MODEL_FACERECOGNITION_NAME | 人脸特征提取模型名称 | InsightArcFaceRecognition | InsightArcFaceRecognition，SeetaFaceOpenRecognition | ### 性能优化 diff --git a/face-search-client/pom.xml b/face-search-client/pom.xml index f45e517..6e00b59 100644 --- a/face-search-client/pom.xml +++ b/face-search-client/pom.xml @@ -18,7 +18,7 @@ com.alibaba fastjson - 1.2.58 + 1.2.83 org.apache.httpcomponents diff --git a/pom.xml b/pom.xml index 7594504..4fb1caf 100644 --- a/pom.xml +++ b/pom.xml @@ -27,9 +27,9 @@ 1.1.22 - 4.6.0-0 - 2.4.0 - 1.13.1 + 4.7.0-0 + 2.8.0 + 1.15.1 1.2.83 6.0.13.Final 3.6.1 diff --git a/scripts/docker-compose-opensearch.yml b/scripts/docker-compose-opensearch.yml index 88b5209..9606280 100644 --- a/scripts/docker-compose-opensearch.yml +++ b/scripts/docker-compose-opensearch.yml @@ -21,7 +21,7 @@ services: visual-opensearch: container_name: face-search-opensearch-standalone - image: opensearchproject/opensearch:2.4.0 + image: opensearchproject/opensearch:2.8.0 environment: discovery.type: single-node expose: @@ -37,7 +37,7 @@ services: visual-opensearch-dashboards: container_name: face-search-opensearch-dashboards - image: opensearchproject/opensearch-dashboards:2.4.0 + image: opensearchproject/opensearch-dashboards:2.8.0 environment: OPENSEARCH_HOSTS: '["https://visual-opensearch:9200"]' ports: @@ -48,7 +48,7 @@ services: visual-facesearch: container_name: face-search-server-standalone - image: divenswu/face-search:2.0.1 + image: divenswu/face-search:2.1.0 environment: SPRING_DATASOURCE_URL: 'jdbc:mysql://visual-mysql:3306/visual_face_search?useUnicode=true&characterEncoding=utf8' SPRING_DATASOURCE_USERNAME: root diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh index 068b12d..a67fab0 100644 --- a/scripts/docker_build.sh +++ b/scripts/docker_build.sh @@ -1,4 +1,4 @@ -version='2.0.1' +version='2.1.0' SHELL_FOLDER=$(cd "$(dirname "$0")";pwd) cd ${SHELL_FOLDER}