From 81e540dda8fe3c554007c5a29cf46104b2ec32b3 Mon Sep 17 00:00:00 2001
From: yuejiajun <1530620364@qq.com>
Date: Thu, 14 Aug 2025 19:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=9C=8D=E5=8A=A1=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template-initialize-and-start-mysql.bat   |  4 +--
 .../template-register-mysql-with-data.bat     | 32 ++++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/base/Resources/mysql/template-initialize-and-start-mysql.bat b/base/Resources/mysql/template-initialize-and-start-mysql.bat
index 65072d7..e353a17 100644
--- a/base/Resources/mysql/template-initialize-and-start-mysql.bat
+++ b/base/Resources/mysql/template-initialize-and-start-mysql.bat
@@ -29,7 +29,7 @@ if errorlevel 1 (
 )
 
 :: 2. 注册MySQL服务
-echo [2/4] 正在注册MySQL服务...
+echo [2/4] 正在注册MySQL服务[%SERVICE_NAME%]...
 "%MYSQL_BIN_PATH%\mysqld" --install "%SERVICE_NAME%" --defaults-file="%MY_INI_PATH%"
 if errorlevel 1 (
     echo 服务注册失败
@@ -37,7 +37,7 @@ if errorlevel 1 (
 )
 
 :: 3. 启动MySQL服务
-echo [3/4] 正在启动MySQL服务...
+echo [3/4] 正在启动MySQL服务[%SERVICE_NAME%]...
 net start "%SERVICE_NAME%"
 if errorlevel 1 (
     echo 服务启动失败
diff --git a/base/Resources/mysql/template-register-mysql-with-data.bat b/base/Resources/mysql/template-register-mysql-with-data.bat
index d68656a..e9201dc 100644
--- a/base/Resources/mysql/template-register-mysql-with-data.bat
+++ b/base/Resources/mysql/template-register-mysql-with-data.bat
@@ -10,36 +10,38 @@ if %errorLevel% neq 0 (
     exit /b 1
 )
 
-:: 1. 停止并删除现有MySQL服务
-echo 正在停止MySQL服务...
-net stop MySQL >nul 2>&1
+set "SERVICE_NAME=x_database"
 
-echo 正在删除已有的MySQL服务...
-sc delete MySQL >nul 2>&1
+:: 1. 停止并删除现有MySQL服务
+echo 正在停止MySQL服务[%SERVICE_NAME%]...
+net stop %SERVICE_NAME% >nul 2>&1
+
+echo 正在删除已有的MySQL服务[%SERVICE_NAME%]...
+sc delete %SERVICE_NAME% >nul 2>&1
 if %errorLevel% equ 0 (
-    echo [成功] MySQL服务已删除
+    echo [成功] MySQL服务[%SERVICE_NAME%]已删除
 ) else (
-    echo [警告] 删除MySQL服务失败(可能服务不存在)
+    echo [警告] 删除MySQL服务[%SERVICE_NAME%]失败(可能服务不存在)
 )
 
 :: 2. 安装MySQL服务
-echo 正在安装MySQL服务...
-mysqld --install MySQL --defaults-file="%INSTALLPATH%\my.ini"
+echo 正在安装MySQL服务[%SERVICE_NAME%]...
+mysqld --install %SERVICE_NAME% --defaults-file="%INSTALLPATH%\my.ini"
 if %errorLevel% equ 0 (
-    echo [成功] MySQL服务安装完成
+    echo [成功] MySQL服务[%SERVICE_NAME%]安装完成
 ) else (
-    echo [错误] MySQL服务安装失败
+    echo [错误] MySQL服务[%SERVICE_NAME%]安装失败
     pause
     exit /b 1
 )
 
 :: 3. 启动MySQL服务
-echo 正在启动MySQL服务...
-net start MySQL
+echo 正在启动MySQL服务[%SERVICE_NAME%]...
+net start %SERVICE_NAME%
 if %errorLevel% equ 0 (
-    echo [成功] MySQL服务已启动
+    echo [成功] MySQL服务[%SERVICE_NAME%]已启动
 ) else (
-    echo [错误] MySQL服务启动失败
+    echo [错误] MySQL服务[%SERVICE_NAME%]启动失败
     pause
     exit /b 1
 )