diff --git a/src/install/Common.py b/src/install/Common.py index 8c59d3a..4e52e95 100644 --- a/src/install/Common.py +++ b/src/install/Common.py @@ -4,6 +4,11 @@ import sys from loguru import logger +mariadb_port = 3417 +mariadb_passowrd = '1qaz@WSX' +mariadb_user='root' +mariadb_init_schema = 'em_data_prod' + class MyCustomError(Exception): """自定义异常""" diff --git a/src/install/InstallComacDB.py b/src/install/InstallComacDB.py index f0dd1fd..a05e151 100644 --- a/src/install/InstallComacDB.py +++ b/src/install/InstallComacDB.py @@ -69,7 +69,13 @@ class InstallComacDb: "install", self.service_name, self.java_path, - f"-jar {self.jar_path} --logging.file.path={self.app_log_dir} --logging.file.name={self.app_log_dir}/app_{formatted_time}.log --winPrefix={self.run_dir}" + f"-jar {self.jar_path} " + f"--logging.file.path={self.app_log_dir} " + f"--logging.file.name={self.app_log_dir}/app_{formatted_time}.log " + f"--winPrefix={self.run_dir} " + f"--spring.datasource.username={mariadb_user} " + f"--spring.datasource.password={mariadb_passowrd} " + f"--spring.datasource.url=jdbc:mariadb://127.0.0.1:{mariadb_port}/{mariadb_init_schema}?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&sslModel=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true" ] # 执行安装命令 diff --git a/src/install/InstallMariaDB.py b/src/install/InstallMariaDB.py index 2301b33..771f1a9 100644 --- a/src/install/InstallMariaDB.py +++ b/src/install/InstallMariaDB.py @@ -10,10 +10,11 @@ class InstallMariaDb: self.service_name = 'ComacMariaDB' self.root_path = install_path self.mariadb_data_path = os.path.join(install_path, 'mariadb', 'data') - self.mariadb_port = 3417 - self.passowrd = '1qaz@WSX' - self.init_schema = 'em_data_prod' + self.mariadb_port = mariadb_port + self.passowrd = mariadb_passowrd + self.init_schema = mariadb_init_schema self.init_sql = os.path.join(install_path, 'mariadb', 'data', 'init.sql') + pass def start_install_mariadb(self):