Browse Source

fix: setup的问题

SongZihuan 3 years ago
parent
commit
a94031f715
5 changed files with 5 additions and 11 deletions
  1. 2 2
      conf/args.py
  2. 1 2
      conf/sql.py
  3. 0 1
      init.py
  4. 1 5
      main.py
  5. 1 1
      sql/base_db.py

+ 2 - 2
conf/args.py

@@ -7,7 +7,7 @@ res = os.environ.get('HGSSystem_NA')
 p_args: dict[str: Optional[str]] = {"mysql_url": None,
                                     "mysql_name": None,
                                     "mysql_passwd": None,
-                                    "mysql_port": None,
+                                    "mysql_port": "3306",  # 默认值是 0
                                     "aliyun_key": None,
                                     "aliyun_secret": None,
                                     "program": None,
@@ -82,7 +82,7 @@ if p_args.get('mysql_url') is None or p_args.get('mysql_name') is None or p_args
             p_args['mysql_url'] = res[0]
             p_args['mysql_name'] = res[1]
             p_args['mysql_passwd'] = res[2]
-            p_args['mysql_port'] = ""
+            p_args['mysql_port'] = "3306"
         else:
             print("MYSQL地址错误", file=sys.stderr)
             exit(1)

+ 1 - 2
conf/sql.py

@@ -7,8 +7,7 @@ class ConfigDatabaseRelease:
     mysql_url = args.p_args['mysql_url']
     mysql_name = args.p_args['mysql_name']
     mysql_passwd = args.p_args['mysql_passwd']
-    mysql_port = args.p_args['mysql_port'] if (args.p_args['mysql_port'] is None or
-                                               (len(args.p_args['mysql_port']) > 0)) else None
+    mysql_port = args.p_args['mysql_port']
 
 
 ConfigDatabase = ConfigDatabaseRelease

+ 0 - 1
init.py

@@ -67,7 +67,6 @@ check_import(["oss2", "viapi", "aliyunsdkcore", "aliyunsdkimagerecog"],
 
 import pymysql
 from conf import Config
-from conf import p_args
 
 mysql_url = Config.mysql_url
 mysql_name = Config.mysql_name

+ 1 - 5
main.py

@@ -35,15 +35,11 @@ def main():
     if program_name == "setup":  # setup程序不需要数据库链接等操作
         __main = os.path.dirname(os.path.abspath(__file__))
 
-        port = ""
-        if Config.mysql_port is not None:
-            port = f"--mysql_port= {Config.mysql_port}"
-
         res = os.system(f"{sys.executable} {os.path.join(__main, 'init.py')} "
                         f"--mysql_url={Config.mysql_url} "
                         f"--mysql_name={Config.mysql_name} "
                         f"--mysql_passwd={Config.mysql_passwd} "
-                        f"{port} "
+                        f"--mysql_port={Config.mysql_port}  "
                         f"--program=setup")
         if res != 0:
             print("初始化程序加载失败, 请检查配置是否正确而", file=sys.stderr)

+ 1 - 1
sql/base_db.py

@@ -28,7 +28,7 @@ class HGSDatabase(metaclass=abc.ABCMeta):
         if port is None:
             self._port = 0
         else:
-            self._port = port
+            self._port = int(port)
 
     @abc.abstractmethod
     def close(self):