From 5e5e075d33b58b1270bf86328444a9f0cb945e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=B9=8F?= Date: Fri, 9 Oct 2026 08:45:18 +0800 Subject: [PATCH] Pin MySQL installer to 8.0.43 --- README.md | 2 +- deploy_tool/gui.py | 3 ++- deploy_tool/installer.py | 10 ++++++++-- tests/test_installer.py | 3 +++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bb1c80f..833aafe 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ AutoDeploy 是一个面向 Windows 的 Spring Boot / SSM + Vue 本地自动化 - 从 Maven、Gradle 和 Spring Boot 配置中推断 Java 版本,推荐 JDK 8、11、17 或 21。 - 检测 JDK、Maven、Tomcat、Gradle、Node.js、npm、Vue CLI、MySQL 和 Git。 - 支持手动指定工具路径,并可将工具目录写入当前用户的 `PATH`;JDK、Maven、Tomcat 和 Gradle 会同步设置对应的环境变量。 -- Maven 和 Tomcat 从 Apache 官方地址下载并校验后安装到当前用户目录;MySQL、JDK、Node.js 等环境通过 `winget` 接受软件源和包协议后无人值守安装,执行安装前会要求用户确认。 +- Maven 和 Tomcat 从 Apache 官方地址下载并校验后安装到当前用户目录;MySQL 通过 `winget` 固定安装 8.0.43,JDK、Node.js 等环境通过 `winget` 接受软件源和包协议后无人值守安装,执行安装前会要求用户确认。 - 使用 Maven 或 Gradle 构建后端;已有可运行 JAR/WAR 时自动跳过重复构建。 - 将传统 SSM 项目的 WAR 发布到 Tomcat 9,并等待 8080 端口就绪。 - 前端缺少 `node_modules` 时自动执行 `npm install`,随后运行 `serve`、`dev` 或 `start` 脚本。 diff --git a/deploy_tool/gui.py b/deploy_tool/gui.py index d4976d9..331ec82 100644 --- a/deploy_tool/gui.py +++ b/deploy_tool/gui.py @@ -10,6 +10,7 @@ from .deployer import DeploymentConfig, build_deployment_plan, run_steps from .environment import EnvironmentCheck, check_environment, load_tool_paths, save_tool_paths from .installer import ( MAVEN_VERSION, + MYSQL_VERSION, TOMCAT_VERSION, build_install_command, install_maven, @@ -371,7 +372,7 @@ class DeployWorkbench(tk.Tk): mysql_note = "" if tool_name == "MySQL": mysql_note = ( - "\n\n将安装 MySQL Community Server 及官方工具。首次安装后,请在部署配置中填写实际的 " + f"\n\n将安装 MySQL Community Server {MYSQL_VERSION} 及官方工具。首次安装后,请在部署配置中填写实际的 " "root 用户密码;程序不会生成、保存或显示默认数据库密码。" ) if not messagebox.askyesno( diff --git a/deploy_tool/installer.py b/deploy_tool/installer.py index 51e1dc6..5aac77d 100644 --- a/deploy_tool/installer.py +++ b/deploy_tool/installer.py @@ -35,6 +35,7 @@ MAVEN_DOWNLOAD_BASE = f"https://dlcdn.apache.org/maven/maven-3/{MAVEN_VERSION}/b TOMCAT_VERSION = "9.0.122" TOMCAT_ARCHIVE_NAME = f"apache-tomcat-{TOMCAT_VERSION}-windows-x64.zip" TOMCAT_DOWNLOAD_BASE = f"https://dlcdn.apache.org/tomcat/tomcat-9/v{TOMCAT_VERSION}/bin" +MYSQL_VERSION = "8.0.43" ANSI_PATTERN = re.compile(r"\x1b\[[0-?]*[ -/]*[@-~]") PERCENT_PATTERN = re.compile(r"(\d{1,3})\s*%") @@ -76,16 +77,21 @@ def build_install_command(tool_name: str, version: str | None = None) -> list[st package_id = WINGET_PACKAGES.get(tool_name) if not package_id: raise ValueError(f"\u4e0d\u652f\u6301\u81ea\u52a8\u5b89\u88c5: {tool_name}") - return [ + command = [ "winget", "install", "--exact", "--id", package_id, + ] + if tool_name == "MySQL": + command.extend(["--version", MYSQL_VERSION]) + command.extend([ "--accept-source-agreements", "--accept-package-agreements", "--disable-interactivity", - ] + ]) + return command def default_maven_install_root() -> Path: diff --git a/tests/test_installer.py b/tests/test_installer.py index 9f4647a..98efb94 100644 --- a/tests/test_installer.py +++ b/tests/test_installer.py @@ -7,6 +7,7 @@ from pathlib import Path from deploy_tool.installer import ( MAVEN_ARCHIVE_NAME, + MYSQL_VERSION, TOMCAT_VERSION, install_maven, install_tomcat, @@ -103,6 +104,8 @@ class InstallerTests(unittest.TestCase): command = build_install_command("MySQL") self.assertEqual(command[0:5], ["winget", "install", "--exact", "--id", "Oracle.MySQL"]) + self.assertEqual(command[command.index("--version") + 1], MYSQL_VERSION) + self.assertEqual(MYSQL_VERSION, "8.0.43") self.assertIn("--accept-source-agreements", command) self.assertIn("--accept-package-agreements", command) self.assertIn("--disable-interactivity", command)