拆分数据库初始化步骤

bin/init/create_rds_table.bat

@@ -0,0 +1,3 @@
+cd /d %~dp0/../../src
+python -c "from database.sql_db.conn import create_rds_table; create_rds_table()"
+pause

bin/init/create_rds_table.sh

@@ -0,0 +1,2 @@
+cd `dirname $0`/../../src
+python -c 'from database.sql_db.conn import create_rds_table; create_rds_table()'

bin/init/init_rds_data.bat

@@ -0,0 +1,3 @@
+cd /d %~dp0/../../src
+python -c "from database.sql_db.conn import init_rds_data; init_rds_data()"
+pause

bin/init/init_rds_data.sh

@@ -0,0 +1,2 @@
+cd `dirname $0`/../../src
+python -c 'from database.sql_db.conn import init_rds_data; init_rds_data()'

bin/start.bat

@@ -1,2 +1,2 @@
 cd /d %~dp0/../src
-waitress-serve --host=0.0.0.0 --port=8090 --url-scheme=http --trusted-proxy=* --trusted-proxy-headers=x-forwarded-for --threads=8 app:app.server
+waitress-serve --host=0.0.0.0 --port=8090 --url-scheme=http --trusted-proxy=* --trusted-proxy-headers=x-forwarded-for --threads=8 app:server

bin/start.sh

@@ -1,2 +1,2 @@
 cd `dirname $0`/../src
-gunicorn --capture-output -w 4 -b 0.0.0.0:8090 app:app.server
+gunicorn --capture-output -w 4 -b 0.0.0.0:8090 app:server

src/app.py

@@ -1,4 +1,4 @@
-from server import app
+from server import app, server  # noqa: F401
 import feffery_utils_components as fuc
 from dash import html, dcc
 from config.access_factory import AccessFactory

src/database/sql_db/conn.py

@@ -38,16 +38,45 @@ def db():
 
 
 # 判断是否存在SysUser表，如不存在则初始化库
-def initialize_database():
+def create_rds_table():
+    db_instance = db()
     from .entity.table_user import SysUser, SysRoleAccessMeta, SysUserRole, SysGroupUser, SysRole, SysGroupRole, SysGroup
     from .entity.table_announcement import SysAnnouncement
     from .entity.table_oauth2 import OAuth2Client, OAuth2AuthorizationCode, OAuth2Token
+
+    db_instance.create_tables(
+        [
+            SysUser,
+            SysRoleAccessMeta,
+            SysUserRole,
+            SysGroupUser,
+            SysRole,
+            SysGroupRole,
+            SysGroup,
+            SysAnnouncement,
+            OAuth2Client,
+            OAuth2AuthorizationCode,
+            OAuth2Token,
+        ],
+        safe=True,
+    )
+
+def init_rds_data():
+    db_instance = db()
+    from .entity.table_user import SysUser, SysUserRole, SysRole
     from datetime import datetime
     import hashlib
-    db_instance = db()
-    if not db_instance.table_exists(SysUser._meta.table_name):
-        db_instance.create_tables([SysUser])
+    if not db_instance.table_exists('sys_user'):
         with db_instance.atomic():
+            SysRole.create(
+                role_name='admin',
+                role_status=True,
+                update_datetime=datetime.now(),
+                update_by='admin',
+                create_datetime=datetime.now(),
+                create_by='admin',
+                role_remark='超级管理员角色',
+            )
             SysUser.create(
                 user_name='admin',
                 user_full_name='超级管理员',
@@ -63,35 +92,4 @@ def initialize_database():
                 user_remark='',
                 otp_secret='',
             )
-    if not db_instance.table_exists(SysRole._meta.table_name):
-        db_instance.create_tables([SysRole])
-        with db_instance.atomic():
-            SysRole.create(
-                role_name='admin',
-                role_status=True,
-                update_datetime=datetime.now(),
-                update_by='admin',
-                create_datetime=datetime.now(),
-                create_by='admin',
-                role_remark='超级管理员角色',
-            )
-    if not db_instance.table_exists(SysUserRole._meta.table_name):
-        db_instance.create_tables([SysUserRole])
-        with db_instance.atomic():
             SysUserRole.create(user_name='admin', role_name='admin')
-    if not db_instance.table_exists(SysRoleAccessMeta._meta.table_name):
-        db_instance.create_tables([SysRoleAccessMeta])
-    if not db_instance.table_exists(SysGroup._meta.table_name):
-        db_instance.create_tables([SysGroup])
-    if not db_instance.table_exists(SysGroupUser._meta.table_name):
-        db_instance.create_tables([SysGroupUser])
-    if not db_instance.table_exists(SysGroupRole._meta.table_name):
-        db_instance.create_tables([SysGroupRole])
-    if not db_instance.table_exists(SysAnnouncement._meta.table_name):
-        db_instance.create_tables([SysAnnouncement])
-    if not db_instance.table_exists(OAuth2Client._meta.table_name):
-        db_instance.create_tables([OAuth2Client])
-    if not db_instance.table_exists(OAuth2AuthorizationCode._meta.table_name):
-        db_instance.create_tables([OAuth2AuthorizationCode])
-    if not db_instance.table_exists(OAuth2Token._meta.table_name):
-        db_instance.create_tables([OAuth2Token])