diff --git a/build.txt b/build.txt index ec5ff79..f2523af 100644 --- a/build.txt +++ b/build.txt @@ -1,6 +1,6 @@ cd src pyinstaller --onefile --add-data "install/Common.py:install" .\install\InstallMariaDB.py -pyinstaller --onefile --add-data "install/Common.py:install" --add-data "datas/electromagnetic.jar:datas" --add-data "datas/init.sql:datas" --hidden-import win32timezone .\install\InstallOrUpgradeComacDB.py +pyinstaller --onefile --add-data "install/Common.py:install" --add-data "datas/electromagnetic.jar:datas" --add-data "datas/init.sql:datas" --add-data "datas/ManagerService.exe:datas" --hidden-import win32timezone .\install\InstallOrUpgradeComacDB.py pyinstaller --onefile .\install\Uninstall.py pyinstaller --onefile .\install\SetFile.py pyinstaller --onefile --add-data "install/Common.py:install" --hidden-import win32timezone .\install\ManagerService.py \ No newline at end of file diff --git a/src/datas/ManagerService.exe b/src/datas/ManagerService.exe new file mode 100644 index 0000000..38b8aed Binary files /dev/null and b/src/datas/ManagerService.exe differ diff --git a/src/datas/electromagnetic.jar b/src/datas/electromagnetic.jar index a99b396..4724d11 100644 Binary files a/src/datas/electromagnetic.jar and b/src/datas/electromagnetic.jar differ diff --git a/src/install/InstallOrUpgradeComacDB.py b/src/install/InstallOrUpgradeComacDB.py index efcc430..d345b7f 100644 --- a/src/install/InstallOrUpgradeComacDB.py +++ b/src/install/InstallOrUpgradeComacDB.py @@ -8,6 +8,7 @@ manage_service_exe = os.path.join(current_dir, "ManagerService.exe") app_log_dir = os.path.join(current_dir, "logs") sql_path = get_resource_path(os.path.join("datas", "init.sql")) jar_path = get_resource_path(os.path.join("datas", "electromagnetic.jar")) +manage_service_path = get_resource_path(os.path.join("datas", "ManagerService.exe")) def set_sql(): @@ -44,6 +45,11 @@ def set_jar(): def update_service(cmd): + + if not os.path.exists(manage_service_exe): + logger.warning("manage service path not exist") + return + command = [manage_service_exe, cmd] result = subprocess.run(command, capture_output=True, text=True) @@ -55,6 +61,11 @@ def update_service(cmd): logger.info(f"操作成功,cmd is {cmd}") pass +def upgrade_service(): + shutil.copy(manage_service_path, manage_service_exe) + logger.info("service 设置成功") + pass + if __name__ == '__main__': ensure_dir(app_log_dir) @@ -71,6 +82,7 @@ if __name__ == '__main__': update_service("remove") set_sql() set_jar() + upgrade_service() update_service("install") update_service("start") diff --git a/src/install/ManagerService.py b/src/install/ManagerService.py index 7f1304b..6281ac3 100644 --- a/src/install/ManagerService.py +++ b/src/install/ManagerService.py @@ -37,6 +37,7 @@ class ComacDBService(win32serviceutil.ServiceFramework): f"-jar", jar_path, f"--file.enc.passwd=adknfhkj87654knd", + f"--login.enc.passwd=5JKRGV0QO4WK1WCWVK55YEU0A1NPOXOP", f"--logging.file.path={app_log_dir}", f"--logging.file.name={app_log_dir}/app_{formatted_time}.log", f"--winPrefix={current_dir}",