gitee/face-search
1
0
Fork 0
mirror of https://gitee.com/open-visual/face-search.git synced 2025-06-10 19:19:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

!15 fix

Browse Source 
Merge pull request !15 from divenswu/v2.1.0
This commit is contained in:
divenswu 2023-07-18 06:29:16 +00:00 committed by Gitee
commit 20e1e8cb62
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
face-search-server/src/main/java/com/visual/face/search/server/bootstrap/conf/ModelConfig.java
View File

@ -179,7 +179,10 @@ public class ModelConfig {
private String[] getModelPath(String modelName, String modelPath[]){ private String[] getModelPath(String modelName, String modelPath[]){
String basePath = "face-search-core/src/main/resources/"; String basePath = "face-search-core/src/main/resources/";
if(StringUtils.isNotEmpty(this.baseModelPath)){ if(StringUtils.isNotEmpty(this.baseModelPath)){
basePath = this.baseModelPath.endsWith("/") ? this.baseModelPath : this.baseModelPath +"/"; basePath = this.baseModelPath;
basePath = basePath.replaceAll("^\'|\'$", "");
basePath = basePath.replaceAll("^\"|\"$", "");
basePath = basePath.endsWith("/") ? basePath : basePath +"/";
} }
if((null == modelPath || modelPath.length != 3) && "PcnNetworkFaceDetection".equalsIgnoreCase(modelName)){ if((null == modelPath || modelPath.length != 3) && "PcnNetworkFaceDetection".equalsIgnoreCase(modelName)){

2
face-search-server/src/main/resources/application-docker.yml
View File

@ -22,7 +22,7 @@ logging:
# 模型配置 # 模型配置
visual: visual:
model: model:
baseModelPath: ${VISUAL_MODEL_BASE_MODEL_PATH:'/app/face-search/'} baseModelPath: ${VISUAL_MODEL_BASE_MODEL_PATH:/app/face-search/}
faceDetection: faceDetection:
name: ${VISUAL_MODEL_FACEDETECTION_NAME:InsightScrfdFaceDetection} name: ${VISUAL_MODEL_FACEDETECTION_NAME:InsightScrfdFaceDetection}
modelPath: ${VISUAL_MODEL_FACEDETECTION_PATH:} modelPath: ${VISUAL_MODEL_FACEDETECTION_PATH:}