diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 85b20610e..b305dd387 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -903,6 +903,7 @@ public class SpringBootTestController { // 需要重新分账的订单信息(针对未分账的订单) public JSONArray getPaymentList() { String jsonArrayString = "[" + + "{\"orderCode\":\"C44778282947\", \"settleAmount\":\"8.38\", \"paymentId\":\"002212023101608315910559788773415297024\"}" + "{\"orderCode\":\"C44778282947\", \"settleAmount\":\"8.38\", \"paymentId\":\"002212023101608315910559788773415297024\"}" + "]"; return JSONArray.parseArray(jsonArrayString); diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/file/FtpUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/file/FtpUtils.java index 4f6e37c65..4e5eb7775 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/file/FtpUtils.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/file/FtpUtils.java @@ -60,7 +60,13 @@ public class FtpUtils { /** 3. 连接ftp服务器*/ String ip = IpUtils.getIpFormDomainName(ftpConfig.getIp()); ftp.connect(ip, ftpConfig.getPort()); - ftp.login(ftpConfig.getUsername(), ftpConfig.getPassword()); + boolean login = ftp.login(ftpConfig.getUsername(), ftpConfig.getPassword()); + if (login) { + log.info("FTP登录成功"); + } else { + log.info("FTP登录失败"); + } + ftp.enterLocalPassiveMode(); // 设置为被动模式 log.info("ftp连接信息, ip:{}, port:{}, 连接信息:{}", ip, ftpConfig.getPort(), ftp.getStatus()); if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) { // 不合法时断开连接