Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/dto/UnifiedFaceRegisterParamDTO.java

@@ -1,5 +1,6 @@
 package com.bonus.canteen.core.customer.dto;
 
+import com.bonus.canteen.core.common.utils.SysUtil;
 import io.swagger.annotations.ApiModelProperty;
 
 public class UnifiedFaceRegisterParamDTO {
@@ -34,7 +35,7 @@ public class UnifiedFaceRegisterParamDTO {
    }
 
    public String getMinioPicPath() {
-      return this.minioPicPath;
+      return SysUtil.getCutPath(this.minioPicPath);
    }
 
    public void setImageBase64(final String imageBase64) {
@@ -50,7 +51,7 @@ public class UnifiedFaceRegisterParamDTO {
    }
 
    public void setMinioPicPath(final String minioPicPath) {
-      this.minioPicPath = minioPicPath;
+      this.minioPicPath = SysUtil.getCutPath(this.minioPicPath);
    }
 
 

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/impl/FaceRegisterServiceImpl.java

@@ -235,10 +235,7 @@ public class FaceRegisterServiceImpl implements FaceRegisterService {
          if ("1".equals(faceMetadataModel.getIfRainbowSoftFaceUrl())){
             System.out.println("开始采集虹软人脸");
             ArcFaceHelper arcFaceHelper = new ArcFaceHelper();
-            System.out.println("开始采集" + registerParamDTO.getMinioPicPath());
-            String finalUrl = String.format("%s%s", "http://192.168.0.14:9090", registerParamDTO.getMinioPicPath().trim());
-            System.out.println("finalUrl:" + finalUrl);
-            FaceResult faceResult = arcFaceHelper.getFaceFeatures(finalUrl);
+            FaceResult faceResult = arcFaceHelper.getFaceFeatures(registerParamDTO.getMinioPicPath());
             System.err.println("采集结束");
             if (faceResult != null){
                MultiModelFaceVO faceVO = new MultiModelFaceVO();

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/utils/ArcFaceHelper.java

@@ -6,6 +6,7 @@ import com.arcsoft.face.enums.DetectOrient;
 import com.arcsoft.face.enums.ErrorInfo;
 import com.arcsoft.face.enums.ImageFormat;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
 import javax.imageio.ImageIO;
@@ -25,17 +26,22 @@ import java.util.List;
 @Configuration
 public class ArcFaceHelper {
 
-    private static final String APP_ID = "52XE2dQBtdmMsfDMvyKmPCD8wfSfJyBsQBsVa2HXS6pg";
+    @Value("${face.arc-face.app-id}")
+    private static String APP_ID;
+
+    /**
+     * linux_64
+     */
+    @Value("${face.arc-face.linux64-sdk-key}")
+    private static String LINUX64_SDK_KEY;
 
     /**
      * x64
      */
     private static final String WIN64_SDK_KEY = "3TMzo8nmWDka6NJDrbX7e2y1ew4QgSia4iGBniyWU4qq";
 
-    /**
-     * linux_64
-     */
-    private static final String LINUX64_SDK_KEY = "3TMzo8nmWDka6NJDrbX7e2y1WpVESExKSnShHKmNAiML";
+    @Value("${face.arc-face.face-engine-path}")
+    private static String faceEnginePath;
 	
 	private static FaceEngine faceEngine = null;
 	
@@ -50,7 +56,7 @@ public class ArcFaceHelper {
                 //激活引擎
                 faceEngine.activeOnline(APP_ID, WIN64_SDK_KEY);
             } else {
-                faceEngine = new FaceEngine("/data/arcsoft_lib_64");
+                faceEngine = new FaceEngine(faceEnginePath);
                 //激活引擎
                 errorCode = faceEngine.activeOnline(APP_ID, LINUX64_SDK_KEY);
             }
@@ -94,7 +100,7 @@ public class ArcFaceHelper {
                 //激活引擎
                 faceEngine.activeOnline(APP_ID, WIN64_SDK_KEY);
             } else {
-                faceEngine = new FaceEngine("/data/lzhdata/arcsoft_lib_64");
+                faceEngine = new FaceEngine(faceEnginePath);
                 //激活引擎
                 errorCode = faceEngine.activeOnline(APP_ID, LINUX64_SDK_KEY);
             }

bonus-modules/bonus-smart-canteen/src/main/resources/bootstrap.yml

@@ -23,6 +23,12 @@ spring:
       "[device-buffet-alarm-report-v4/#]": device-mqtt #设备计量主机异常上报入参
       "[device-log-info-update-v4/#]": device-mqtt #设备日志上传消息
 
+face:
+  arc-face:
+    app-id: 52XE2dQBtdmMsfDMvyKmPCD8wfSfJyBsQBsVa2HXS6pg
+    linux64-sdk-key: 3TMzo8nmWDka6NJDrbX7e2y1WpVESExKSnShHKmNAiML
+    face-engine-path: /data/arcsoft_lib_64
+
 system:
   mqtt-tcp-address: ${MQTT_TCP_ADDRESS:${RABBITMQ_CLIENT_ADDRESS:192.168.0.244:1883}}
   mqtt-websocket-address: ${MQTT_WEBSOCKET_ADDRESS:${RABBITMQ_WEB_CLIENT_ADDRESS:}}