From 7f132dd94c6ae3e5801d0885d905bcc9e1ed5ebf Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期三, 02 七月 2025 09:44:27 +0800
Subject: [PATCH] 代码提交

---
 src/main/java/com/product/system/backup/service/SystemBackupService.java |  344 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 203 insertions(+), 141 deletions(-)

diff --git a/src/main/java/com/product/system/backup/service/SystemBackupService.java b/src/main/java/com/product/system/backup/service/SystemBackupService.java
index 5594f37..ad27dbd 100644
--- a/src/main/java/com/product/system/backup/service/SystemBackupService.java
+++ b/src/main/java/com/product/system/backup/service/SystemBackupService.java
@@ -2,7 +2,6 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -10,11 +9,16 @@
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Properties;
-import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.druid.util.StringUtils;
@@ -26,16 +30,18 @@
 import com.jcraft.jsch.SftpException;
 import com.jcraft.jsch.SftpProgressMonitor;
 import com.product.core.config.Global;
+import com.product.core.dao.BaseDao;
+import com.product.core.entity.DataTableEntity;
+import com.product.core.entity.FieldSetEntity;
+import com.product.core.service.support.AbstractBaseService;
 import com.product.system.backup.entity.BackupLogger;
+import com.product.system.backup.util.SystemBackupUtil;
 
-/**
- * 	绯荤粺澶囦唤
- *	鏁版嵁搴撳浠斤細姣忓ぉ鎵ц浠g爜澶囦唤
- *	闄勪欢澶囦唤锛氭瘡澶╂墽琛屼唬鐮佸浠藉綋澶╅檮浠�
- *	閬楃暀闂锛氶檮浠惰淇敼锛屼笉鑳介攣瀹氶潪褰撳ぉ琚慨鏀圭殑闄勪欢
- */
 @Service("systemBackService")
