From e18a50ba30f1edd7911bff092db6d3eee69ac4d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E8=83=9C=E8=88=9F?= <1650473152@qq.com>
Date: Thu, 6 Apr 2023 20:08:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=BD=E4=BB=A4=E8=A1=8C?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/__init__.py                      |  5 ++--
 applications/common/script/__init__.py        |  8 +++++--
 .../common/script/{init_db.py => admin.py}    | 23 ++++++++++++++++++-
 applications/common/script/new_modular.py     | 18 ---------------
 4 files changed, 30 insertions(+), 24 deletions(-)
 rename applications/common/script/{init_db.py => admin.py} (95%)
 delete mode 100644 applications/common/script/new_modular.py

diff --git a/applications/__init__.py b/applications/__init__.py
index 90bf8fb..a00a56e 100644
--- a/applications/__init__.py
+++ b/applications/__init__.py
@@ -1,7 +1,6 @@
 import os
 from flask import Flask
-
-from applications.common.script import admin_cli
+from applications.common.script import init_script
 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()
diff --git a/applications/common/script/__init__.py b/applications/common/script/__init__.py
index b8d290c..81450ef 100644
--- a/applications/common/script/__init__.py
+++ b/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)
diff --git a/applications/common/script/init_db.py b/applications/common/script/admin.py
similarity index 95%
rename from applications/common/script/init_db.py
rename to applications/common/script/admin.py
index f5f3200..fec84ab 100644
--- a/applications/common/script/init_db.py
+++ b/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()
diff --git a/applications/common/script/new_modular.py b/applications/common/script/new_modular.py
deleted file mode 100644
index 29263a5..0000000
--- a/applications/common/script/new_modular.py
+++ /dev/null
@@ -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()