From 70f6d3bb43c2906538fa3b1940919a808efe2e80 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期二, 17 六月 2025 14:46:54 +0800
Subject: [PATCH] Squashed commit of the following:
---
src/main/java/com/product/system/backup/service/SystemBackupService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 4acbe44..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) + "绉�");
}
-
+
/**
* 绗竴姝ワ細鍒濆閰嶇疆鏂囦欢鍙傛暟,褰撳墠鐩綍鐢熸垚鏃堕棿鎴崇殑鏂囦欢澶�
*/
@@ -118,8 +118,11 @@
// 璇诲彇澶囦唤閰嶇疆鏂囦欢
config = new Properties();
config.load(reader);
+ // 鑾峰彇绯荤粺鏂囦欢璺緞
+ String systemFileFolder = Global.getSystemConfig("local.dir", "");
+ File newFile= new File(systemFileFolder);
// 绯荤粺闄勪欢瀛樻斁鐩綍(褰撳ぉ闄勪欢)
- 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);
+ 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