修复命令行工具

applications/__init__.py

@@ -1,7 +1,6 @@
 import os
 from flask import Flask
-
+from applications.common.script import init_script
-from applications.common.script import admin_cli
 from applications.config import BaseConfig
 from applications.extensions import init_plugs
 from applications.view import init_view
@@ -19,7 +18,7 @@ def create_app():
     init_view(app)
 
     # 注册命令
-    app.cli.add_command(admin_cli)
+    init_script(app)
 
     if os.environ.get('WERKZEUG_RUN_MAIN') == 'true':
         logo()

applications/common/script/__init__.py

@@ -1,3 +1,7 @@
-from flask.cli import AppGroup
+from flask import Flask
 
-admin_cli = AppGroup("admin")
+from .admin import admin_cli
+
+
+def init_script(app: Flask):
+    app.cli.add_command(admin_cli)

applications/common/script/admin.py

@@ -1,9 +1,16 @@
+import os
+
+import click
+from flask.cli import AppGroup
+
 import datetime
 
-from . import admin_cli
+from applications.common.script.newmodular.new import NewViewModular
 from applications.extensions import db
 from applications.models import User, Role, Dept, Power
 
+admin_cli = AppGroup("admin")
+
 now_time = datetime.datetime.now()
 userdata = [
     User(
@@ -687,3 +694,17 @@ def init_db():
     add_role_power()
     print("角色权限数据存入")
     print("数据初始化完成,请使用python app.py命令运行")
+
+
+@admin_cli.command()
+@click.option('--type', prompt="请输入类型", help='新增的类型')
+@click.option('--name', prompt="请输入新增的名称", help='新增的名称')
+def new(type, name):
+    if type == 'view':
+        if name.count('/') > 1:
+            print("目前只支持二级目录，多级目录需要蓝图嵌套，本命令暂不支持，请手动创建")
+            quit()
+        if type == "view" and os.path.exists(f"applications/view/{name}.py"):
+            print(f'已经存在视图模块{name}.py')
+            quit()
+        NewViewModular(name=name).new_view()

applications/common/script/new_modular.py

@@ -1,18 +0,0 @@
-import click
-
-from applications import admin_cli
-from applications.common.script.newmodular.new import NewViewModular
-
-
-@admin_cli.command()
-@click.option('--type', prompt="请输入类型", help='新增的类型')
-@click.option('--name', prompt="请输入新增的名称", help='新增的名称')
-def new(type, name):
-    if type == 'view':
-        if name.count('/') > 1:
-            print("目前只支持二级目录，多级目录需要蓝图嵌套，本命令暂不支持，请手动创建")
-            quit()
-        if type == "view" and os.path.exists(f"applications/view/{name}.py"):
-            print(f'已经存在视图模块{name}.py')
-            quit()
-        NewViewModular(name=name).new_view()