From 67945f83461557dfa8ab4b5d547a28eec1669b5c Mon Sep 17 00:00:00 2001
From: lishipeng <1572427111@qq.com>
Date: Wed, 7 Dec 2022 11:19:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E9=83=A8=E7=BD=B2=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/ftpdemo/service/Method.java |  3 +++
 .../com/example/ftpdemo/service/impl/MethodImpl.java  | 11 +++++++++++
 .../example/ftpdemo/task/IdentificationUpTask.java    |  3 +++
 src/main/java/com/example/ftpdemo/util/Constant.java  |  6 +++---
 src/main/java/com/example/ftpdemo/util/Encrypt.java   |  1 -
 src/main/resources/application.yml                    |  6 +++---
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/example/ftpdemo/service/Method.java b/src/main/java/com/example/ftpdemo/service/Method.java
index aac8bb4..85a99e2 100644
--- a/src/main/java/com/example/ftpdemo/service/Method.java
+++ b/src/main/java/com/example/ftpdemo/service/Method.java
@@ -18,4 +18,7 @@ public interface Method {
     void creatSixUpFileAndUp(String yesterday) throws Exception;
 
     void creatSevenUpFileAndUp(String yesterday) throws Exception;
+
+    // 删除上传文件
+    void deletUpFile(String localPackage);
 }
diff --git a/src/main/java/com/example/ftpdemo/service/impl/MethodImpl.java b/src/main/java/com/example/ftpdemo/service/impl/MethodImpl.java
index 0445c82..63febd9 100644
--- a/src/main/java/com/example/ftpdemo/service/impl/MethodImpl.java
+++ b/src/main/java/com/example/ftpdemo/service/impl/MethodImpl.java
@@ -409,6 +409,17 @@ public class MethodImpl implements Method {
         sftp.disconnect();
     }
 
+    @Override
+    public void deletUpFile(String localPackage) {
+        File directory = new File(localPackage);
+        for (File file: Objects.requireNonNull(directory.listFiles())) {
+            if (!file.isDirectory()) {
+                file.delete();
+            }
+        }
+
+    }
+
 
 //    private void deleteFile(String src) {
 //
diff --git a/src/main/java/com/example/ftpdemo/task/IdentificationUpTask.java b/src/main/java/com/example/ftpdemo/task/IdentificationUpTask.java
index b45e0dd..e61924c 100644
--- a/src/main/java/com/example/ftpdemo/task/IdentificationUpTask.java
+++ b/src/main/java/com/example/ftpdemo/task/IdentificationUpTask.java
@@ -54,6 +54,9 @@ public class IdentificationUpTask {
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
+        // 删除上传生成的文件
+        method.deletUpFile(Constant.localPackage);
+
         stopWatch.stop();
         double seconds = stopWatch.getTotalTimeSeconds();
         XxlJobHelper.log("XXL-JOB, 上传日志成功！ 共花费:" + seconds);
diff --git a/src/main/java/com/example/ftpdemo/util/Constant.java b/src/main/java/com/example/ftpdemo/util/Constant.java
index b01a762..5c51fad 100644
--- a/src/main/java/com/example/ftpdemo/util/Constant.java
+++ b/src/main/java/com/example/ftpdemo/util/Constant.java
@@ -21,11 +21,11 @@ public interface Constant {
     String localNotEncryFileNamePath = "/opt/uplog/test.txt";
 
     // 生成zip文件地址
-    String zipPath = "/opt/uplog";
+    String zipPath = "/opt/uplog/logdata";
 
     // 生成本地文件地址：目录 加密（服务器地址需要修改）
-    String localPackage = "/opt/uplog/";
+    String localPackage = "/opt/uplog/logdata/";
 
-    //
+    // 远程服务器源日志存放地
     String sixRemoteLogPackage = "/opt/idhub/logs/idhub-idis/oplog/";
 }
diff --git a/src/main/java/com/example/ftpdemo/util/Encrypt.java b/src/main/java/com/example/ftpdemo/util/Encrypt.java
index f11a04a..8ae5be7 100644
--- a/src/main/java/com/example/ftpdemo/util/Encrypt.java
+++ b/src/main/java/com/example/ftpdemo/util/Encrypt.java
@@ -89,7 +89,6 @@ public class Encrypt {
 		commandId = commandId + randomString(4);
 		String filename = commandId + t;
 		String zipFileName = path + "/" + filename + ".zip";
-		System.out.println("zipFileName=" + zipFileName);
 		if (info != null) {
 
 			if (!checkDir(path)) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d372eb1..24e50fe 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -20,11 +20,11 @@ xxl:
       address:
       ip:
       port: 9999
-      logpath: /opt/xxldata
-      logretentiondays: 30
+      logpath: /opt/uplog/xxljob/log
+      logretentiondays: 90
     accessToken: default_token
     admin:
-      addresses: http://47.97.5.58:8080/xxl-job-admin
+      addresses: http://localhost:8085/xxl-job-admin
 
 logging:
   config: classpath:logback.xml