From c7450a8e1724528046af3683d49eaf0a06785130 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 14:02:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
index 29488d1..2c655c1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -107,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();

--
Gitblit v1.7.1