diff --git a/datas/electromagnetic.jar b/datas/electromagnetic.jar index d2b60cb..9d64260 100644 Binary files a/datas/electromagnetic.jar and b/datas/electromagnetic.jar differ diff --git a/src/ComacDBInstall.py b/src/ComacDBInstall.py index 196038d..f2e6499 100644 --- a/src/ComacDBInstall.py +++ b/src/ComacDBInstall.py @@ -126,7 +126,7 @@ class InstallMariaDb: self.__set_java_env() # logger.info("生成脚本文件") # self.__set_bat() - logger.info("安装完成,10秒后自动退出") + logger.info("安装完成,10秒后进行数据库服务安装") time.sleep(10) pass @@ -202,6 +202,8 @@ class InstallComacDb: self.__delete_old_files(self.app_log_dir) self.__remove_pre_service() self.__register_and_start_service() + logger.info("运行完成,10秒钟后自动退出") + time.sleep(10) pass def __delete_old_files(self, directory, days=2): @@ -245,15 +247,15 @@ class InstallComacDb: ] # 执行安装命令 - print("Installing service...") + logger.info("Installing service...") result = subprocess.run(cmd, capture_output=True, text=True) if result.returncode != 0: - print("Error installing service:") - print(result.stderr) + logger.info("Error installing service:") + logger.info(result.stderr) return False - print("Service installed successfully!") + logger.info("Service installed successfully!") # 设置服务显示名称和描述 subprocess.run([str(self.nssm_exe), "set", self.service_name, "DisplayName", self.service_name]) @@ -265,16 +267,17 @@ class InstallComacDb: # 设置启动类型为自动(可选) subprocess.run([str(self.nssm_exe), "set", self.service_name, "Start", "SERVICE_AUTO_START"]) - print("Service configuration completed.") - print(f"You can now start the service with: net start {self.service_name}") + logger.info("Service configuration completed.") subprocess.run(rf"net start {self.service_name}") time.sleep(10) def __remove_pre_service(self): + logger.info("清理历史服务") stop_command = ["sc", "stop", self.service_name] delete_command = ["sc", "delete", self.service_name] subprocess.run(stop_command, capture_output=True, text=True) subprocess.run(delete_command, capture_output=True, text=True) + time.sleep(5) pass diff --git a/src/install.py b/src/install.py index 3638865..ebc8529 100644 --- a/src/install.py +++ b/src/install.py @@ -1,13 +1,14 @@ import os +import re +import shutil +import subprocess import sys import time import zipfile -import subprocess -import loguru + import elevate -import shutil +import loguru import psutil -import re root_path = r'D:\database' service_name = 'ComacMariaDB' diff --git a/src/start.py b/src/start.py index 4f33ef7..843391d 100644 --- a/src/start.py +++ b/src/start.py @@ -1,14 +1,13 @@ +import argparse import os -import time - -from loguru import logger +import re import subprocess import sys +import time from datetime import datetime -import re -import webview -import argparse +import webview +from loguru import logger # 获取当前脚本所在的目录 new_java_path = 'D:/database/jdk/bin/java.exe'