From 2a687ed599a01170ecd69b3276b86d1fefbae6c5 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期二, 17 六月 2025 14:22:09 +0800
Subject: [PATCH] 新版备份代码临时提交

---
 src/main/java/com/product/system/backup/service/SystemBackupService.java |    9 +++------
 1 files changed, 3 insertions(+), 6 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 f9b4dfe..203789a 100644
--- a/src/main/java/com/product/system/backup/service/SystemBackupService.java
+++ b/src/main/java/com/product/system/backup/service/SystemBackupService.java
@@ -34,7 +34,7 @@
  *	闄勪欢澶囦唤锛氭瘡澶╂墽琛屼唬鐮佸浠藉綋澶╅檮浠�
  *	閬楃暀闂锛氶檮浠惰淇敼锛屼笉鑳介攣瀹氶潪褰撳ぉ琚慨鏀圭殑闄勪欢
  */
-@Service("systemBackService")
+@Service("systemBackService1")
 public class SystemBackupService {
 	
 	// 澶囦唤閰嶇疆
@@ -105,7 +105,7 @@
 		log.writeInfo("銆愮郴缁熷浠借繘绋嬨�戠郴缁熷浠借繘绋嬬粨鏉燂紝鑰楁椂.................." + ((end - start) / 1000) + "绉�", BackupLogger.INFO_TYPE);
 		System.out.println("绯荤粺澶囦唤鑰楁椂.................." + ((end - start) / 1000) + "绉�");
 	}
-
+	
 	/**
 	 * 绗竴姝ワ細鍒濆閰嶇疆鏂囦欢鍙傛暟,褰撳墠鐩綍鐢熸垚鏃堕棿鎴崇殑鏂囦欢澶�
 	 */
@@ -121,11 +121,8 @@
 			// 鑾峰彇绯荤粺鏂囦欢璺緞
 			String systemFileFolder = Global.getSystemConfig("local.dir", "");
 			File newFile= new File(systemFileFolder);
-			if (!newFile.isAbsolute()) {
-				systemFileFolder = System.getProperty("user.dir") + File.separator + systemFileFolder;
-			}
 			// 绯荤粺闄勪欢瀛樻斁鐩綍(褰撳ぉ闄勪欢)
-			config.setProperty("DOCUMENT_ROOT", systemFileFolder + File.separator + "00000000-0000-0000-0000-000000000000" + File.separator + NUMBER_DATE);
+			config.setProperty("DOCUMENT_ROOT", newFile.getAbsolutePath() + File.separator + "00000000-0000-0000-0000-000000000000" + File.separator + NUMBER_DATE);
 			// 鏁版嵁搴撳浠界洰褰曪紙鏁版嵁搴撳浠芥牴鐩綍+鏃堕棿鏂囦欢鍚�+.sql锛�
 			config.setProperty("DATABASE_BACKUP", config.getProperty("DATABASE_ROOT") + File.separator + NUMBER_TIME + ".sql");
 			// 澶囦唤鐩爣鏂囦欢锛圸IP澶囦唤鏍圭洰褰�+鏃堕棿鏂囦欢鍚�+.zip锛�

--
Gitblit v1.9.2