From e77e096fbfcc1bf525b9ea3382a26abe111c957d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 05 三月 2026 18:03:42 +0800
Subject: [PATCH] 更改头部

---
 server/startsh/admin_start.sh |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/server/startsh/admin_start.sh b/server/startsh/admin_start.sh
index cbe3d71..42bdaad 100644
--- a/server/startsh/admin_start.sh
+++ b/server/startsh/admin_start.sh
@@ -8,28 +8,12 @@
 
 /usr/local/nacos/nacos/bin/startup.sh -m standalone
 
-<<<<<<< HEAD
-nohup java -jar /usr/local/jars/system_gateway.jar > /dev/null 2>&1 &
-nohup java -jar /usr/local/jars/admin_timer.jar > /dev/null 2>&1 &
-nohup java -jar /usr/local/jars/system_timer.jar > /dev/null 2>&1 &
-nohup java -jar /usr/local/jars/admin_interface.jar > /dev/null 2>&1 &
-nohup java -jar /usr/local/jars/meeting_admin.jar > /dev/null 2>&1 &
-
-#tail -f /usr/local/jars/logs/visitsTimer/info.2025-10-20.1.log
-#tail -f /usr/local/jars/logs/visitsAdmin/info.2025-10-24.1.log
-#tail -f /usr/local/jars/logs/system_gateway/info.2025-10-20.1.log
-#tail -f /usr/local/jars/logs/systemTimer/info.2025-10-20.1.log
-#tail -f /usr/local/jars/logs/meetingAdmin/info.2025-10-20.1.log
-=======
 nohup java -jar /usr/local/jars/visits/system_gateway.jar > /dev/null 2>&1 &
 nohup java -jar /usr/local/jars/visits/admin_timer.jar > /dev/null 2>&1 &
 nohup java -jar /usr/local/jars/visits/system_timer.jar > /dev/null 2>&1 &
 nohup java -jar /usr/local/jars/visits/admin_interface.jar > /dev/null 2>&1 &
 nohup java -jar /usr/local/jars/visits/meeting_admin.jar > /dev/null 2>&1 &
 
-
-
 cd /usr/local/ortools/java_or-tools
 
 
->>>>>>> 5e91539195106afc3a03e7bd006786409ecd9b5d

--
Gitblit v1.9.3