-public class SystemBackupService {
+public class SystemBackupService extends AbstractBaseService{
+
+	@Autowired
+	BaseDao baseDao;
 	
 	// 澶囦唤閰嶇疆
 	Properties config;
@@ -46,79 +52,139 @@
 	// 鏁板瓧鏃堕棿鍜屾暟瀛楁棩鏈燂紙鐢ㄥ仛鏂囦欢澶规垨鑰呮枃浠跺悕锛�
 	String NUMBER_TIME;	//渚嬪锛�20250428091001锛�
 	String NUMBER_DATE; //渚嬪锛�20240428锛�
+	String STANDARD_START_TIME;	// 渚嬪锛�2024-04-28 09:10:00锛�
+	String STANDARD_FINAL_TIME;	// 渚嬪锛�2024-04-28 09:10:00锛�
 	
 	// 鏁板瓧鏃ユ湡鏍煎紡
-	SimpleDateFormat numberTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+	SimpleDateFormat numberTimeFormat = new SimpleDateFormat("yyyyMMddHHmm00");
 	SimpleDateFormat numberDateFormat = new SimpleDateFormat("yyyyMMdd");
+	SimpleDateFormat standardTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:00");
 
 	// 澶囦唤閰嶇疆鏂囦欢
 	private static final String CONFIG_FILE_PATH = "systemBackup.properties";
 	
 	/**
-	 * 	绯荤粺澶囦唤鍏ュ彛
+	 * 	绯荤粺澶囦唤鍒ゅ畾
 	 * 	璋冪敤鍦扮偣锛氬畾鏃朵换鍔¢厤缃姛鑳�(bean)
 	 */
-	public void systemBackupInit(){
-		log = new BackupLogger();
-		// 鍦ㄦ棩蹇椾腑璁板綍鎿嶄綔绯荤粺淇℃伅锛屼究浜庤皟璇�
-		log.writeInfo("銆愮郴缁熷浠藉叆鍙c�戞搷浣滅郴缁�: " + System.getProperty("os.name"), BackupLogger.INFO_TYPE);
-		log.writeInfo("銆愮郴缁熷浠藉叆鍙c�戞枃浠跺垎闅旂: " + File.separator, BackupLogger.INFO_TYPE);
-		log.writeInfo("銆愮郴缁熷浠藉叆鍙c�戠郴缁熷浠藉紑濮�..................", BackupLogger.INFO_TYPE);
-		NUMBER_TIME = numberTimeFormat.format(new Date());
-		NUMBER_DATE = numberDateFormat.format(new Date());
-		log.writeInfo("銆愮郴缁熷浠藉叆鍙c�戠郴缁熸棩鏈燂細" + NUMBER_DATE, BackupLogger.INFO_TYPE);
-		log.writeInfo("銆愮郴缁熷浠藉叆鍙c�戠郴缁熸椂闂达細" + NUMBER_TIME, BackupLogger.INFO_TYPE);
-		backupProcess();
-		log.closeLogger();
+	public void systemBackupInit() {
+		// 鑾峰彇绯荤粺鏃堕棿
+		Date finalTime = new Date();
+		Date startTime = null;
+		// 鑾峰彇绯荤粺鏈�澶у浠芥椂闂�
+		StringBuilder sbSql = new StringBuilder();
+		sbSql.append("SELECT end_time \n");
+		sbSql.append("FROM product_sys_backup_log \n");
+		sbSql.append("WHERE backup_status = 1 \n");
+		sbSql.append("ORDER BY end_time DESC \n");
+		sbSql.append("LIMIT 1 \n");
+		FieldSetEntity fseMaxLogTime = baseDao.getFieldSetEntityBySQL(sbSql.toString(), new Object[] {}, false);
+		if(fseMaxLogTime != null && !StringUtils.isEmpty(fseMaxLogTime.getString("end_time"))) {
+			startTime = fseMaxLogTime.getDate("end_time");
+		}
+		// 鍒濆澶囦唤鏃ュ織鏁版嵁
+		FieldSetEntity fseBackLog = new FieldSetEntity("product_sys_backup_log");
+		fseBackLog.setValue("start_time", startTime);
+		fseBackLog.setValue("end_time", finalTime);
+		
+		// 鎵ц澶囦唤
+		boolean flag = backupProcess(startTime, finalTime);
+		if (flag) {
+			fseBackLog.setValue("backup_status", 1);
+		} else {
+			fseBackLog.setValue("backup_status", 0);
+		}
+		// 淇濆瓨鏃ュ織
+		baseDao.saveFieldSetEntity(fseBackLog);
 	}
 
 	/**
-	 * 鏁版嵁澶囦唤杩涚▼
+	 * 	鏁版嵁澶囦唤杩涚▼
+	 * @param startTime	澶囦唤寮�濮嬫椂闂�
+	 * @param finalTime	澶囦唤鎴鏃堕棿
+	 * @return
 	 */
-	public void backupProcess() {
+	public boolean backupProcess(Date startTime, Date finalTime) {
+		// 鍒濆鏃ュ織鏂囦欢
+		log = new BackupLogger();
 		log.writeInfo("銆愮郴缁熷浠借繘绋嬨�戠郴缁熷浠借繘绋嬪紑濮�..................", BackupLogger.INFO_TYPE);
 		long start = System.currentTimeMillis();
-		boolean status= true;
-		// 绗竴姝ワ細鍒濆閰嶆枃浠跺弬鏁�,褰撳墠鐩敓鎴愭椂闂存埑鐨勬枃浠跺す
-		status = initSystemConfig();
+		// 绗竴姝ワ細鍒濆澶囦唤鍙傛暟
+		initBackupParam(startTime, finalTime);
+		// 绗簩姝ワ細鍒濆閰嶆枃浠跺弬鏁�,褰撳墠鐩敓鎴愭椂闂存埑鐨勬枃浠跺す
+		boolean status = initSystemConfig();
 		if (!status)
-			return;
-		// 绗簩姝ワ細鎵ц鏁版嵁搴撳浠�
+			return false;
+		// 绗笁姝ワ細鎵ц鏁版嵁搴撳浠�
 		status = runExpDataBase();
 		if (!status)
-			return;
-		
-		// 绗笁姝ワ細鎵ц瀵规暟鎹簱鏂囦欢銆佸伐绋嬩唬鐮併�佷笂浼犳枃浠跺仛鍘嬬缉澶囦唤
+			return false;
+		// 绗洓姝ワ細鎵ц瀵规暟鎹簱鏂囦欢銆佸伐绋嬩唬鐮併�佷笂浼犳枃浠跺仛鍘嬬缉澶囦唤
 		status = zipDataBackup();
 		if (!status)
-			return;
-		// 绗洓姝ワ細涓婁紶鍘嬬缉澶囦唤鏂囦欢鍒癋TP
-		status = uploadBackupMachine();
-//		uploadBackupMachine2();
+			return false;
+		// 绗簲姝ワ細涓婁紶鍘嬬缉澶囦唤鏂囦欢鍒癋TP
+		status = sftpTransferService();
 		if (!status)
-			return;
-		// 绗簲姝ワ細娓呴櫎鏁版嵁
+			return false;
+		// 绗叚姝ワ細娓呴櫎鏁版嵁
 //		clearKeepData();
 
 		long end = System.currentTimeMillis();
 		log.writeInfo("銆愮郴缁熷浠借繘绋嬨�戠郴缁熷浠借繘绋嬬粨鏉燂紝鑰楁椂.................." + ((end - start) / 1000) + "绉�", BackupLogger.INFO_TYPE);
-		System.out.println("绯荤粺澶囦唤鑰楁椂.................." + ((end - start) / 1000) + "绉�");
+		// 鍏抽棴鏃ュ織
+		log.closeLogger();
+		return status;
 	}
 
 	/**
-	 * 绗竴姝ワ細鍒濆閰嶇疆鏂囦欢鍙傛暟,褰撳墠鐩綍鐢熸垚鏃堕棿鎴崇殑鏂囦欢澶�
+	 * 绗竴姝ワ細鍒濆澶囦唤鍙傛暟
+	 * @param startTime	澶囦唤寮�濮嬫椂闂�
+	 * @param finalTime	澶囦唤鎴鏃堕棿
+	 * @return
+	 */
+	public boolean initBackupParam(Date startTime, Date finalTime){
+		// 鍦ㄦ棩蹇椾腑璁板綍鎿嶄綔绯荤粺淇℃伅锛屼究浜庤皟璇�
+		log.writeInfo("銆愬垵濮嬪浠藉弬鏁般�戞搷浣滅郴缁�: " + System.getProperty("os.name"), BackupLogger.INFO_TYPE);
+		log.writeInfo("銆愬垵濮嬪浠藉弬鏁般�戞枃浠跺垎闅旂: " + File.separator, BackupLogger.INFO_TYPE);
+		log.writeInfo("銆愬垵濮嬪浠藉弬鏁般�戠郴缁熷浠藉紑濮�..................", BackupLogger.INFO_TYPE);
+		NUMBER_TIME = numberTimeFormat.format(finalTime);
+		NUMBER_DATE = numberDateFormat.format(finalTime);
+		if(startTime == null) {
+			STANDARD_START_TIME = "2000-01-01 00:00:00";
+		} else {
+			STANDARD_START_TIME = standardTimeFormat.format(startTime);
+		}
+		STANDARD_FINAL_TIME = standardTimeFormat.format(finalTime);
+		log.writeInfo("銆愬垵濮嬪浠藉弬鏁般�戠郴缁熸棩鏈燂細" + NUMBER_DATE, BackupLogger.INFO_TYPE);
+		log.writeInfo("銆愬垵濮嬪浠藉弬鏁般�戠郴缁熸椂闂达細" + NUMBER_TIME, BackupLogger.INFO_TYPE);
+		log.writeInfo("銆愬垵濮嬪浠藉弬鏁般�戠郴缁熷浠藉紑濮嬫椂闂达細" + STANDARD_START_TIME, BackupLogger.INFO_TYPE);
+		log.writeInfo("銆愬垵濮嬪浠藉弬鏁般�戠郴缁熷浠芥埅姝㈡椂闂达細" + STANDARD_FINAL_TIME, BackupLogger.INFO_TYPE);
+		
+		return true;
+	}
+	
+	/**
+	 * 绗簩姝ワ細鍒濆閰嶇疆鏂囦欢鍙傛暟,褰撳墠鐩綍鐢熸垚鏃堕棿鎴崇殑鏂囦欢澶�
 	 */
 	public boolean initSystemConfig() {
 		log.writeInfo("銆愬垵濮嬮厤缃枃浠躲�戝紑濮嬪垵濮嬬郴缁熼厤缃枃浠�..................", BackupLogger.INFO_TYPE);
 		try (InputStream  reader = getClass().getClassLoader().getResourceAsStream(CONFIG_FILE_PATH)) {
+			if (reader == null) {
+				log.writeInfo("銆愬垵濮嬮厤缃枃浠躲�戝垵濮嬬郴缁熼厤缃枃浠跺け璐ワ細" + CONFIG_FILE_PATH + "閰嶇疆鏂囦欢涓嶅瓨鍦�", BackupLogger.ERROR_TYPE);
+				return false;
+			}
 			// 璇诲彇澶囦唤閰嶇疆鏂囦欢
 			config = new Properties();
 			config.load(reader);
-			// 绯荤粺闄勪欢瀛樻斁鐩綍(褰撳ぉ闄勪欢)
-			config.setProperty("DOCUMENT_ROOT", System.getProperty("user.dir") + File.separator + Global.getSystemConfig("local.dir", "") + File.separator + "00000000-0000-0000-0000-000000000000" + File.separator + NUMBER_DATE);
-			// 鏁版嵁搴撳浠界洰褰曪紙鏁版嵁搴撳浠芥牴鐩綍+鏃堕棿鏂囦欢鍚�+.sql锛�
+			// 鑾峰彇绯荤粺鏂囦欢璺緞
+			String systemFileFolder = Global.getSystemConfig("local.dir", "");
+			File newFile= new File(systemFileFolder);
+			// 绯荤粺闄勪欢瀛樻斁鐩綍锛�../product-server-web/attachment/upload/锛�
+			config.setProperty("DOCUMENT_ROOT", newFile.getAbsolutePath());
+			// 鏁版嵁搴撳浠界洰褰曪紙鏁版嵁搴撳浠芥牴鐩綍+鏃堕棿鏂囦欢鍚�+.sql锛屼緥濡傦細E://backup/database/20250101090000.sql锛�
 			config.setProperty("DATABASE_BACKUP", config.getProperty("DATABASE_ROOT") + File.separator + NUMBER_TIME + ".sql");
-			// 澶囦唤鐩爣鏂囦欢锛圸IP澶囦唤鏍圭洰褰�+鏃堕棿鏂囦欢鍚�+.zip锛�
+			// 澶囦唤ZIP鏂囦欢锛圸IP澶囦唤鏍圭洰褰�+鏃堕棿鏂囦欢鍚�+.zip锛屼緥濡傦細E://backup/20250101090000.zip锛�
 			config.setProperty("ZIPFILE_BACKUP", config.getProperty("ZIPFILE_ROOT") + File.separator + NUMBER_TIME + ".zip");
 			// 鍒涘缓ZIP鏂囦欢鏍圭洰褰�
 			File zipFileRoot = new File(config.getProperty("ZIPFILE_ROOT"));
@@ -128,10 +194,9 @@
 	                return false;
 	            }
 			}
+			log.writeInfo("銆愬垵濮嬮厤缃枃浠躲�慏OCUMENT_ROOT=" + config.getProperty("DOCUMENT_ROOT"), BackupLogger.INFO_TYPE);
 			log.writeInfo("銆愬垵濮嬮厤缃枃浠躲�慏ATABASE_ROOT=" + config.getProperty("DATABASE_ROOT"), BackupLogger.INFO_TYPE);
 			log.writeInfo("銆愬垵濮嬮厤缃枃浠躲�慏ATABASE_BACKUP=" + config.getProperty("DATABASE_BACKUP"), BackupLogger.INFO_TYPE);
-			log.writeInfo("銆愬垵濮嬮厤缃枃浠躲�慏OCUMENT_ROOT=" + config.getProperty("DOCUMENT_ROOT"), BackupLogger.INFO_TYPE);
-			log.writeInfo("銆愬垵濮嬮厤缃枃浠躲�慏OCUMENT_BACKUP=" + config.getProperty("DOCUMENT_BACKUP"), BackupLogger.INFO_TYPE);
 			log.writeInfo("銆愬垵濮嬮厤缃枃浠躲�慫IPFILE_ROOT=" + config.getProperty("ZIPFILE_ROOT"), BackupLogger.INFO_TYPE);
 			log.writeInfo("銆愬垵濮嬮厤缃枃浠躲�慫IPFILE_BACKUP=" + config.getProperty("ZIPFILE_BACKUP"), BackupLogger.INFO_TYPE);
 			log.writeInfo("銆愬垵濮嬮厤缃枃浠躲�戝垵濮嬬郴缁熼厤缃枃浠剁粨鏉�.................", BackupLogger.INFO_TYPE);
@@ -145,7 +210,7 @@
 	}
 	
 	/**
-	 * 	绗簩姝ワ細澶囦唤鏁版嵁搴撴枃浠�
+	 * 	绗笁姝ワ細澶囦唤鏁版嵁搴撴枃浠�
 	 */
 	public boolean runExpDataBase() {
 		log.writeInfo("銆愬浠芥暟鎹簱銆戝紑濮嬪浠芥暟鎹簱..................", BackupLogger.INFO_TYPE);
@@ -178,7 +243,7 @@
         try {
             Process process = processBuilder.start();
             // 璇诲彇mysqldump鐨勮緭鍑哄苟鍐欏叆鍒板浠芥枃浠�
-            try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8));
                  FileWriter writer = new FileWriter(backupFile)) {
                 
                 String line;
@@ -202,129 +267,126 @@
             } else {
                 log.writeInfo("銆愬浠芥暟鎹簱銆戞暟鎹簱澶囦唤澶辫触锛岄��鍑虹爜: " + exitCode, BackupLogger.ERROR_TYPE);
             }
+            return true;
         } catch (Exception e) {
             e.printStackTrace();
             log.writeInfo("銆愬浠芥暟鎹簱銆戞暟鎹簱澶囦唤澶辫触锛�" + e.getMessage(), BackupLogger.ERROR_TYPE);
+            backupFile.delete();
             return false;
-        }
-        return true;
+		}
 	}
 
