feat:更新启动脚本防止误杀进程

2024-05-25 15:25:08 +08:00
parent 398f729991
commit eff85c91db
2 changed files with 112 additions and 79 deletions
--- a/app_control.sh
+++ b/app_control.sh
@@ -1,46 +1,79 @@
-#!/bin/bash
-
-VENV_DIR=".venv"
-PYTHON_APP="main.py"
-
-start_app() {
-    source "$VENV_DIR/bin/activate"
-    nohup python3 $PYTHON_APP > output.log 2>&1 &
-    echo -e "\033[32m Application started! \033[0m"
-}
-
-stop_app() {
-    pid=$(ps aux | grep $PYTHON_APP | grep -v grep | awk '{print $2}')
-    if [ -n "$pid" ]; then
-        kill $pid
-        echo -e "\033[32m Application ended! \033[0m"
-    else
-        echo -e "\033[31m Application not runing! \033[0m"
-    fi
-}
-
-check_app_status() {
-    pid=$(ps aux | grep $PYTHON_APP | grep -v grep | awk '{print $2}')
-    if [ -n "$pid" ]; then
-        echo -e "PID:" $pid
-        echo -e "\033[32m Application runing! \033[0m"
-    else
-        echo -e "\033[31m Application not runing! \033[0m"
-    fi
-}
-
-case "$1" in
-    start)
-        start_app
-        ;;
-    stop)
-        stop_app
-        ;;
-    status)
-        check_app_status
-        ;;
-    *)
-        echo -e "\033[33m Usage: $0 {start|stop|status}\033[0m"
-        exit 1
-        ;;
-esac
+#!/bin/bash
+
+VENV_DIR=".venv"
+PYTHON_APP="main.py"
+LOG_FILE="output.log"
+PID_FILE="app.pid"
+
+start_app() {
+    if [ ! -d "$VENV_DIR" ]; then
+        echo -e "\033[31m Virtual environment directory $VENV_DIR not found! \033[0m"
+        exit 1
+    fi
+
+    if [ ! -f "$PYTHON_APP" ]; then
+        echo -e "\033[31m Python application $PYTHON_APP not found! \033[0m"
+        exit 1
+    fi
+
+    source "$VENV_DIR/bin/activate"
+    nohup python3 "$PYTHON_APP" > "$LOG_FILE" 2>&1 &
+    echo $! > "$PID_FILE"
+    echo -e "\033[32m Application started! \033[0m"
+}
+
+stop_app() {
+    if [ ! -f "$PID_FILE" ]; then
+        echo -e "\033[31m PID file not found! \033[0m"
+        exit 1
+    fi
+
+    pid=$(cat "$PID_FILE")
+    if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then
+        kill "$pid"
+        rm "$PID_FILE"
+        echo -e "\033[32m Application ended! \033[0m"
+    else
+        echo -e "\033[31m Application not running or PID not found! \033[0m"
+    fi
+}
+
+check_app_status() {
+    if [ ! -f "$PID_FILE" ]; then
+        echo -e "\033[31m Application not running! \033[0m"
+        exit 1
+    fi
+
+    pid=$(cat "$PID_FILE")
+    if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then
+        echo -e "PID: $pid"
+        echo -e "\033[32m Application running! \033[0m"
+    else
+        echo -e "\033[31m Application not running! \033[0m"
+    fi
+}
+
+restart_app() {
+    stop_app
+    start_app
+    echo -e "\033[32m Application restarted! \033[0m"
+}
+
+case "$1" in
+    start)
+        start_app
+        ;;
+    stop)
+        stop_app
+        ;;
+    status)
+        check_app_status
+        ;;
+    restart)
+        restart_app
+        ;;
+    *)
+        echo -e "\033[33m Usage: $0 {start|stop|status|restart} \033[0m"
+        exit 1
+        ;;
+esac
--- a/templates/fz.html
+++ b/templates/fz.html
@@ -13,39 +13,39 @@
 </head>

 <body>
-                    <h1>诈骗信息</h1>
-                            <table>
-                                <thead>
-                                    <tr>
-                                        <th>UUID</th>
-                                        <th>受害人号码</th>
-                                        <th>诈骗方式</th>
-                                        <th>诈骗类型</th>
-                                        <th>预警时间</th>
-                                        <th>预警等级</th>
-                                        <th>APP/URL名称</th>
-                                        <th>诈骗电话</th>
-                                        <th>通话时长</th>
-                                        <th>诈骗人账号</th>
-                                        <th>转账金额</th>
-                                        <th>机构授权码</th>
-                                        <th>学号</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    {% for item in data %}
-                                    <tr class="odd gradeX">
-                                        {% for v in item %}
-                                        {% if v == None %}
-                                        <td>-</td>
-                                        {% else %}
-                                        <td>{{v}}</td>
-                                        {% endif %}
-                                        {% endfor %}
-                                    </tr>
-                                    {% endfor %}
-                                </tbody>
-                            </table>
+    <h1>诈骗信息</h1>
+    <table>
+        <thead>
+            <tr>
+                <th>UUID</th>
+                <th>受害人号码</th>
+                <th>诈骗方式</th>
+                <th>诈骗类型</th>
+                <th>预警时间</th>
+                <th>预警等级</th>
+                <th>APP/URL名称</th>
+                <th>诈骗电话</th>
+                <th>通话时长</th>
+                <th>诈骗人账号</th>
+                <th>转账金额</th>
+                <th>机构授权码</th>
+                <th>学号</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for item in data %}
+            <tr class="odd gradeX">
+                {% for v in item %}
+                {% if v == None %}
+                <td>-</td>
+                {% else %}
+                <td>{{v}}</td>
+                {% endif %}
+                {% endfor %}
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
 </body>

 </html>