From c048d5d7fed5de2f652b3e91655a107be167c295 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Mon, 13 Jun 2022 17:36:56 +0800
Subject: [PATCH] 保安员证编号生成修改
---
src/main/java/org/springblade/modules/FTP/DataHanlder.java | 1 +
src/main/resources/application-test.yml | 2 ++
src/main/java/org/springblade/modules/quartz/task/Task.java | 10 +++++-----
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/DataHanlder.java b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
index 325167e..884955d 100644
--- a/src/main/java/org/springblade/modules/FTP/DataHanlder.java
+++ b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
@@ -118,6 +118,7 @@
//修改为持证保安
user.setHold("1");
user.setUpdateTime(new Date());
+ user.setUserType(7);
//更新保安数据
hanlder.userService.updateById(user);
diff --git a/src/main/java/org/springblade/modules/quartz/task/Task.java b/src/main/java/org/springblade/modules/quartz/task/Task.java
index cf99af8..1cd726c 100644
--- a/src/main/java/org/springblade/modules/quartz/task/Task.java
+++ b/src/main/java/org/springblade/modules/quartz/task/Task.java
@@ -196,14 +196,14 @@
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
e.printStackTrace();
} finally {
- try {
- ftp.logout();
- } catch (IOException e) {
- e.printStackTrace();
- }
//如果ftp 没有关闭,则关闭ftp
if (ftp.isConnected()) {
try {
+ ftp.logout();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ try {
ftp.disconnect();
} catch (IOException io) {
io.printStackTrace();
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index d7eec4f..20b18d5 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -27,6 +27,8 @@
ftpPort: 21
ftpUserName: arsn
ftpPassword: 123456
+ ftpUserNameOut: arsn
+ ftpPasswordOut: 123456
ftpPath: anbao/
localPath: E:\anbao\
minioPath: E:\ftptp\
--
Gitblit v1.9.3