flask-restful依赖替换完成

applications/extensions/__init__.py

@@ -1,7 +1,7 @@
 from flask import Flask
 
 from .init_databases import register_script
-from .init_sqlalchemy import db, ma, init_databases
+from .init_sqlalchemy import db, init_databases
 from .init_login import init_login_manager
 from .init_template_directives import init_template_directives
 from .init_error_views import init_error_views

applications/extensions/init_databases/__init__.py

@@ -1,13 +1,20 @@
-import json
-
 from flask import Flask
+import re
+from datetime import datetime
+
+date_str = re.compile('\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d$')
 
 
 def add_data(fields, data_list, obj):
     from applications.extensions import db
+
     for _data in data_list:
         dept = obj()
         for key, value in dict(zip(fields, _data)).items():
+
+            if isinstance(value, str) and date_str.match(value):
+                value = datetime.strptime(value, "%Y-%m-%d %H:%M:%S")
+
             setattr(dept, key, value)
         db.session.add(dept)
     db.session.commit()
@@ -29,8 +36,10 @@ def create_dept_data():
     ]
     _fields = ['id', 'parent_id', 'dept_name', 'sort', 'leader', 'phone', 'email', 'status', 'remark', 'address',
                'create_at', 'update_at']
-    add_data(_fields, _data_list, Dept)
 
+    _data_list = [item for item in _data_list]
+
+    add_data(_fields, _data_list, Dept)
 
 
 def create_admin_photo():
@@ -65,10 +74,6 @@ def create_admin_power():
             (4, '权限管理', '1', 'admin:power:main', '/rights/', '_iframe', '1', None, 2, None, None, 1),
             (9, '角色管理', '1', 'admin:role:main', '/admin/role', '_iframe', '1', 'layui-icon layui-icon-username', 2,
              '2021-03-16 22:24:58', '2021-03-25 19:15:24', 1),
-            (
-                12, '系统监控', '1', 'admin:monitor:main', '/admin/monitor', '_iframe', '1',
-                'layui-icon layui-icon-vercode', 5,
-                '2021-03-18 22:05:19', '2021-03-25 19:15:27', 1),
             (13, '日志管理', '1', 'admin:log:main', '/logs', '_iframe', '1', 'layui-icon layui-icon-read', 4,
              '2021-03-18 22:37:10', '2021-06-03 11:06:25', 1),
             (17, '文件管理', '0', '', '', '', '0', 'layui-icon layui-icon-camera', 2, '2021-03-19 18:56:23',
@@ -158,7 +163,6 @@ def create_admin_role():
 
 
 def create_admin_role_power():
-    from applications.models import user_role
     from applications.extensions import db
 
     _data_list = [
@@ -252,15 +256,6 @@ def create_admin_user_role() -> object:
     db.session.commit()
 
 
-def create_example():
-    from applications.models import DictData
-
-    _fields = []
-    _data_list = []
-
-    add_data(_fields, _data_list, DictData)
-
-
 def register_script(app: Flask):
     @app.cli.command()
     def init_db():
@@ -275,6 +270,7 @@ def register_script(app: Flask):
 
     @app.cli.command()
     def turn():
+        """清空数据库"""
         from applications.extensions import db
         db.drop_all()
         db.create_all()

applications/extensions/init_sqlalchemy.py

@@ -1,57 +1,11 @@
 from flask import Flask
 from flask_sqlalchemy import SQLAlchemy
-from flask_marshmallow import Marshmallow
 from flask_migrate import Migrate
-from marshmallow import fields
-from marshmallow.validate import (
-    URL, Email, Range, Length, Equal, Regexp,
-    Predicate, NoneOf, OneOf, ContainsOnly
-)
-
-URL.default_message = '无效的链接'
-Email.default_message = '无效的邮箱地址'
-Range.message_min = '不能小于{min}'
-Range.message_max = '不能小于{max}'
-Range.message_all = '不能超过{min}和{max}这个范围'
-Length.message_min = '长度不得小于{min}位'
-Length.message_max = '长度不得大于{max}位'
-Length.message_all = '长度不能超过{min}和{max}这个范围'
-Length.message_equal = '长度必须等于{equal}位'
-Equal.default_message = '必须等于{other}'
-Regexp.default_message = '非法输入'
-Predicate.default_message = '非法输入'
-NoneOf.default_message = '非法输入'
-OneOf.default_message = '无效的选择'
-ContainsOnly.default_message = '一个或多个无效的选择'
-
-fields.Field.default_error_messages = {
-    "required": "缺少必要数据",
-    "null": "数据不能为空",
-    "validator_failed": "非法数据",
-}
-
-fields.Str.default_error_messages = {
-    'invalid': "不是合法文本"
-}
-
-fields.Int.default_error_messages = {
-    "invalid": "不是合法整数"
-}
-
-fields.Number.default_error_messages = {
-    "invalid": "不是合法数字"
-}
-
-fields.Boolean.default_error_messages = {
-    "invalid": "不是合法布尔值"
-}
 
 db = SQLAlchemy()
-ma = Marshmallow()
 migrate = Migrate()
 
 
 def init_databases(app: Flask):
     db.init_app(app)
-    ma.init_app(app)
     migrate.init_app(app, db)