Merge remote-tracking branch 'origin/dev' into dev

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/face/feign/RemoteFaceService.java

@@ -43,12 +43,4 @@ public interface RemoteFaceService {
      */
     @PostMapping("/faceApi/multiCompare")
     public ResultData multiFaceDetection(@RequestBody FaceCompare faceCompare);
-
-    /**
-     * 根据人脸图片获取特征值
-     * @param file
-     * @return
-     */
-    @PostMapping("/faceApi/faceFeature")
-    public ResultData faceFeature(@RequestParam("file") MultipartFile file);
 }

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/face/feign/fallback/RemoteFaceFallbackFactory.java

@@ -44,11 +44,6 @@ public class RemoteFaceFallbackFactory implements FallbackFactory<RemoteFaceServ
             public ResultData multiFaceDetection(FaceCompare faceCompare) {
                 return ResultData.fail("多人脸对比服务调用失败:" + throwable.getMessage());
             }
-
-            @Override
-            public ResultData faceFeature(MultipartFile file) {
-                return ResultData.fail("人脸获取特征值失败:" + throwable.getMessage());
-            }
         };
     }
 }

zd-modules/zd-base/src/main/java/com/zd/base/app/controller/LabBoardApi.java

@@ -503,7 +503,7 @@ public class LabBoardApi {
      */
     @ApiOperation(value = "人脸识别获取特征值")
     @GetMapping(value = "/faceFeature")
-    public ResultData faceFeature(@RequestParam("file") MultipartFile file){
-        return remoteFaceService.faceFeature(file);
+    public R<byte[]> faceFeature(@RequestParam("file") MultipartFile file){
+        return remoteFaceService.upload(file);
     }
 }