增加框架自带命令

qlopc-msi · qlopc-msi · commit 13219082e182 · 2022-09-24T18:36:11.000+08:00
diff --git a/database/builder/generate.py b/database/builder/generate.py
@@ -11,9 +11,9 @@
 
 class GenerateDemo:
 
-    def call(self):
-        """"""
-        self.base()
+    @staticmethod
+    def call(argv):
+        GenerateDemo().base()
 
     def base(self):
         """
diff --git a/database/connector/connection.py b/database/connector/connection.py
@@ -44,7 +44,7 @@ def __find_engine(config) -> Connector.__class__:
         return Connection.ENGINES.get(name)
 
     @staticmethod
-    def connect(name, config=None, re_connect=False) -> Connector:
+    def connect(name=None, config=None, re_connect=False) -> Connector:
         """获取连接，已连接直接返回"""
         if name is None and config is not None and 'name' in config:
             name = config['name']
diff --git a/server/command.py b/server/command.py
@@ -5,6 +5,7 @@
 from quickpython.config import Config
 from quickpython.component import hooker
 from quickpython.component.scheduler import Scheduler
+from quickpython.component.scheduler import INSTALL_DPS as Scheduler_INSTALL_DPS
 logger = logging.getLogger(__name__)
 
 
@@ -30,13 +31,27 @@ def _call(argv):
         cmd_path = str(app_path + "/command").replace("\\", ".").replace(r"/", ".")
         app_cmd = importlib.import_module(cmd_path)
         if hasattr(app_cmd, 'COMMANDS'):
-            choice = sys.argv[1]
-            if choice in app_cmd.COMMANDS:
-                app_cmd.COMMANDS[choice](sys.argv[2:] if len(sys.argv) > 2 else [])
-            else:
-                logging.warning("未知命令：{}".format(choice))
+            app_cmd = app_cmd.COMMANDS
         else:
-            logging.warning("app/command.py脚本中未包含COMMANDS配置")
+            app_cmd = {}
+
+        # 框架自带命令
+        qp_cmd = CommandManager.get_qp_cmd()
+        app_cmd = {**app_cmd, **qp_cmd}
+
+        # 执行调用
+        choice = sys.argv[1]
+        if choice in app_cmd:
+            app_cmd[choice](sys.argv[2:] if len(sys.argv) > 2 else [])
+        else:
+            logging.error("未知命令：{}".format(choice))
+
+    @staticmethod
+    def get_qp_cmd():
+        from quickpython.database.builder.generate import GenerateDemo
+        return {
+            'model_gen': GenerateDemo.call,
+        }
 
 
 class ComponentManager:
@@ -50,17 +65,20 @@ def init():
         # hooker
         hooker.start()
         # 定时器
-        scheduler = Scheduler.instance()
-        app_crontab = importlib.import_module("{}.crontab".format(app_dir))
-        if hasattr(app_crontab, 'TASKS'):
-            scheduler.add(app_crontab.TASKS)
+        if Scheduler_INSTALL_DPS:
+            scheduler = Scheduler.instance()
+            app_crontab = importlib.import_module("{}.crontab".format(app_dir))
+            if hasattr(app_crontab, 'TASKS'):
+                scheduler.add(app_crontab.TASKS)
 
     @staticmethod
     def start():
-        Scheduler.instance().start()
+        if Scheduler_INSTALL_DPS:
+            Scheduler.instance().start()
 
     @staticmethod
     def app_stop():
         hooker.send(hooker.EXIT)
         hooker.stop()
-        Scheduler.instance().stop()
+        if Scheduler_INSTALL_DPS:
+            Scheduler.instance().stop()
