From abe28eee6f474983ec6779ebd8c24030c4c0236c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Jun 2022 17:27:09 +0800
Subject: [PATCH] ftp 连接配置修改优化
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 2379339..08693e7 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -873,7 +873,7 @@
.headers(headers)
.build());
InputStream inputStream = new ByteArrayInputStream(b);
- FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", "f"+split[2], inputStream);
in.close();
//外围url
String urls = "http://61.131.136.25:2081/zhba/" + newName;
@@ -1624,7 +1624,7 @@
//调用ftp获取返回数据
while (true){
System.out.println("用户新增开始接收消息......................");
- Thread.sleep(1000);
+ Thread.sleep(2000);
//调用ftp获取返回数据
result = Monitor.isFTPFileExist(uuid);
//如果返回true,就退处
@@ -1643,8 +1643,8 @@
}else{
//计数
count++;
- //如果超过10s 没有读取到，则退出
- if (count == 30) {
+ //如果超过60s 没有读取到，则退出
+ if (count == 60) {
break;
}
}
@@ -1860,4 +1860,19 @@
public R getNotUpdatePwdInfo() {
return R.data(userService.getNotUpdatePwdInfo());
}
+
+ /**
+ * 用户手动离职（用户数据未同步成功的）
+ * @param user
+ * @return
+ */
+ @GetMapping("/leave")
+ public void leave(User user){
+ user.setStatus(2);
+ String s1 =
+ "update blade_user set status = " + "'" + user.getStatus() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'"
+ + " " + "where cardid = " + "'" + user.getCardid() + "'";
+ myAsyncService.FTP(s1);
+ }
}
--
Gitblit v1.9.3