From ed171b3120c21c1baea6d6d16d22870ddab1536f Mon Sep 17 00:00:00 2001
From: lvzk <897706680@qq.com>
Date: Thu, 18 Dec 2025 17:33:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=85=B6=E5=AE=83=E8=8A=82=E7=82=B9=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/heartbeat/core/HeartbeatManager.java   |  4 ++--
 .../framework/heartbeat/dao/mapper/ServerMapper.java |  4 +++-
 .../framework/heartbeat/dao/mapper/ServerMapper.xml  | 12 +++++++++++-
 .../module/framework/service/FileServiceImpl.java    |  4 ++--
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/java/neatlogic/framework/heartbeat/core/HeartbeatManager.java b/src/main/java/neatlogic/framework/heartbeat/core/HeartbeatManager.java
index 4df7fd133..1ea595c1f 100644
--- a/src/main/java/neatlogic/framework/heartbeat/core/HeartbeatManager.java
+++ b/src/main/java/neatlogic/framework/heartbeat/core/HeartbeatManager.java
@@ -73,7 +73,7 @@ public class HeartbeatManager extends ModuleInitializedListenerBase {
                     ip = userFunctionValue;
                 }
             }
-            ServerClusterVo serverVo = serverMapper.getServerByServerId(Config.SCHEDULE_SERVER_ID);
+            ServerClusterVo serverVo = serverMapper.getServerLockByServerId(Config.SCHEDULE_SERVER_ID);
             if (serverVo != null && StringUtils.isNotBlank(serverVo.getIp())) {
                 if (!Objects.equals(serverVo.getIp(), ip)) {
                     System.err.println($.t("nfhc.heartbeatmanager.myinit.startupfailureprompt", Config.SCHEDULE_SERVER_ID, serverVo.getIp()));
@@ -150,7 +150,7 @@ public class HeartbeatManager extends ModuleInitializedListenerBase {
         TransactionStatus transactionStatus = TransactionUtil.openTx();
         boolean returnVal = false;
         try {
-            ServerClusterVo serverVo = serverMapper.getServerByServerId(serverId);
+            ServerClusterVo serverVo = serverMapper.getServerLockByServerId(serverId);
             if (serverVo != null) {
                 if (ServerClusterVo.STARTUP.equals(serverVo.getStatus())) {
                     serverVo.setStatus(ServerClusterVo.STOP);
diff --git a/src/main/java/neatlogic/framework/heartbeat/dao/mapper/ServerMapper.java b/src/main/java/neatlogic/framework/heartbeat/dao/mapper/ServerMapper.java
index 180550f95..c755a12ff 100644
--- a/src/main/java/neatlogic/framework/heartbeat/dao/mapper/ServerMapper.java
+++ b/src/main/java/neatlogic/framework/heartbeat/dao/mapper/ServerMapper.java
@@ -13,7 +13,9 @@ public interface ServerMapper {
     //SELECT
     List<Integer> getInactivatedServerIdList(@Param("fromServerId") int fromServerId, @Param("threshold") int threshold);
 
-    ServerClusterVo getServerByServerId(Integer serverId);
+    ServerClusterVo getServerLockByServerId(Integer serverId);
+
+    List<ServerClusterVo> getOtherStartUpServerByServerId(Integer serverId);
 
     List<ServerClusterVo> getAllServerList();
 
diff --git a/src/main/java/neatlogic/framework/heartbeat/dao/mapper/ServerMapper.xml b/src/main/java/neatlogic/framework/heartbeat/dao/mapper/ServerMapper.xml
index c3ca3ae10..7309b3569 100644
--- a/src/main/java/neatlogic/framework/heartbeat/dao/mapper/ServerMapper.xml
+++ b/src/main/java/neatlogic/framework/heartbeat/dao/mapper/ServerMapper.xml
@@ -8,7 +8,7 @@
           AND `counter` >= #{threshold}
     </select>
 
-    <select id="getServerByServerId" parameterType="java.lang.Integer" useCache="false"
+    <select id="getServerLockByServerId" parameterType="java.lang.Integer" useCache="false"
             resultType="neatlogic.framework.heartbeat.dto.ServerClusterVo">
         SELECT `host`,
                `server_id` AS serverId,
@@ -20,6 +20,16 @@
         UPDATE
     </select>
 
+    <select id="getOtherStartUpServerByServerId" parameterType="java.lang.Integer" useCache="false"
+            resultType="neatlogic.framework.heartbeat.dto.ServerClusterVo">
+        SELECT `host`,
+               `server_id` AS serverId,
+               `status`,
+               `ip`
+        FROM server_status
+        WHERE `server_id` != #{serverId} and `status` = 'startup'
+    </select>
+
     <select id="getAllServerList" useCache="true" resultType="neatlogic.framework.heartbeat.dto.ServerClusterVo">
         SELECT `host`,
                `server_id`           AS serverId,
diff --git a/src/main/java/neatlogic/module/framework/service/FileServiceImpl.java b/src/main/java/neatlogic/module/framework/service/FileServiceImpl.java
index 1810ec643..000aba83c 100644
--- a/src/main/java/neatlogic/module/framework/service/FileServiceImpl.java
+++ b/src/main/java/neatlogic/module/framework/service/FileServiceImpl.java
@@ -213,7 +213,7 @@ public class FileServiceImpl implements IFileCrossoverService {
     public JSONObject readRemoteFile(JSONObject paramObj, Integer serverId) {
         JSONObject resultObj = new JSONObject();
         String host = null;
-        ServerClusterVo serverClusterVo = serverMapper.getServerByServerId(serverId);
+        ServerClusterVo serverClusterVo = serverMapper.getServerLockByServerId(serverId);
         if (serverClusterVo != null) {
             host = serverClusterVo.getHost();
         } else {
@@ -297,7 +297,7 @@ public class FileServiceImpl implements IFileCrossoverService {
     @Override
     public void downloadRemoteFile(JSONObject paramObj, Integer serverId, HttpServletRequest request, HttpServletResponse response) throws IOException {
         String host;
-        ServerClusterVo serverClusterVo = serverMapper.getServerByServerId(serverId);
+        ServerClusterVo serverClusterVo = serverMapper.getServerLockByServerId(serverId);
         if (serverClusterVo != null) {
             host = serverClusterVo.getHost();
         } else {
-- 
Gitee


From 02d9498fbb596b5cc2298fad6241dc912ec47a86 Mon Sep 17 00:00:00 2001
From: lvzk <897706680@qq.com>
Date: Fri, 19 Dec 2025 11:48:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]serverId=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=20jvm=20option=E6=9D=A5=E9=85=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF=E7=A0=94=E5=8F=91=E6=B5=8B=E8=AF=95=E5=A4=9A?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=9C=BA=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/common/config/Config.java       | 83 ++++++++++---------
 1 file changed, 46 insertions(+), 37 deletions(-)

diff --git a/src/main/java/neatlogic/framework/common/config/Config.java b/src/main/java/neatlogic/framework/common/config/Config.java
index 18414c2bf..45494d2ed 100644
--- a/src/main/java/neatlogic/framework/common/config/Config.java
+++ b/src/main/java/neatlogic/framework/common/config/Config.java
@@ -510,48 +510,57 @@ public class Config {
     public static Properties properties = new Properties();
 
     private void initConfigFile() {
-        try {
-            StringBuilder sid = new StringBuilder(StringUtils.EMPTY);
-            BufferedReader br;
-            try (InputStream is = Config.class.getClassLoader().getResourceAsStream(SERVER_ID_FILE);) {
-                if (is != null) {
-                    try (InputStreamReader in = new InputStreamReader(is, StandardCharsets.UTF_8);) {
-                        br = new BufferedReader(in);
-                        String inLine = "";
-                        while ((inLine = br.readLine()) != null) {
-                            sid.append(inLine);
+        //本地开发测试多节点
+        if (StringUtils.isNotBlank(System.getProperty("serverId"))) {
+            try {
+                SCHEDULE_SERVER_ID = Integer.parseInt(System.getProperty("serverId"));
+            } catch (Exception ex) {
+                SCHEDULE_SERVER_ID = 9999;
+            }
+        } else {
+            try {
+                StringBuilder sid = new StringBuilder(StringUtils.EMPTY);
+                BufferedReader br;
+                try (InputStream is = Config.class.getClassLoader().getResourceAsStream(SERVER_ID_FILE);) {
+                    if (is != null) {
+                        try (InputStreamReader in = new InputStreamReader(is, StandardCharsets.UTF_8);) {
+                            br = new BufferedReader(in);
+                            String inLine = "";
+                            while ((inLine = br.readLine()) != null) {
+                                sid.append(inLine);
+                            }
                         }
-                    }
-                } else {
-                    String classpath = System.getenv("CLASSPATH");
-                    String[] split = classpath.split(":");
-                    System.out.println("配置文件目录：" + split[0]);
-                    File file = new File(split[0] + File.separator + SERVER_ID_FILE);
-                    if (!file.getParentFile().exists()) {
-                        file.getParentFile().mkdirs();
-                    }
-                    file.createNewFile();
-                    try (FileWriter fw = new FileWriter(file)) {
-                        Random random = new Random();
-                        int i = random.nextInt();
-                        if (i < 0) {
-                            i = Math.abs(i);
+                    } else {
+                        String classpath = System.getenv("CLASSPATH");
+                        String[] split = classpath.split(":");
+                        System.out.println("配置文件目录：" + split[0]);
+                        File file = new File(split[0] + File.separator + SERVER_ID_FILE);
+                        if (!file.getParentFile().exists()) {
+                            file.getParentFile().mkdirs();
+                        }
+                        file.createNewFile();
+                        try (FileWriter fw = new FileWriter(file)) {
+                            Random random = new Random();
+                            int i = random.nextInt();
+                            if (i < 0) {
+                                i = Math.abs(i);
+                            }
+                            sid.append(i);
+                            fw.write(sid.toString());
+                            fw.flush();
+                        } catch (Exception e) {
+                            logger.error(e.getMessage(), e);
                         }
-                        sid.append(i);
-                        fw.write(sid.toString());
-                        fw.flush();
-                    } catch (Exception e) {
-                        logger.error(e.getMessage(), e);
                     }
+                } catch (Exception e) {
+                    // logger.error(e.getMessage(), e);
                 }
-            } catch (Exception e) {
-                // logger.error(e.getMessage(), e);
+                SCHEDULE_SERVER_ID = Integer.parseInt(sid.toString());
+            } catch (Exception ex) {
+                logger.error("【缺少服务唯一标识】请在classpath所在目录创建文件：" + SERVER_ID_FILE + "，并填入一个正整数，正常启动后不要随意修改此数字，如果采用多活方式部署，唯一标识不能重复。");
+                System.out.println("【缺少服务唯一标识】请在classpath所在目录创建文件：" + SERVER_ID_FILE + "，并填入一个正整数，正常启动后不要随意修改此数字，如果采用多活方式部署，唯一标识不能重复。");
+                throw ex;
             }
-            SCHEDULE_SERVER_ID = Integer.parseInt(sid.toString());
-        } catch (Exception ex) {
-            logger.error("【缺少服务唯一标识】请在classpath所在目录创建文件：" + SERVER_ID_FILE + "，并填入一个正整数，正常启动后不要随意修改此数字，如果采用多活方式部署，唯一标识不能重复。");
-            System.out.println("【缺少服务唯一标识】请在classpath所在目录创建文件：" + SERVER_ID_FILE + "，并填入一个正整数，正常启动后不要随意修改此数字，如果采用多活方式部署，唯一标识不能重复。");
-            throw ex;
         }
 
 //        try {
-- 
Gitee