From 6195df0694b982a4878714f08871d86e23e2316f Mon Sep 17 00:00:00 2001 From: qyhdd Date: Wed, 6 Jul 2022 21:22:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/controller/SysFileController.java | 6 ++-- .../com/bnyer/file/service/IFileService.java | 3 +- .../file/service/impl/FileServiceImpl.java | 28 +++++++++---------- .../file/service/impl/QiniuServiceImpl.java | 22 +-------------- .../java/com/bnyer/file/vo/ChekFileVo.java | 21 ++++++++++++++ 5 files changed, 41 insertions(+), 39 deletions(-) create mode 100644 bnyer-services/bnyer-file/src/main/java/com/bnyer/file/vo/ChekFileVo.java diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java index 3b5ad23..1fdfc41 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java @@ -6,6 +6,7 @@ import com.bnyer.file.service.IFileService; import com.bnyer.file.service.IQiniuService; import com.bnyer.file.service.MinioService; import com.bnyer.file.utils.ImgUtil; +import com.bnyer.file.vo.ChekFileVo; import com.bnyer.file.vo.TiktokImgVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -71,7 +72,6 @@ public class SysFileController { List list = new ArrayList<>(); for (MultipartFile file : files) { MultipartFile file1 = ImgUtil.commpressPicCycle(Long.parseLong(imgConfig.getFileSize()), Double.parseDouble(imgConfig.getAccuracy()), file); - System.out.println("sssss"); String url = qiniuService.userUpload(file1); list.add(url); } @@ -85,9 +85,9 @@ public class SysFileController { */ @ApiOperation(value="批量图片审核") @PostMapping("/checkBatch") - public R> checkBatch(ArrayList files) { + public R> checkBatch(ArrayList files) { try { - ArrayList list = fileService.checkImg(files); + ArrayList list = fileService.checkImg(files); // 上传并返回访问地址 return R.ok(list); } catch (Exception e) { diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/IFileService.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/IFileService.java index 910d45e..b2112ae 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/IFileService.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/IFileService.java @@ -1,5 +1,6 @@ package com.bnyer.file.service; +import com.bnyer.file.vo.ChekFileVo; import com.bnyer.file.vo.TiktokImgVo; import org.springframework.web.multipart.MultipartFile; @@ -11,5 +12,5 @@ import java.util.ArrayList; * @Description: */ public interface IFileService { - ArrayList checkImg(ArrayList multipartFiles); + ArrayList checkImg(ArrayList multipartFiles); } diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/FileServiceImpl.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/FileServiceImpl.java index 8c06a31..8467d84 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/FileServiceImpl.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/FileServiceImpl.java @@ -10,6 +10,7 @@ import com.bnyer.file.service.IQiniuService; import com.bnyer.file.service.ITikTokImage; import com.bnyer.file.utils.HttpUtils; import com.bnyer.file.utils.ImgUtil; +import com.bnyer.file.vo.ChekFileVo; import com.bnyer.file.vo.TiktokImgVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,42 +31,41 @@ public class FileServiceImpl implements IFileService { @Autowired private ITikTokImage tikTokImage; @Override - public ArrayList checkImg(ArrayList multipartFiles) { - ArrayList tiktokImgVos = new ArrayList<>(); + public ArrayList checkImg(ArrayList multipartFiles) { + ArrayList chekFileVos = new ArrayList<>(); //返回通过校验的数组 ArrayList multipartFileList = qiniuService.checkImageFormat(multipartFiles); for (MultipartFile multipartFile : multipartFileList) { - TiktokImgVo tiktokImgVo = new TiktokImgVo(); + ChekFileVo chekFileVo = new ChekFileVo(); String filename = multipartFile.getResource().getFilename(); - tiktokImgVo.setFileName(filename); + chekFileVo.setFileName(filename); String imageString = ImgUtil.getImageString(multipartFile); String checkMsg = qiniuService.checkImageContent("data:application/octet-stream;base64," +imageString); if (checkMsg.equals("pass")){ //抖音图片检测二次检测 if (tikTokImage.checkImageContent(multipartFile)) { //可以通过 - tiktokImgVo.setStatus("1"); - tiktokImgVos.add(tiktokImgVo); + chekFileVo.setStatus("1"); + chekFileVos.add(chekFileVo); }else { //不可以通过 - tiktokImgVo.setStatus("2"); - tiktokImgVos.add(tiktokImgVo); + chekFileVo.setStatus("2"); + chekFileVos.add(chekFileVo); } continue; } if (checkMsg.equals("review")){ //人工审核 - tiktokImgVo.setStatus("0"); - tiktokImgVos.add(tiktokImgVo); + chekFileVo.setStatus("0"); + chekFileVos.add(chekFileVo); continue; } if (checkMsg.equals("block")){ //不可通过 - tiktokImgVo.setStatus("2"); - tiktokImgVos.add(tiktokImgVo); - continue; + chekFileVo.setStatus("2"); + chekFileVos.add(chekFileVo); } } - return tiktokImgVos; + return chekFileVos; } } diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/QiniuServiceImpl.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/QiniuServiceImpl.java index d55751e..9425da0 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/QiniuServiceImpl.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/QiniuServiceImpl.java @@ -34,9 +34,6 @@ public class QiniuServiceImpl implements IQiniuService { @Autowired private QiniuConfig qiniuConfig; - - private String token = null; - private UploadManager uploadManager; private Zone zone = new Zone.Builder(Zone.autoZone()) .upHttp("http://upload.qiniup.com") .upHttps("http://upload.qiniup.com") @@ -81,8 +78,6 @@ public class QiniuServiceImpl implements IQiniuService { ioe.printStackTrace(); return "error"; } - //String path = qiniuService.uploadFile(file) - // System.out.print("七牛云返回的图片链接:" + path); return url; } return "error"; @@ -101,7 +96,6 @@ public class QiniuServiceImpl implements IQiniuService { String secretKey= qiniuConfig.getSecretKey(); Auth auth = Auth.create(accessKey, secretKey); String qiniuToken = "Qiniu " + auth.signRequestV2(url, method, body.getBytes(), contentType); - //log.info("url={},body={},qiniuToken={}",url,body,qiniuToken); //头部部分 StringMap header = new StringMap(); header.put("Host",host); @@ -111,20 +105,8 @@ public class QiniuServiceImpl implements IQiniuService { Client client = new Client(c); try { Response response = client.post(url, body.getBytes(), header, contentType); - //System.out.println(response.bodyString()); - //log.info("response result={}",response.bodyString()); JSONObject checkResult = JSON.parseObject(response.bodyString()); - String checkMsg = JSON.parseObject(checkResult.get("result").toString()).get("suggestion").toString(); - if (checkMsg.equals("pass")){ - //可以通过 - } - if (checkMsg.equals("review")){ - //人工审核 - } - if (checkMsg.equals("block")){ - //不可通过 - } - return checkMsg; + return JSON.parseObject(checkResult.get("result").toString()).get("suggestion").toString(); } catch (QiniuException e) { e.printStackTrace(); } @@ -182,8 +164,6 @@ public class QiniuServiceImpl implements IQiniuService { videoSuffixList.add("mp4"); videoSuffixList.add("mov"); videoSuffixList.add("wmv"); -// imageSuffix.add("jpg"); -// imageSuffix.add("jpg"); if (suffix != null&&imageSuffixList.contains(suffix)&&multipartFile.getSize() / 1024 < 50000&&multipartFile.getSize() / 1024 > 0) { afterCheckFiles.add(multipartFile); } diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/vo/ChekFileVo.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/vo/ChekFileVo.java new file mode 100644 index 0000000..12f6e03 --- /dev/null +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/vo/ChekFileVo.java @@ -0,0 +1,21 @@ +package com.bnyer.file.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +/** + * @Author qyh + * @Date 2022/7/6 21:16 + * @Description + */ +@Getter +@Setter +@ApiModel("图片检查响应类") +public class ChekFileVo { + @ApiModelProperty(value="状态(0->待审核;1->审核通过;2->审核拒绝)") + private String status; + @ApiModelProperty(value="文件名称") + private String fileName; +}