From c76d5c8c78cebbf5b93b78eba95a4d636c5ff07a Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Mon, 3 Nov 2025 13:54:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0windows=E5=A4=87=E4=BB=BD?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B9=E4=BE=BF=E6=B5=8B=E8=AF=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backup/controller/FileController.java     |  5 +++++
 .../src/main/resources/application.yml        |  2 +-
 .../serviceimpl/EdFileInfoServiceImpl.java    |  4 ++--
 .../software/manage/tasks/BackupTask.java     | 20 +++++++++++++++----
 ...shDataStatusList.java => EleConstant.java} |  2 +-
 .../src/main/resources/application.properties |  2 +-
 6 files changed, 26 insertions(+), 9 deletions(-)
 rename electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/{FlushDataStatusList.java => EleConstant.java} (95%)

diff --git a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java
index dc02b23..c8d00cf 100644
--- a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java
+++ b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java
@@ -30,6 +30,11 @@ public class FileController {
     @Resource
     private BackupPro backupPro;
 
+    @RequestMapping("/ping")
+    public String ping() {
+        return "pong";
+    }
+
     @RequestMapping("/upload")
     public ElectromagneticResult<?> upload(@RequestParam("file") MultipartFile file) {
         BackupFileResLog backupFileResLog = BackupFileResLog.builder().backupStartTime(new Date()).fileName(file.getOriginalFilename()).backupSuccess(true).build();
diff --git a/electrmangnetic-backup/src/main/resources/application.yml b/electrmangnetic-backup/src/main/resources/application.yml
index 3a2744b..46698e4 100644
--- a/electrmangnetic-backup/src/main/resources/application.yml
+++ b/electrmangnetic-backup/src/main/resources/application.yml
@@ -15,4 +15,4 @@ server:
 
 file:
   enc:
-    passwd: adknfhkj87654knd
\ No newline at end of file
+    passwd: 123456
\ No newline at end of file
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index 55c65e1..29169ca 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -37,7 +37,7 @@ import com.electromagnetic.industry.software.manage.pojo.resp.FileProjectVO;
 import com.electromagnetic.industry.software.manage.pojo.resp.FileVersionViewVO;
 import com.electromagnetic.industry.software.manage.pojo.resp.UploadRecordVO;
 import com.electromagnetic.industry.software.manage.service.*;
-import com.electromagnetic.industry.software.manage.tasks.FlushDataStatusList;
+import com.electromagnetic.industry.software.manage.tasks.EleConstant;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -327,7 +327,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             log.error(info, e);
             throw new BizException(info);
         } finally {
-            FlushDataStatusList.add(id);
+            EleConstant.add(id);
         }
     }
 
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java
index b803fad..d78ac93 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java
@@ -9,6 +9,7 @@ import cn.hutool.core.text.StrFormatter;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.RuntimeUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.electromagnetic.industry.software.common.enums.EleDataStatusEnum;
@@ -62,8 +63,8 @@ public class BackupTask {
 
     @Scheduled(cron = "0 0 * * * ?")
     public void backup() {
-        if (EleCommonUtil.isWinOs()) {
-            log.info("运行环境为windows，不需要备份文件");
+        if (!isRemotePortListening(elePropertyConfig.getRemoteHost(), elePropertyConfig.getRemotePort())) {
+            log.info("备份环境连接失败，未备份文件");
             return;
         }
         // 首先查看备份失败的文件
@@ -179,7 +180,8 @@ public class BackupTask {
     @Scheduled(cron = "0 0 * * * ?")
     public void backupSql() {
         if (EleCommonUtil.isWinOs()) {
-            log.info("运行环境为windows，不需要备份SQL");
+//        if (EleCommonUtil.isRemotePortListening(elePropertyConfig.getRemoteHost(), elePropertyConfig.getRemotePort())) {
+            log.info("windows暂不支持sql文件备份");
             return;
         }
         try {
@@ -279,10 +281,20 @@ public class BackupTask {
     // 每 2 分钟执行一次
     @Scheduled(cron = "*/3 * * * * ?")
     public void updateFileStatus() {
-        String id = FlushDataStatusList.get();
+        String id = EleConstant.get();
         if (StrUtil.isNotEmpty(id)) {
             edFileInfoMapper.update(new EdFileInfo(), Wrappers.<EdFileInfo>lambdaUpdate().eq(EdFileInfo::getId, id).set(EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code));
         }
     }
 
+    private static boolean isRemotePortListening(String host, int port) {
+        try {
+            String url = StrFormatter.format("http://{}:{}/data/file/backup/ping", host, port);
+            HttpUtil.get(url);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
 }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/FlushDataStatusList.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/EleConstant.java
similarity index 95%
rename from electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/FlushDataStatusList.java
rename to electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/EleConstant.java
index e85668e..a6e595e 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/FlushDataStatusList.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/EleConstant.java
@@ -7,7 +7,7 @@ import java.util.Date;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class FlushDataStatusList {
+public class EleConstant {
 
     private static final Map<String, Date> MAP = new ConcurrentHashMap<>();
 
diff --git a/electrmangnetic/src/main/resources/application.properties b/electrmangnetic/src/main/resources/application.properties
index fe3b883..f0909f8 100644
--- a/electrmangnetic/src/main/resources/application.properties
+++ b/electrmangnetic/src/main/resources/application.properties
@@ -59,7 +59,7 @@ prj.folder.max.length=6
 # backupFiles
 tmp.file.store.hour=48
 backup.remote.host=127.0.0.1
-backup.remote.port=1111
+backup.remote.port=12491
 backup.mysql.path=/workspace/mysqlbak/test
 backup.mysql.script.path=/workspace/mysqlbak/back_dev.sh