Merge branch 'test_future_wangge' into 'test'

罗元桥

2021-06-09 6d966143194df1843116d6552367ade2b79d8344

Merge branch 'test_future_wangge' into 'test'

Test future wangge

See merge request root/zhihuishequ!38

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

@@ -94,7 +94,7 @@
            log.info("临时文件删除【{}】", delete);
            sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
            sftp.logout();
            return R.ok(url + "/idcard/" + name);
            return R.ok(url + "idcard/" + name);
        } catch (Exception e) {
            log.error("上传照片失败【{}】", e.getMessage());
            return R.fail();
@@ -141,7 +141,7 @@
                boolean delete = file1.delete();
                log.info("临时文件删除【{}】", delete);
                sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
                urlList.add(url + "/idcard/" + name);
                urlList.add(url + "idcard/" + name);
            } catch (Exception e) {
                log.error("上传文件失败【{}】", e.getMessage());
                return R.fail();