From c2c74bf320d8599522972911410c9edec4c51c70 Mon Sep 17 00:00:00 2001 From: divenswu Date: Fri, 25 Nov 2022 10:51:38 +0800 Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E6=B3=A8=E5=85=A5=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/bootstrap/conf/ModelConfig.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/face-search-server/src/main/java/com/visual/face/search/server/bootstrap/conf/ModelConfig.java b/face-search-server/src/main/java/com/visual/face/search/server/bootstrap/conf/ModelConfig.java index 7c35811..71e0a73 100755 --- a/face-search-server/src/main/java/com/visual/face/search/server/bootstrap/conf/ModelConfig.java +++ b/face-search-server/src/main/java/com/visual/face/search/server/bootstrap/conf/ModelConfig.java @@ -55,8 +55,6 @@ public class ModelConfig { private Integer faceAttributeDetectionNameThread; - - /** * 获取人脸识别模型 * @return @@ -78,14 +76,12 @@ public class ModelConfig { */ @Bean(name = "visualBackupFaceDetection") public FaceDetection getBackupFaceDetection(){ - if(faceDetectionName.equalsIgnoreCase(backupFaceDetectionName)){ - return null; - }else if(backupFaceDetectionName.equalsIgnoreCase("PcnNetworkFaceDetection")){ + if(backupFaceDetectionName.equalsIgnoreCase("PcnNetworkFaceDetection")){ return new PcnNetworkFaceDetection(getModelPath(backupFaceDetectionName, backupFaceDetectionModel), backupFaceDetectionThread); }else if(backupFaceDetectionName.equalsIgnoreCase("InsightScrfdFaceDetection")){ return new InsightScrfdFaceDetection(getModelPath(backupFaceDetectionName, backupFaceDetectionModel)[0], backupFaceDetectionThread); }else{ - return new PcnNetworkFaceDetection(backupFaceDetectionModel, backupFaceDetectionThread); + return this.getFaceDetection(); } } @@ -158,11 +154,18 @@ public class ModelConfig { @Qualifier("visualFaceAlignment")FaceAlignment faceAlignment, @Qualifier("visualFaceRecognition")FaceRecognition faceRecognition, @Qualifier("visualAttributeDetection") FaceAttribute faceAttribute - ){ - return new FaceFeatureExtractorImpl( - faceDetection, backupFaceDetection, faceKeyPoint, - faceAlignment, faceRecognition, faceAttribute - ); + ){ + if(faceDetectionName.equalsIgnoreCase(backupFaceDetectionName)){ + return new FaceFeatureExtractorImpl( + faceDetection, null, faceKeyPoint, + faceAlignment, faceRecognition, faceAttribute + ); + }else{ + return new FaceFeatureExtractorImpl( + faceDetection, backupFaceDetection, faceKeyPoint, + faceAlignment, faceRecognition, faceAttribute + ); + } } /**