无用代码删除

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<String> 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<List<TiktokImgVo>> checkBatch(ArrayList<MultipartFile> files) {
+    public R<List<ChekFileVo>> checkBatch(ArrayList<MultipartFile> files) {
         try {
-            ArrayList<TiktokImgVo> list = fileService.checkImg(files);
+            ArrayList<ChekFileVo> list = fileService.checkImg(files);
             // 上传并返回访问地址
             return R.ok(list);
         } catch (Exception e) {

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<TiktokImgVo> checkImg(ArrayList<MultipartFile> multipartFiles);
+    ArrayList<ChekFileVo> checkImg(ArrayList<MultipartFile> multipartFiles);
 }

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<TiktokImgVo> checkImg(ArrayList<MultipartFile> multipartFiles) {
-        ArrayList<TiktokImgVo> tiktokImgVos = new ArrayList<>();
+    public ArrayList<ChekFileVo> checkImg(ArrayList<MultipartFile> multipartFiles) {
+        ArrayList<ChekFileVo> chekFileVos = new ArrayList<>();
         //返回通过校验的数组
         ArrayList<MultipartFile> 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;
     }
 }

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);
             }

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;
+}