From 48105770c382f00d7998506392b4683f9c90aff0 Mon Sep 17 00:00:00 2001
From: mshe <666666666@666666666.666666666>
Date: Thu, 28 May 2026 14:55:22 +0800
Subject: [PATCH] update start.sh

---
 pre_install.sh => pre_install_spider.sh |  0
 sh/install.sh                           |  6 +++---
 sh/start.sh                             | 18 +++++++-----------
 sh/update.sh                            |  4 ++--
 start_spider.sh                         |  7 +++++++
 5 files changed, 19 insertions(+), 16 deletions(-)
 rename pre_install.sh => pre_install_spider.sh (100%)
 create mode 100644 start_spider.sh

diff --git a/pre_install.sh b/pre_install_spider.sh
similarity index 100%
rename from pre_install.sh
rename to pre_install_spider.sh
diff --git a/sh/install.sh b/sh/install.sh
index 8d86f62..7a32976 100644
--- a/sh/install.sh
+++ b/sh/install.sh
@@ -131,9 +131,9 @@ pre_install_spider(){
     cd $PUBLIC_DIR
     sudo git clone $GIT_PY_SPIDER
     cd learn-spider
-    sudo chmod +x ./pre_install.sh
-    sudo chmod +x ./run.sh
-    sudo ./pre_install.sh
+    sudo chmod +x ./pre_install_spider.sh
+    sudo chmod +x ./start_spider.sh
+    sudo ./pre_install_spider.sh
     echo "✅ [完成] 爬虫环境安装完成"
     echo ""
 }
diff --git a/sh/start.sh b/sh/start.sh
index 35e5580..9075305 100644
--- a/sh/start.sh
+++ b/sh/start.sh
@@ -5,24 +5,20 @@ username="user$INDEX"
 export DISPLAY=:$INDEX
 echo "当前显示桌面:$DISPLAY"
 
-echo "正在启动Xvfb虚拟显示"
-sudo su - "$username" -c "Xvfb :$INDEX -screen 0 1280x800x24 &"
-sleep 2
-
 echo "正在启动VNC服务"
-sudo su - "$username" -c "x11vnc -display :$INDEX -forever -nopw -rfbport $((5900 + INDEX)) &"
-
+sudo su - "$username" -c "vncserver :$INDEX -geometry 1280x800 -depth 24 -localhost no"
+echo "授权桌面访问"
+sudo su - "$username" -c "export DISPLAY=:$INDEX && xhost +" 2>/dev/null
 echo "等待 VNC 启动"
 sleep 3
 
 start_spider(){
   cd $PUBLIC_DIR/learn-spider
-  sudo -E ./run.sh
+  sudo -E ./start_spider.sh   # -E 保留当前环境变量
 }
 
 echo "启动爬虫"
 start_spider $INDEX
-
-echo "爬虫执行完毕,关闭VNC"
-sudo pkill -f "x11vnc.*$INDEX"
-sudo pkill -f "Xvfb :$INDEX"
\ No newline at end of file
+echo "爬虫执行完毕,60秒后关闭VNC"
+sleep 60
+sudo su - "$username" -c "vncserver -kill :$INDEX" 2>/dev/null
diff --git a/sh/update.sh b/sh/update.sh
index 2e87deb..6d2d7a9 100644
--- a/sh/update.sh
+++ b/sh/update.sh
@@ -12,6 +12,6 @@ else
     cd learn-spider
 fi
 
-sudo chmod +x ./pre_install.sh ./run.sh
-sudo ./pre_install.sh
+sudo chmod +x ./pre_install_spider.sh ./start_spider.sh
+sudo ./pre_install_spider.sh
 echo "✅ [完成] 爬虫更新完成"
\ No newline at end of file
diff --git a/start_spider.sh b/start_spider.sh
new file mode 100644
index 0000000..3b66a6d
--- /dev/null
+++ b/start_spider.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+spider=$1
+if [ -z "$spider" ]; then
+  echo "Usage: $0 <spider>"
+  exit 1
+fi
+#.venv/bin/python3.12 spider/china_net.py
\ No newline at end of file