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

huanghongfa

2021-07-28 098b507166a2b23f0256d5c4f097e7f05f11e9be

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java

@@ -86,7 +86,8 @@
        String originName = file.getOriginalFilename();
        AtomicBoolean isVideo = new AtomicBoolean(false);
        videoExtensionAllow.forEach(ext ->{
            if(ext.equalsIgnoreCase(originName)){
            String originNameLowerCase = originName.toLowerCase();
            if(originNameLowerCase.endsWith("." +ext)){
                isVideo.set(true);
            }
        });
@@ -106,15 +107,16 @@
            InputStream is = file.getInputStream();
            file.transferTo(file1);
            try {
                boolean b = wxMaSecCheckService.checkImage(file1);
//                boolean b = wxMaSecCheckService.checkImage(file1);
                boolean delete = file1.delete();
                log.info("临时文件删除【{}】", delete);
                if (!b) {
                    return R.fail("图片内容违规");
                }
            } catch (WxErrorException e) {
//                if (!b) {
//                    return R.fail("图片内容违规");
//                }
            } catch (Exception e) {
                log.error("微信审核图片出错【{}】", e.getMessage());
                e.printStackTrace();
                return R.fail("图片上传失败");
//                e.printStackTrace();
            }
            sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
            sftp.logout();