From 3d6878fe9f40b672fd9b51bcff7508dec33a6431 Mon Sep 17 00:00:00 2001
From: LXW <1264174498@qq.com>
Date: Sat, 7 Oct 2023 12:00:33 +0800
Subject: [PATCH] (improvement)(script) optimize bat script encoding (#168)

* (improvement)(script) optimize bat script encoding

---------

Co-authored-by: jolunoluo
---
 assembly/bin/supersonic-daemon.bat | 38 ++++++++++++++++++++----------
 webapp/start-fe-dev.bat            | 14 ++++-------
 webapp/start-fe-prod.bat           | 34 ++++----------------------
 3 files changed, 35 insertions(+), 51 deletions(-)

diff --git a/assembly/bin/supersonic-daemon.bat b/assembly/bin/supersonic-daemon.bat
index 7ca1211a7..623a863f1 100644
--- a/assembly/bin/supersonic-daemon.bat
+++ b/assembly/bin/supersonic-daemon.bat
@@ -49,27 +49,24 @@ if "%command%"=="restart" (
     goto :EOF
 
 :STOP
-    for /f "tokens=2" %%i in ('tasklist ^| findstr /i "python"') do (
-         taskkill /PID %%i /F
-         echo "python service (PID = %%i) is killed."
-    )
-    for /f "tokens=2" %%i in ('tasklist ^| findstr /i "java"') do (
-         taskkill /PID %%i /F
-         echo "java service (PID = %%i) is killed."
+    if "%service%"=="%llmparser_service%" (
+        call :STOP_PYTHON
+        goto :EOF
     )
+    call :STOP_PYTHON
+    call :STOP_JAVA
     goto :EOF
 
-
 :START_PYTHON
-   echo 'python service starting'
+   echo 'python service starting, see logs in llmparser/llmparser.log'
    cd "%pythonRunDir%"
    start /B %python_path% supersonic_llmparser.py  > %pythonRunDir%\llmparser.log 2>&1
-   timeout /t 6 >nul
-   echo 'python service started, see logs in llmparser/llmparser.log'
+   timeout /t 10 >nul
+   echo 'python service started'
    goto :EOF
 
 :START_JAVA
-  echo 'java service starting'
+  echo 'java service starting, see logs in logs/'
    cd "%javaRunDir%"
    if not exist "%runtimeDir%\supersonic-standalone\logs" mkdir "%runtimeDir%\supersonic-standalone\logs"
    set "libDir=%runtimeDir%\supersonic-%service%\lib"
@@ -78,7 +75,22 @@ if "%command%"=="restart" (
    set "classpath=%confDir%;%webDir%;%libDir%\*"
    set "java-command=-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Xms1024m -Xmx2048m -cp %CLASSPATH% %MAIN_CLASS%"
    start /B java %java-command% >nul 2>&1
-   echo 'java service started, see logs in logs/'
+   timeout /t 10 >nul
+   echo 'java service started'
+   goto :EOF
+
+:STOP_PYTHON
+   for /f "tokens=2" %%i in ('tasklist ^| findstr /i "python"') do (
+           taskkill /PID %%i /F
+           echo "python service (PID = %%i) is killed."
+   )
+   goto :EOF
+
+:STOP_JAVA
+   for /f "tokens=2" %%i in ('tasklist ^| findstr /i "java"') do (
+            taskkill /PID %%i /F
+            echo "java service (PID = %%i) is killed."
+   )
    goto :EOF
 
 :RELOAD_EXAMPLE
diff --git a/webapp/start-fe-dev.bat b/webapp/start-fe-dev.bat
index 6d64916c0..afc86c458 100644
--- a/webapp/start-fe-dev.bat
+++ b/webapp/start-fe-dev.bat
@@ -1,28 +1,24 @@
 @echo off
 
-:: 获取Node.js版本
 for /f "delims=" %%i in ('node -v') do set "node_version=%%i"
 
-:: 提取主版本号
 for /f "tokens=2 delims=v." %%i in ("%node_version%") do set "major_version=%%i"
 
 if %major_version% GEQ 17 (
   set "NODE_OPTIONS=--openssl-legacy-provider"
-  echo Node.js版本大于等于17，已设置NODE_OPTIONS为--openssl-legacy-provider
+  echo Node.js version is greater than or equal to 17. NODE_OPTIONS has been set to --openssl-legacy-provider.
 )
-
-:: 检查pnpm是否未安装
 where /q pnpm
 if errorlevel 1 (
-  echo pnpm未安装，正在进行安装...
+  echo pnpm is not installed. Installing...
   npm install -g pnpm
   if errorlevel 1 (
-    echo pnpm安装失败，请检查npm是否已安装并且网络连接正常
+    echo Failed to install pnpm. Please check if npm is installed and the network connection is working.
   ) else (
-    echo pnpm安装成功
+    echo pnpm installed successfully.
   )
 ) else (
-  echo pnpm已安装
+  echo pnpm is already installed.
 )
 
 rmdir /s /q ".\packages\supersonic-fe\src\.umi"
diff --git a/webapp/start-fe-prod.bat b/webapp/start-fe-prod.bat
index 3729e0e5d..beddcf5bc 100644
--- a/webapp/start-fe-prod.bat
+++ b/webapp/start-fe-prod.bat
@@ -1,58 +1,34 @@
-
 setlocal
-
-@echo off
-
-:: 获取Node.js版本
 for /f "delims=" %%i in ('node -v') do set "node_version=%%i"
-
-:: 提取主版本号
 for /f "tokens=2 delims=v." %%i in ("%node_version%") do set "major_version=%%i"
-
 if %major_version% GEQ 17 (
   set "NODE_OPTIONS=--openssl-legacy-provider"
-  echo Node.js版本大于等于17，已设置NODE_OPTIONS为--openssl-legacy-provider
+  echo Node.js version is greater than or equal to 17. NODE_OPTIONS has been set to --openssl-legacy-provider.
 )
-
-:: 检查pnpm是否未安装
 where /q pnpm
 if errorlevel 1 (
-  echo pnpm未安装，正在进行安装...
+  echo pnpm is not installed. Installing...
   npm install -g pnpm
   if errorlevel 1 (
-    echo pnpm安装失败，请检查npm是否已安装并且网络连接正常
+    echo Failed to install pnpm. Please check if npm is installed and the network connection is working.
   ) else (
-    echo pnpm安装成功
+    echo pnpm installed successfully.
   )
 ) else (
-  echo pnpm已安装
+  echo pnpm is already installed.
 )
 
-del /F /Q supersonic-webapp.tar.gz
-
 rmdir /S /Q .\packages\supersonic-fe\src\.umi
 rmdir /S /Q .\packages\supersonic-fe\src\.umi-production
-
 cd ./packages/chat-sdk
-
 call pnpm i
-
 call pnpm run build
-
 call pnpm link --global
-
 cd ../supersonic-fe
-
 call pnpm link ../chat-sdk
-
 call pnpm i
-
 call pnpm run build:os-local
-
 tar -zcvf supersonic-webapp.tar.gz supersonic-webapp
-
 move supersonic-webapp.tar.gz ..\..\
-
 cd ..
-
 endlocal
\ No newline at end of file