Package standalone app and automate MySQL setup
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -2,3 +2,6 @@ __pycache__/
|
||||
*.py[cod]
|
||||
.superpowers/
|
||||
.deploy_tool_config/
|
||||
build/
|
||||
release/
|
||||
*.spec
|
||||
|
||||
@@ -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 官方地址下载并校验后安装到当前用户目录;其他常用开发环境通过 `winget` 辅助安装,执行安装前会要求用户确认。
|
||||
- Maven 和 Tomcat 从 Apache 官方地址下载并校验后安装到当前用户目录;MySQL、JDK、Node.js 等环境通过 `winget` 接受软件源和包协议后无人值守安装,执行安装前会要求用户确认。
|
||||
- 使用 Maven 或 Gradle 构建后端;已有可运行 JAR/WAR 时自动跳过重复构建。
|
||||
- 将传统 SSM 项目的 WAR 发布到 Tomcat 9,并等待 8080 端口就绪。
|
||||
- 前端缺少 `node_modules` 时自动执行 `npm install`,随后运行 `serve`、`dev` 或 `start` 脚本。
|
||||
@@ -38,7 +38,7 @@ python main.py
|
||||
1. 选择包含后端、前端和 SQL 文件的项目根目录。
|
||||
2. 点击“扫描项目”,确认识别到的组件和推荐 JDK 版本。
|
||||
3. 点击“检测环境”;缺失的工具可以通过“安装环境”处理,也可以手动选择可执行文件。
|
||||
4. 如果需要导入 SQL,填写 MySQL 用户、密码和数据库名。数据库名默认取第一个 SQL 文件的文件名。
|
||||
4. 如果需要导入 SQL,填写 MySQL 用户、密码和数据库名。数据库名默认取第一个 SQL 文件的文件名。MySQL 可在“安装环境”中自动安装;首次使用时填写安装过程中配置的 root 密码。
|
||||
5. 点击“执行部署”,在运行日志中查看每个步骤和最终访问地址。
|
||||
|
||||
当前默认端口如下:
|
||||
|
||||
@@ -437,11 +437,9 @@ def _restart_backend(
|
||||
log_file.write(f"\n\n===== 后端部署 {started_at},端口 {port} =====\n")
|
||||
log_file.flush()
|
||||
if os.name == "nt":
|
||||
console_runner = Path(__file__).with_name("service_console.py")
|
||||
process = popen(
|
||||
[
|
||||
sys.executable,
|
||||
str(console_runner),
|
||||
*_service_console_launcher(),
|
||||
"--title",
|
||||
f"后端服务 - 端口 {port}",
|
||||
"--log",
|
||||
@@ -488,6 +486,13 @@ def _restart_backend(
|
||||
return 1
|
||||
|
||||
|
||||
def _service_console_launcher() -> list[str]:
|
||||
if getattr(sys, "frozen", False):
|
||||
return [sys.executable, "--service-console"]
|
||||
console_runner = Path(__file__).with_name("service_console.py")
|
||||
return [sys.executable, str(console_runner)]
|
||||
|
||||
|
||||
def _restart_ssm_backend(
|
||||
command: list[str],
|
||||
cwd: Path,
|
||||
|
||||
@@ -366,10 +366,17 @@ class DeployWorkbench(tk.Tk):
|
||||
except ValueError as exc:
|
||||
messagebox.showwarning("暂不支持自动安装", str(exc))
|
||||
return
|
||||
mysql_note = ""
|
||||
if tool_name == "MySQL":
|
||||
mysql_note = (
|
||||
"\n\n将安装 MySQL Community Server 及官方工具。首次安装后,请在部署配置中填写实际的 "
|
||||
"root 用户密码;程序不会生成、保存或显示默认数据库密码。"
|
||||
)
|
||||
if not messagebox.askyesno(
|
||||
f"确认安装 {tool_name}",
|
||||
f"即将通过 winget 安装 {tool_name}。\n\n"
|
||||
f"命令: {' '.join(command)}\n\n"
|
||||
f"命令: {' '.join(command)}"
|
||||
f"{mysql_note}\n\n"
|
||||
"安装可能需要管理员权限,并可能修改 PATH。是否继续?",
|
||||
):
|
||||
return
|
||||
|
||||
@@ -76,7 +76,16 @@ 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 ["winget", "install", "-e", "--id", package_id]
|
||||
return [
|
||||
"winget",
|
||||
"install",
|
||||
"--exact",
|
||||
"--id",
|
||||
package_id,
|
||||
"--accept-source-agreements",
|
||||
"--accept-package-agreements",
|
||||
"--disable-interactivity",
|
||||
]
|
||||
|
||||
|
||||
def default_maven_install_root() -> Path:
|
||||
|
||||
6
main.py
6
main.py
@@ -1,5 +1,11 @@
|
||||
import sys
|
||||
|
||||
from deploy_tool.gui import run_app
|
||||
from deploy_tool.service_console import main as run_service_console
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
if len(sys.argv) > 1 and sys.argv[1] == "--service-console":
|
||||
del sys.argv[1]
|
||||
raise SystemExit(run_service_console())
|
||||
run_app()
|
||||
|
||||
@@ -11,6 +11,12 @@ from deploy_tool.scanner import ProjectComponent, ScanResult
|
||||
|
||||
|
||||
class DeployerTests(unittest.TestCase):
|
||||
def test_frozen_app_reuses_executable_for_service_console(self):
|
||||
with patch.object(deployer_module.sys, "frozen", True, create=True):
|
||||
launcher = deployer_module._service_console_launcher()
|
||||
|
||||
self.assertEqual(launcher, [deployer_module.sys.executable, "--service-console"])
|
||||
|
||||
def test_extracts_backend_port_from_java_system_property(self):
|
||||
extract_port = getattr(deployer_module, "_extract_server_port", lambda command: None)
|
||||
|
||||
|
||||
@@ -78,12 +78,34 @@ class InstallerTests(unittest.TestCase):
|
||||
def test_builds_jdk_winget_install_command(self):
|
||||
command = build_install_command("JDK", version="8")
|
||||
|
||||
self.assertEqual(command, ["winget", "install", "-e", "--id", "EclipseAdoptium.Temurin.8.JDK"])
|
||||
self.assertEqual(
|
||||
command,
|
||||
[
|
||||
"winget",
|
||||
"install",
|
||||
"--exact",
|
||||
"--id",
|
||||
"EclipseAdoptium.Temurin.8.JDK",
|
||||
"--accept-source-agreements",
|
||||
"--accept-package-agreements",
|
||||
"--disable-interactivity",
|
||||
],
|
||||
)
|
||||
|
||||
def test_builds_node_winget_install_command(self):
|
||||
command = build_install_command("Node.js")
|
||||
|
||||
self.assertEqual(command, ["winget", "install", "-e", "--id", "OpenJS.NodeJS.LTS"])
|
||||
self.assertEqual(command[0:5], ["winget", "install", "--exact", "--id", "OpenJS.NodeJS.LTS"])
|
||||
self.assertIn("--accept-package-agreements", command)
|
||||
self.assertIn("--disable-interactivity", command)
|
||||
|
||||
def test_builds_unattended_mysql_winget_install_command(self):
|
||||
command = build_install_command("MySQL")
|
||||
|
||||
self.assertEqual(command[0:5], ["winget", "install", "--exact", "--id", "Oracle.MySQL"])
|
||||
self.assertIn("--accept-source-agreements", command)
|
||||
self.assertIn("--accept-package-agreements", command)
|
||||
self.assertIn("--disable-interactivity", command)
|
||||
|
||||
def test_maven_is_not_offered_as_an_invalid_winget_package(self):
|
||||
with self.assertRaises(ValueError):
|
||||
|
||||
Reference in New Issue
Block a user