彻底铲除OSSUtil，抽象、修改

src/main/java/com/ycwl/basic/controller/FileController.java

@@ -3,7 +3,7 @@ package com.ycwl.basic.controller;
 
 import com.ycwl.basic.annotation.IgnoreToken;
 import com.ycwl.basic.enums.BizCodeEnum;
-import com.ycwl.basic.service.FileService;
+import com.ycwl.basic.storage.StorageFactory;
 import com.ycwl.basic.utils.ApiResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.UUID;
 
 /**
  * @Author: songmingsong
@@ -29,14 +30,13 @@ import java.io.IOException;
 @Api(tags = "文件接口")
 public class FileController {
 
-    @Autowired
-    private FileService fileService;
-
     @ApiOperation(value = "上传文件")
     @PostMapping("/upload")
     @IgnoreToken
     public ApiResponse<?> upload(@RequestParam(value = "file") MultipartFile file) throws IOException {
-        String url = fileService.uploadFile(file);
+        String[] split = file.getOriginalFilename().split("\\.");
+        String ext = split[split.length - 1];
+        String url = StorageFactory.use("assets").uploadFile(file, "web", UUID.randomUUID()+"."+ext);
         return ApiResponse.success(url);
     }
 
@@ -44,7 +44,7 @@ public class FileController {
     @PostMapping("/delete")
     @IgnoreToken
     public ApiResponse<?> delete(@RequestParam(value = "fileName") String fileName) throws IOException {
-        Boolean flag = fileService.delete(fileName);
+        boolean flag = StorageFactory.use("assets").deleteFile("web", fileName);
         return flag ? ApiResponse.success(BizCodeEnum.REQUEST_OK) : ApiResponse.fail(BizCodeEnum.FAIL.getMessage());
     }
 }

src/main/java/com/ycwl/basic/controller/pc/FaceDetectLogController.java

@@ -0,0 +1,30 @@
+package com.ycwl.basic.controller.pc;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ycwl.basic.model.common.BaseQueryParameterReq;
+import com.ycwl.basic.model.pc.faceDetectLog.entity.FaceDetectLog;
+import com.ycwl.basic.service.pc.FaceDetectLogService;
+import com.ycwl.basic.utils.ApiResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/face/detect_log/v1")
+public class FaceDetectLogController {
+    @Autowired
+    private FaceDetectLogService service;
+
+    @PostMapping("/page")
+    public ApiResponse<PageInfo<FaceDetectLog>> pageQuery(@RequestBody BaseQueryParameterReq req) {
+        PageHelper.startPage(req.getPageNum(), req.getPageSize());
+        List<FaceDetectLog> list = service.listByTimeDesc();
+        PageInfo<FaceDetectLog> pageInfo = new PageInfo<>(list);
+        return ApiResponse.success(pageInfo);
+    }
+}

src/main/java/com/ycwl/basic/controller/viid/ViidController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.ycwl.basic.annotation.IgnoreToken;
+import com.ycwl.basic.config.FaceDetectConfig;
 import com.ycwl.basic.mapper.DeviceMapper;
 import com.ycwl.basic.mapper.FaceSampleMapper;
 import com.ycwl.basic.mapper.SourceMapper;
@@ -25,10 +26,11 @@ import com.ycwl.basic.model.viid.req.UnRegisterReq;
 import com.ycwl.basic.model.viid.resp.SystemTimeResp;
 import com.ycwl.basic.model.viid.resp.VIIDBaseResp;
 import com.ycwl.basic.service.task.TaskFaceService;
-import com.ycwl.basic.utils.AliFaceUtil;
+import com.ycwl.basic.storage.StorageFactory;
+import com.ycwl.basic.storage.adapters.IStorageAdapter;
+import com.ycwl.basic.storage.enums.StorageType;
 import com.ycwl.basic.utils.ImageUtils;
 import com.ycwl.basic.utils.IpUtils;
-import com.ycwl.basic.utils.OssUtil;
 import com.ycwl.basic.utils.SnowFlakeUtil;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
@@ -179,8 +181,6 @@ public class ViidController {
 
     @Autowired
     private TaskFaceService taskFaceService;
-    @Autowired
-    private OssUtil ossUtil;
 
 
     /**
@@ -223,6 +223,7 @@ public class ViidController {
                     if (ext.equalsIgnoreCase("jpeg")) {
                         ext = "jpg";
                     }
+                    IStorageAdapter adapter = StorageFactory.use("faces");
                     // Type=11 人脸
                     if (subImage.getType().equals("11")) {
                         // 上传oss
@@ -232,13 +233,7 @@ public class ViidController {
                         faceSample.setDeviceId(device.getId());
                         faceSample.setStatus(0);
                         faceSample.setCreateAt(new Date());
-                        String url;
-                        try {
-                            url = ossUtil.uploadFile(file.getInputStream(), UUID.randomUUID().toString() + "." + ext);
-                        } catch (IOException e) {
-                            log.error("文件上传失败！", e);
-                            continue;
-                        }
+                        String url = adapter.uploadFile(file, "user-face", UUID.randomUUID() + "." + ext);
                         faceSample.setFaceUrl(url);
                         faceSampleMapper.add(faceSample);
                         log.info("人脸信息入库成功！");
@@ -255,13 +250,7 @@ public class ViidController {
                         source.setFaceSampleId(newFaceSampleId);
                         source.setType(2);
                         // 上传oss
-                        String url;
-                        try {
-                            url = ossUtil.uploadFile(file.getInputStream(), "user-photo/", newFaceSampleId + "." + ext);
-                        } catch (IOException e) {
-                            log.error("文件上传失败！", e);
-                            continue;
-                        }
+                        String url = adapter.uploadFile(file, "user-photo", UUID.randomUUID() + "." + ext);
                         source.setUrl(url);
                         source.setPosJson(JSON.toJSONString(facePosition));
                         sourceMapper.add(source);