-	private static void addFolderToZip(File folder, String parentPath, ZipOutputStream zos) throws IOException {
-        File[] files = folder.listFiles();
-        if (files != null) {
-            for (File file : files) {
-                if (file.isDirectory()) {
-                    // 閫掑綊澶勭悊瀛愮洰褰曪紝淇濇寔璺緞缁撴瀯
-                    addFolderToZip(file, parentPath + file.getName() + "/", zos);
-                } else {
-                    // 娣诲姞鏂囦欢鍒癦IP锛屼繚鎸佽矾寰勭粨鏋�
-                    addFileToZip(file, parentPath + file.getName(), zos);
-                }
-            }
-        }
-    }
-    
-    private static void addFileToZip(File file, String entryName, ZipOutputStream zos) throws IOException {
-        try (FileInputStream fis = new FileInputStream(file)) {
-            zos.putNextEntry(new ZipEntry(entryName));
-            byte[] buffer = new byte[1024];
-            int length;
-            while ((length = fis.read(buffer)) >= 0) {
-                zos.write(buffer, 0, length);
-            }
-            zos.closeEntry();
-        }
-    }
-    
-    /**
-     * 	绗笁姝ワ細鍘嬬缉澶囦唤鏂囦欢
-     */
-	public boolean zipDataBackup() {
-		log.writeInfo("銆愬帇缂╁浠芥枃浠躲�戝紑濮嬪帇缂╁浠芥枃浠�..................", BackupLogger.INFO_TYPE);
+	/**
+	 * 	绗洓姝ワ細鎵ц瀵规暟鎹簱鏂囦欢銆佸伐绋嬩唬鐮併�佷笂浼犳枃浠跺仛鍘嬬缉澶囦唤
+	 * @return
+	 */
+    public boolean zipDataBackup() {
+    	log.writeInfo("銆愬帇缂╁浠芥枃浠躲�戝紑濮嬪帇缂╁浠芥枃浠�..................", BackupLogger.INFO_TYPE);
 		String documentPath = config.getProperty("DOCUMENT_ROOT");
         String databasePath = config.getProperty("DATABASE_BACKUP");
         String zipFilePath = config.getProperty("ZIPFILE_BACKUP");
         log.writeInfo("銆愬帇缂╁浠芥枃浠躲�戦檮浠跺瓨鍌ㄧ洰褰曡矾寰勶細" + documentPath, BackupLogger.INFO_TYPE);
         log.writeInfo("銆愬帇缂╁浠芥枃浠躲�戞暟鎹簱澶囦唤瀹屾暣璺緞锛�" + databasePath, BackupLogger.INFO_TYPE);
         log.writeInfo("銆愬帇缂╁浠芥枃浠躲�戝浠藉帇缂╂枃浠跺畬鏁磋矾寰勶細" + zipFilePath, BackupLogger.INFO_TYPE);
-        try (FileOutputStream fos = new FileOutputStream(zipFilePath);
-               ZipOutputStream zos = new ZipOutputStream(fos)) {
-        	
-        	log.writeInfo("銆愬帇缂╁浠芥枃浠躲�戝帇缂╃郴缁熼檮浠�", BackupLogger.INFO_TYPE);
-        	// 鍘嬬缉鏂囦欢澶癸紙淇濈暀瀹屾暣璺緞缁撴瀯锛�
-            // 娉ㄦ剰锛氳繖閲屾垜浠紶閫掍簡鏍圭洰褰曞悕绉颁綔涓哄垵濮媝arentPath
-            addFolderToZip(new File(documentPath), NUMBER_DATE + "/", zos);
-    
-            log.writeInfo("銆愬帇缂╁浠芥枃浠躲�戝帇缂╂暟鎹簱澶囦唤鏂囦欢", BackupLogger.INFO_TYPE);
-            // 鍘嬬缉SQL鏂囦欢锛堟斁鍦ㄦ寚瀹氳矾寰勪笅锛�
-            addFileToZip(new File(databasePath), "database/" + NUMBER_TIME + ".sql", zos);
-    
+    	
+    	try (FileOutputStream fos = new FileOutputStream(zipFilePath);
+                ZipOutputStream zos = new ZipOutputStream(fos)){
+    		StringBuilder sbSql = new StringBuilder();
+        	sbSql.append("SELECT SUBSTRING_INDEX(attachment_url, '/', -1) folder_name,attachment_title AS file_name,attachment_url AS folder_path \n");
+        	sbSql.append("FROM product_sys_attachments \n");
+        	sbSql.append("WHERE (created_utc_datetime > ? AND created_utc_datetime <= ?) \n");
+        	sbSql.append("OR (updated_utc_datetime > ? AND updated_utc_datetime <= ?) \n");
+        	DataTableEntity dtTable = baseDao.listTable(sbSql.toString(), new Object[] {STANDARD_START_TIME, STANDARD_FINAL_TIME, STANDARD_START_TIME, STANDARD_FINAL_TIME});
+        	if(dtTable != null && dtTable.getRows() > 0) {
+        		Map<String, List<String>> groupFolderFile = new HashMap<>();
+        		for(int i = 0; i < dtTable.getRows(); i++) {
+        			String folderName = dtTable.getFieldSetEntity(i).getString("folder_path");
+        			String fileName = dtTable.getFieldSetEntity(i).getString("file_name");
+        			if (groupFolderFile.containsKey(folderName)) {
+        				groupFolderFile.get(folderName).add(fileName);
+        			} else {
+        				groupFolderFile.put(folderName, new ArrayList<String>(Arrays.asList(fileName)));
+        			}
+        		}
+        		log.writeInfo("銆愬帇缂╁浠芥枃浠躲�戝帇缂╃郴缁熷閲忛檮浠�", BackupLogger.INFO_TYPE);
+        		SystemBackupUtil.compressExistingFiles(groupFolderFile, documentPath, zos);
+        	}
+			
+        	log.writeInfo("銆愬帇缂╁浠芥枃浠躲�戝帇缂╂暟鎹簱澶囦唤鏂囦欢", BackupLogger.INFO_TYPE);
+            SystemBackupUtil.addFileToZip(new File(databasePath), "database/" + NUMBER_TIME + ".sql", zos);
             log.writeInfo("銆愬帇缂╁浠芥枃浠躲�戝帇缂╁畬鎴�", BackupLogger.INFO_TYPE);
-        } catch (IOException e) {
-            e.printStackTrace();
+            return true;
+		} catch (IOException e) {
+			e.printStackTrace();
             log.writeInfo("銆愬帇缂╁浠芥枃浠躲�戝帇缂╁け璐ワ細" + e.getMessage(), BackupLogger.ERROR_TYPE);
             return false;
-        }
-        return true;
-	}
-	
+		} finally {
+			File file = new File(databasePath);
+			file.delete();
+			log.writeInfo("銆愬帇缂╁浠芥枃浠躲�戞竻鐞嗘暟鎹簱澶囦唤鏂囦欢瀹屾垚", BackupLogger.INFO_TYPE);
+		}
+    }
+    
     /**
-	 * 	绗洓姝ワ細SFTP鍙戦�佷笂浼犲鐢ㄦ満
-	 */
-	public boolean uploadBackupMachine() {
-		log.writeInfo("銆愪笂浼犲浠芥枃浠躲�戝紑濮嬩笂浼犲浠芥枃浠�..................", BackupLogger.INFO_TYPE);
-        String localFile = config.getProperty("ZIPFILE_BACKUP"); // 鏈湴鏂囦欢璺緞
-        String remotePath = config.getProperty("UPLOAD_BACKUP_DIR") + NUMBER_TIME + ".zip"; // 杩滅▼鏂囦欢璺緞
-        int port = Integer.valueOf(config.getProperty("UPLOAD_SFTP_PORT")); //SSH绔彛
-        String host = config.getProperty("UPLOAD_SFTP_HOST"); // 澶囩敤鏈嶅姟鍣ㄧ殑IP鍦板潃
-        String user = config.getProperty("UPLOAD_SFTP_USER"); // 澶囩敤鏈嶅姟鍣ㄧ殑鐢ㄦ埛鍚�
-        String password = config.getProperty("UPLOAD_SFTP_PWD"); // 澶囩敤鏈嶅姟鍣ㄧ殑瀵嗙爜
-        log.writeInfo("銆愪笂浼犲浠芥枃浠躲�戜笂浼犲鐢ㄦ満鍦板潃锛�" + host, BackupLogger.INFO_TYPE);
-        log.writeInfo("銆愪笂浼犲浠芥枃浠躲�戜笂浼犲鐢ㄦ満绔彛锛�" + port, BackupLogger.INFO_TYPE);
-        log.writeInfo("銆愪笂浼犲浠芥枃浠躲�戜笂浼犲鐢ㄦ満鐩綍锛�" + remotePath, BackupLogger.INFO_TYPE);
-        if (StringUtils.isEmpty(host) || StringUtils.isEmpty(user) || StringUtils.isEmpty(password)) {
-        	log.writeInfo("銆愪笂浼犲浠芥枃浠躲�戜笂浼犲鐢ㄦ満鍦板潃SFTP淇℃伅鏈厤缃畬鏁达紝涓嶄簣涓婁紶", BackupLogger.INFO_TYPE);
+     * 绗簲姝ワ細SFTP杩炴帴锛氶�氳繃SFTP灏嗗浠芥枃浠朵笂浼犲鐢ㄦ満  鎴�  浠巑ysql鏈嶅姟鍣ㄤ笂鑾峰彇澶囦唤鏂囦欢
+     * @param isUpload	 鏄惁涓婁紶
+     * @return
+     */
+	public boolean sftpTransferService() {
+        String localFilePath =  config.getProperty("ZIPFILE_BACKUP");	// 鏈湴鏂囦欢璺緞
+        String sftpFilePath = config.getProperty("UPLOAD_BACKUP_DIR") + NUMBER_TIME + ".zip"; // SFTP鏈嶅姟鏂囦欢璺緞;
+			
+		String host = config.getProperty("UPLOAD_SFTP_HOST"); // SFTP鏈嶅姟IP鍦板潃
+        String port = config.getProperty("UPLOAD_SFTP_PORT"); // SSH绔彛
+        String user = config.getProperty("UPLOAD_SFTP_USER"); // SFTP鏈嶅姟鐨勭敤鎴峰悕
+        String password = config.getProperty("UPLOAD_SFTP_PWD"); // SFTP鏈嶅姟鐨勫瘑鐮�
+		log.writeInfo("銆愪笂浼犵郴缁熷浠芥枃浠躲�戝紑濮嬩笂浼犵郴缁熷浠芥枃浠�..................", BackupLogger.INFO_TYPE);
+        log.writeInfo("銆愪笂浼犵郴缁熷浠芥枃浠躲�慡FTP鏈嶅姟鍦板潃锛�" + host, BackupLogger.INFO_TYPE);
+        log.writeInfo("銆愪笂浼犵郴缁熷浠芥枃浠躲�慡FTP鏈嶅姟绔彛锛�" + port, BackupLogger.INFO_TYPE);
+        log.writeInfo("銆愪笂浼犵郴缁熷浠芥枃浠躲�慡FTP鏈嶅姟瀛樺偍鐩綍锛�" + sftpFilePath, BackupLogger.INFO_TYPE);
+        log.writeInfo("銆愪笂浼犵郴缁熷浠芥枃浠躲�戝綋鍓嶆湇鍔″瓨鍌ㄧ洰褰曪細" + localFilePath, BackupLogger.INFO_TYPE);
+        if (StringUtils.isEmpty(host) || StringUtils.isEmpty(port) || StringUtils.isEmpty(user) || StringUtils.isEmpty(password)) {
+        	log.writeInfo("銆愪笂浼犵郴缁熷浠芥枃浠躲�慡FTP淇℃伅鏈厤缃畬鏁达紝涓嶄簣杩炴帴浼犺緭鏂囦欢", BackupLogger.INFO_TYPE);
 			return true;
 		}
         try {
-        	 JSch jsch = new JSch();
-             Session session = jsch.getSession(user, host, port);
-             session.setPassword(password);
-             session.setConfig("StrictHostKeyChecking", "no"); // 浠呴檺娴嬭瘯鐜
-             session.connect(5000); // 璁剧疆杩炴帴瓒呮椂鏃堕棿
+            JSch jsch = new JSch();
+            Session session = jsch.getSession(user, host, Integer.valueOf(port));
+            session.setPassword(password);
+            session.setConfig("StrictHostKeyChecking", "no"); // 浠呴檺娴嬭瘯鐜
+            session.connect(5000); // 璁剧疆杩炴帴瓒呮椂鏃堕棿
   
-             Channel channel = session.openChannel("sftp");
-             channel.connect(5000); // 璁剧疆閫氶亾瓒呮椂鏃堕棿
-             ChannelSftp sftpChannel = (ChannelSftp) channel;
+            Channel channel = session.openChannel("sftp");
+            channel.connect(5000); // 璁剧疆閫氶亾瓒呮椂鏃堕棿
+            ChannelSftp sftpChannel = (ChannelSftp) channel;
              
-             // 纭繚杩滅▼鐩綍瀛樺湪锛堝叧閿楠わ級
-             String remoteDir = remotePath.substring(0, remotePath.lastIndexOf('/'));
-             if (!remoteDir.startsWith("/")) {
-                 remoteDir = "/" + remoteDir;
-             }
-             // 鍒涘缓瀵瑰簲鐩綍鏂囦欢澶�
-             createRemoteDirectory(sftpChannel, remoteDir);
-             sftpChannel.put(localFile, remotePath, new SftpProgressMonitor() {
-                 public void init(int op, String src, String dest, long max) {
-                     log.writeInfo("銆愪笂浼犲浠芥枃浠躲�戝紑濮嬩紶杈�: " + src + " -> " + dest, BackupLogger.INFO_TYPE);
-                 }
-                 public boolean count(long count) { return true; }
-                 public void end() { log.writeInfo("銆愪笂浼犲浠芥枃浠躲�戜紶杈撳畬鎴�", BackupLogger.INFO_TYPE); }
-             });
+            // 纭繚鐩綍瀛樺湪锛堝叧閿楠わ級
+            String remoteDir = sftpFilePath.substring(0, sftpFilePath.lastIndexOf('/'));
+            if (!remoteDir.startsWith("/")) {
+                remoteDir = "/" + remoteDir;
+            }
+            // 鍒涘缓瀵瑰簲鐩綍鏂囦欢澶�
+            createRemoteDirectory(sftpChannel, remoteDir);
+            sftpChannel.put(localFilePath, sftpFilePath, new SftpProgressMonitor() {
+                public void init(int op, String src, String dest, long max) {
+                    log.writeInfo("銆愪笂浼犵郴缁熷浠芥枃浠躲�戝紑濮嬩紶杈�: " + src + " -> " + dest, BackupLogger.INFO_TYPE);
+                }
+                public boolean count(long count) { return true; }
+                public void end() { log.writeInfo("銆愪笂浼犵郴缁熷浠芥枃浠躲�戜紶杈撳畬鎴�", BackupLogger.INFO_TYPE); }
+            });
             sftpChannel.exit();
             session.disconnect();
-            log.writeInfo("銆愪笂浼犲浠芥枃浠躲�戜笂浼犲浠芥枃浠舵垚鍔�", BackupLogger.INFO_TYPE);
+            log.writeInfo("銆愪笂浼犵郴缁熷浠芥枃浠躲�戜笂浼犵郴缁熷浠芥枃浠舵垚鍔�", BackupLogger.INFO_TYPE);
         } catch (JSchException | SftpException e) {
             e.printStackTrace();
-            log.writeInfo("銆愪笂浼犲浠芥枃浠躲�戜笂浼犲浠芥枃浠跺け璐ワ細" + e.getMessage(), BackupLogger.ERROR_TYPE);
+            log.writeInfo("銆愪笂浼犵郴缁熷浠芥枃浠躲�戜笂浼犵郴缁熷浠芥枃浠跺け璐ワ細" + e.getMessage(), BackupLogger.ERROR_TYPE);
             return false;
         }
         return true;
     }
 	
 	/**
-	 *  閫掑綊鍒涘缓杩滅▼鐩綍
+	 *  SFTP閫掑綊鍒涘缓杩滅▼鐩綍
 	 * @param sftpChannel
 	 * @param remoteDir
 	 * @throws SftpException

--
Gitblit v1.9.2