From 8739964ef722bd9bc44fe5ff3f603c7ab850b271 Mon Sep 17 00:00:00 2001
From: mshe <666666666@666666666.666666666>
Date: Mon, 8 Jun 2026 15:42:23 +0800
Subject: [PATCH] update start.sh

---
 app.py              |  2 +-
 bin/close_vnc.sh    |  5 +++++
 bin/start.sh        | 27 ---------------------------
 bin/start_spider.sh | 13 +++++++++++++
 bin/start_vnc.sh    | 12 ++++++++++++
 5 files changed, 31 insertions(+), 28 deletions(-)
 create mode 100644 bin/close_vnc.sh
 delete mode 100644 bin/start.sh
 create mode 100644 bin/start_spider.sh
 create mode 100644 bin/start_vnc.sh

diff --git a/app.py b/app.py
index f3a42ba..07e6568 100755
--- a/app.py
+++ b/app.py
@@ -33,7 +33,7 @@ async def run_spider_in_vnc(index: int) -> str:
     try:
         # 调用外部 start.sh 脚本，传入 index 作为参数
         process = await asyncio.create_subprocess_exec(
-            "/home/dgs/vnc-server/start.sh",
+            "/home/dgs/vnc-server/start_vnc.sh",
             str(index),
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE
diff --git a/bin/close_vnc.sh b/bin/close_vnc.sh
new file mode 100644
index 0000000..dd6c96a
--- /dev/null
+++ b/bin/close_vnc.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+INDEX=$1
+username="user$INDEX"
+
+sudo su - "$username" -c "vncserver -kill :$INDEX" 2>/dev/null
diff --git a/bin/start.sh b/bin/start.sh
deleted file mode 100644
index f663016..0000000
--- a/bin/start.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-INDEX=$1
-spider_code=$2
-PUBLIC_DIR="${3:-/shared}"
-username="user$INDEX"
-export DISPLAY=:$INDEX
-echo "当前显示桌面:$DISPLAY"
-
-echo "正在启动VNC服务"
-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
-  echo "$PUBLIC_DIR/learn-spider"
-  echo "正在启动爬虫$spider_code"
-  sudo -E ./start_spider.sh $spider_code  # -E 保留当前环境变量
-}
-
-# echo "启动爬虫"
-# start_spider
-# echo "爬虫执行完毕,20秒后关闭VNC"
-# sleep 20
-# sudo su - "$username" -c "vncserver -kill :$INDEX" 2>/dev/null
diff --git a/bin/start_spider.sh b/bin/start_spider.sh
new file mode 100644
index 0000000..a7c254e
--- /dev/null
+++ b/bin/start_spider.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+spider_code=$1
+PUBLIC_DIR="${2:-/shared}"
+
+start_spider(){
+  cd $PUBLIC_DIR/learn-spider
+  echo "$PUBLIC_DIR/learn-spider"
+  echo "正在启动爬虫$spider_code"
+  sudo -E ./start_spider.sh $spider_code  # -E 保留当前环境变量
+}
+
+echo "启动爬虫"
+start_spider
\ No newline at end of file
diff --git a/bin/start_vnc.sh b/bin/start_vnc.sh
new file mode 100644
index 0000000..45ffc22
--- /dev/null
+++ b/bin/start_vnc.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+INDEX=$1
+username="user$INDEX"
+export DISPLAY=:$INDEX
+echo "当前显示桌面:$DISPLAY"
+
+echo "正在启动VNC服务"
+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
\ No newline at end of file