Merge remote-tracking branch 'shuojin/master'

# Conflicts:
#	hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/FtpController.java

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/FtpController.java

@@ -65,30 +65,30 @@ public class FtpController {
     })
     public ServerResponse uploadFileToFtp(@RequestParam("file") MultipartFile mfile, HttpServletRequest request) {
 
-//        log.info("/uploadFileToFtp（上传文件-通过file上传到ftp）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(),mfile);
+        log.info("/uploadFileToFtp（上传文件-通过file上传到ftp）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(),mfile);
-//
+
-//        List<String> list = Arrays.asList(".jpg",".jpeg",".png",".bmp",".avi"
+        /*List<String> list = Arrays.asList(".jpg",".jpeg",".png",".bmp",".avi"
-//                ,".mov",".rmvb",".rm",".mp4");
+                ,".mov",".rmvb",".rm",".mp4");*/
-//        //获取上传文件名,包含后缀
+        //获取上传文件名,包含后缀
-//        String originalFilename = mfile.getOriginalFilename();
+        String originalFilename = mfile.getOriginalFilename();
-//        //获取后缀
+        //获取后缀
-//        String substring = originalFilename.substring(originalFilename.lastIndexOf("."));
+        String substring = originalFilename.substring(originalFilename.lastIndexOf("."));
-//        if(!list.contains(substring.toLowerCase())){
+        /*if(!list.contains(substring.toLowerCase())){
-//            return ServerResponse.error("请上传图片、视频文件");
+            return ServerResponse.error("请上传图片、视频文件");
-//        }
+        }*/
-//        //保存的文件名
+        //保存的文件名
-//        String dFileName = UUID.randomUUID()+substring;
+        String dFileName = UUID.randomUUID()+substring;
-//        String url = "";
+        String url = "";
-//        System.out.println("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
+        System.out.println("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
-//        try {
+        try {
-//            File file = multipartFileToFile(mfile);
+            File file = multipartFileToFile(mfile);
-//            InputStream inputStream = FileUtil.getInputStream(file);
+            InputStream inputStream = FileUtil.getInputStream(file);
-//            url = ftpUtils.uploadToFtp(inputStream, dFileName, false);
+            url = ftpUtils.uploadToFtp(inputStream, dFileName, false);
-//        } catch (Exception e) {
+        } catch (Exception e) {
-//            e.printStackTrace();
+            e.printStackTrace();
-//        }
+        }
-//        log.info("/uploadFileToFtp（保存 & 暂存人工排查）接口返回, 客户端ip: {}, 返回数据:{}", request.getRemoteAddr(), url);
+        log.info("/uploadFileToFtp（保存 & 暂存人工排查）接口返回, 客户端ip: {}, 返回数据:{}", request.getRemoteAddr(), url);
-        return ServerResponse.ok("https://img-blog.csdnimg.cn/20210823085628540.jpeg");
+        return ServerResponse.ok(url);
     }
 
     public static File multipartFileToFile(MultipartFile file) throws Exception {