From aa90c5d5c0bd6e3ef0d05521fc4ae89794d26ac5 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Tue, 10 Oct 2023 16:38:51 +0800 Subject: [PATCH] fix build --- .github/workflows/build.yml | 1 - app/main.py | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49170eeb..64649737 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,7 +95,6 @@ jobs: New-Item -Path "nginx/temp/__keep__.txt" -ItemType File -Force New-Item -Path "nginx/logs" -ItemType Directory -Force New-Item -Path "nginx/logs/__keep__.txt" -ItemType File -Force - Rename-Item -Path "nginx/nginx.exe" -NewName "nginx_mp.exe" -Force shell: pwsh - name: Pyinstaller diff --git a/app/main.py b/app/main.py index 88aa19c1..635a149d 100644 --- a/app/main.py +++ b/app/main.py @@ -63,9 +63,9 @@ def start_frontend(): if not SystemUtils.is_frozen(): return if SystemUtils.is_windows(): - nginx_path = settings.ROOT_PATH / 'nginx' / 'nginx_mp.exe' + nginx_path = settings.ROOT_PATH / 'nginx' / 'nginx.exe' else: - nginx_path = settings.ROOT_PATH / 'nginx' / 'nginx_mp' + nginx_path = settings.ROOT_PATH / 'nginx' / 'nginx' if Path(nginx_path).exists(): import subprocess subprocess.Popen(f"start {nginx_path}", shell=True) @@ -79,9 +79,9 @@ def stop_frontend(): return import subprocess if SystemUtils.is_windows(): - subprocess.Popen(f"taskkill /f /im nginx_mp.exe", shell=True) + subprocess.Popen(f"taskkill /f /im nginx.exe", shell=True) else: - subprocess.Popen(f"killall nginx_mp", shell=True) + subprocess.Popen(f"killall nginx", shell=True) def start_tray():