From 2395364a171e4b788aa8169d19f9ca48b2e2928b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=3F=2E=2E=E6=BF=A1=2E=2E?= <2324281453@qq.com>
Date: Wed, 5 Mar 2025 20:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=AF=BC=E5=85=A5=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py                              | 2 +-
 mooc/crud/crud_coupon_location.py    | 4 ++--
 mooc/crud/crud_cover_reply.py        | 4 ++--
 mooc/crud/crud_custom_reply.py       | 4 ++--
 mooc/crud/crud_images_reply.py       | 4 ++--
 mooc/crud/crud_menu_event.py         | 4 ++--
 mooc/crud/crud_message_notice_log.py | 4 ++--
 mooc/crud/crud_mobilenumber.py       | 4 ++--
 mooc/crud/crud_modules.py            | 4 ++--
 mooc/crud/crud_music_reply.py        | 4 ++--
 mooc/crud/crud_news_reply.py         | 4 ++--
 mooc/crud/crud_phoneapp_versions.py  | 4 ++--
 mooc/crud/crud_profile_fields.py     | 4 ++--
 mooc/models/coupon_location.py       | 4 +---
 mooc/models/cover_reply.py           | 3 +--
 mooc/models/custom_reply.py          | 3 +--
 mooc/models/images_reply.py          | 3 +--
 mooc/models/message_notice_log.py    | 3 +--
 mooc/models/music_reply.py           | 3 +--
 mooc/models/news_reply.py            | 3 +--
 mooc/models/phoneapp_versions.py     | 3 +--
 mooc/models/rule.py                  | 3 +--
 mooc/models/rule_Keyword.py          | 3 +--
 23 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/main.py b/main.py
index 878d1ae..56a4cd0 100644
--- a/main.py
+++ b/main.py
@@ -3,7 +3,7 @@ from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
 import os
 from pathlib import Path
-
+import uvicorn
 from mooc.db.database import init_db
 from mooc.api.v1.api import api_router
 from mooc.core.config import settings
diff --git a/mooc/crud/crud_coupon_location.py b/mooc/crud/crud_coupon_location.py
index 157bbf6..00fadb5 100644
--- a/mooc/crud/crud_coupon_location.py
+++ b/mooc/crud/crud_coupon_location.py
@@ -1,8 +1,8 @@
 from typing import Optional
 from sqlalchemy.orm import Session
 from mooc.crud.crud_base import CRUDBase
-from mooc.models.coupon import CouponLocation
-from mooc.schemas.coupon import CouponLocationCreate, CouponLocationUpdate
+from mooc.models.coupon_location import CouponLocation
+from mooc.schemas.coupon_location import CouponLocationCreate, CouponLocationUpdate
 
 class CRUDCouponLocation(CRUDBase[CouponLocation, CouponLocationCreate, CouponLocationUpdate]):
     def get_by_id(self, db: Session, *, id: int) -> Optional[CouponLocation]:
diff --git a/mooc/crud/crud_cover_reply.py b/mooc/crud/crud_cover_reply.py
index cc28982..5bde052 100644
--- a/mooc/crud/crud_cover_reply.py
+++ b/mooc/crud/crud_cover_reply.py
@@ -1,8 +1,8 @@
 from typing import Optional
 from sqlalchemy.orm import Session
 from mooc.crud.crud_base import CRUDBase
-from mooc.models.cover import CoverReply
-from mooc.schemas.cover import CoverReplyCreate, CoverReplyUpdate
+from mooc.models.cover_reply import CoverReply
+from mooc.schemas.cover_reply import CoverReplyCreate, CoverReplyUpdate
 
 class CRUDCoverReply(CRUDBase[CoverReply, CoverReplyCreate, CoverReplyUpdate]):
     def get_by_id(self, db: Session, *, id: int) -> Optional[CoverReply]:
diff --git a/mooc/crud/crud_custom_reply.py b/mooc/crud/crud_custom_reply.py
index a2b9d4d..bff1219 100644
--- a/mooc/crud/crud_custom_reply.py
+++ b/mooc/crud/crud_custom_reply.py
@@ -1,8 +1,8 @@
 from typing import Optional
 from sqlalchemy.orm import Session
 from mooc.crud.crud_base import CRUDBase
-from mooc.models.custom import CustomReply
-from mooc.schemas.custom import CustomReplyCreate, CustomReplyUpdate
+from mooc.models.custom_reply import CustomReply
+from mooc.schemas.custom_reply import CustomReplyCreate, CustomReplyUpdate
 
 class CRUDCustomReply(CRUDBase[CustomReply, CustomReplyCreate, CustomReplyUpdate]):
     def get_by_id(self, db: Session, *, id: int) -> Optional[CustomReply]:
diff --git a/mooc/crud/crud_images_reply.py b/mooc/crud/crud_images_reply.py
index 593bcab..3571d6a 100644
--- a/mooc/crud/crud_images_reply.py
+++ b/mooc/crud/crud_images_reply.py
@@ -1,8 +1,8 @@
 from typing import Optional
 from sqlalchemy.orm import Session
 from mooc.crud.crud_base import CRUDBase
-from mooc.models.images import ImagesReply
-from mooc.schemas.images import ImagesReplyCreate, ImagesReplyUpdate
+from mooc.models.images_reply import ImagesReply
+from mooc.schemas.images_reply import ImagesReplyCreate, ImagesReplyUpdate
 
 class CRUDImagesReply(CRUDBase[ImagesReply, ImagesReplyCreate, ImagesReplyUpdate]):
     def get_by_id(self, db: Session, *, id: int) -> Optional[ImagesReply]:
diff --git a/mooc/crud/crud_menu_event.py b/mooc/crud/crud_menu_event.py
index 076103e..ebf9fa1 100644
--- a/mooc/crud/crud_menu_event.py
+++ b/mooc/crud/crud_menu_event.py
@@ -1,8 +1,8 @@
 from typing import Optional
 from sqlalchemy.orm import Session
 from mooc.crud.crud_base import CRUDBase
-from mooc.models.menu import MenuEvent
-from mooc.schemas.menu import MenuEventCreate, MenuEventUpdate
+from mooc.models.menu_event import MenuEvent
+from mooc.schemas.menu_event import MenuEventCreate, MenuEventUpdate
 
 class CRUDMenuEvent(CRUDBase[MenuEvent, MenuEventCreate, MenuEventUpdate]):
     def get_by_id(self, db: Session, *, id: int) -> Optional[MenuEvent]:
diff --git a/mooc/crud/crud_message_notice_log.py b/mooc/crud/crud_message_notice_log.py
index ba11abf..7c3d290 100644
--- a/mooc/crud/crud_message_notice_log.py
+++ b/mooc/crud/crud_message_notice_log.py
@@ -1,8 +1,8 @@
 from typing import Optional
 from sqlalchemy.orm import Session
 from mooc.crud.crud_base import CRUDBase
-from mooc.models.message import MessageNoticeLog
-from mooc.schemas.message import MessageNoticeLogCreate, MessageNoticeLogUpdate
+from mooc.models.message_notice_log import MessageNoticeLog
+from mooc.schemas.message_notice_log import MessageNoticeLogCreate, MessageNoticeLogUpdate
 
 class CRUDMessageNoticeLog(CRUDBase[MessageNoticeLog, MessageNoticeLogCreate, MessageNoticeLogUpdate]):
     def get_by_id(self, db: Session, *, id: int) -> Optional[MessageNoticeLog]:
diff --git a/mooc/crud/crud_mobilenumber.py b/mooc/crud/crud_mobilenumber.py
index 966a508..3fb9581 100644
--- a/mooc/crud/crud_mobilenumber.py
+++ b/mooc/crud/crud_mobilenumber.py
@@ -1,8 +1,8 @@
 from typing import Optional
 from sqlalchemy.orm import Session
 from mooc.crud.crud_base import CRUDBase
-from mooc.models.mobile import Mobilenumber
-from mooc.schemas.mobile import MobilenumberCreate, MobilenumberUpdate
+from mooc.models.mobile_number import Mobilenumber
+from mooc.schemas.mobile_number import MobilenumberCreate, MobilenumberUpdate
 
 class CRUDMobilenumber(CRUDBase[Mobilenumber, MobilenumberCreate, MobilenumberUpdate]):
     def get_by_id(self, db: Session, *, id: int) -> Optional[Mobilenumber]:
diff --git a/mooc/crud/crud_modules.py b/mooc/crud/crud_modules.py
index 44fffc9..fed8f1b 100644
--- a/mooc/crud/crud_modules.py
+++ b/mooc/crud/crud_modules.py
@@ -1,12 +1,12 @@
 from typing import Optional
 from sqlalchemy.orm import Session
 from mooc.crud.crud_base import CRUDBase
-from mooc.models.module import (
+from mooc.models.modules import (
     IMSModulesBindings, IMSModulesCloud, IMSModulesIgnore,
     IMSModulesPlugin, IMSModulesPluginRank, IMSModulesRank,
     IMSModulesRecycle, Modules
 )
-from mooc.schemas.module import (
+from mooc.schemas.modules import (
     IMSModulesBindingsCreate, IMSModulesBindingsUpdate,
     IMSModulesCloudCreate, IMSModulesCloudUpdate,
     IMSModulesIgnoreCreate, IMSModulesIgnoreUpdate,
diff --git a/mooc/crud/crud_music_reply.py b/mooc/crud/crud_music_reply.py
index 1fd2bb0..c9d1555 100644
--- a/mooc/crud/crud_music_reply.py
+++ b/mooc/crud/crud_music_reply.py
@@ -1,8 +1,8 @@
 from typing import Optional
 from sqlalchemy.orm import Session
 from mooc.crud.crud_base import CRUDBase
-from mooc.models.music import MusicReply
-from mooc.schemas.music import MusicReplyCreate, MusicReplyUpdate
+from mooc.models.music_reply import MusicReply
+from mooc.schemas.music_reply import MusicReplyCreate, MusicReplyUpdate
 
 class CRUDMusicReply(CRUDBase[MusicReply, MusicReplyCreate, MusicReplyUpdate]):
     def get_by_id(self, db: Session, *, id: int) -> Optional[MusicReply]:
diff --git a/mooc/crud/crud_news_reply.py b/mooc/crud/crud_news_reply.py
index e290a43..9456226 100644
--- a/mooc/crud/crud_news_reply.py
+++ b/mooc/crud/crud_news_reply.py
@@ -1,8 +1,8 @@
 from typing import Optional
 from sqlalchemy.orm import Session
 from mooc.crud.crud_base import CRUDBase
-from mooc.models.news import NewsReply
-from mooc.schemas.news import NewsReplyCreate, NewsReplyUpdate
+from mooc.models.news_reply import NewsReply
+from mooc.schemas.news_reply import NewsReplyCreate, NewsReplyUpdate
 
 class CRUDNewsReply(CRUDBase[NewsReply, NewsReplyCreate, NewsReplyUpdate]):
     def get_by_id(self, db: Session, *, id: int) -> Optional[NewsReply]:
diff --git a/mooc/crud/crud_phoneapp_versions.py b/mooc/crud/crud_phoneapp_versions.py
index d4dc90e..5092308 100644
--- a/mooc/crud/crud_phoneapp_versions.py
+++ b/mooc/crud/crud_phoneapp_versions.py
@@ -1,8 +1,8 @@
 from typing import Optional
 from sqlalchemy.orm import Session
 from mooc.crud.crud_base import CRUDBase
-from mooc.models.phoneapp import PhoneappVersions
-from mooc.schemas.phoneapp import PhoneappVersionsCreate, PhoneappVersionsUpdate
+from mooc.models.phoneapp_versions import PhoneappVersions
+from mooc.schemas.phoneapp_versions import PhoneappVersionsCreate, PhoneappVersionsUpdate
 
 class CRUDPhoneappVersions(CRUDBase[PhoneappVersions, PhoneappVersionsCreate, PhoneappVersionsUpdate]):
     def get_by_id(self, db: Session, *, id: int) -> Optional[PhoneappVersions]:
diff --git a/mooc/crud/crud_profile_fields.py b/mooc/crud/crud_profile_fields.py
index 16578cf..d47e4df 100644
--- a/mooc/crud/crud_profile_fields.py
+++ b/mooc/crud/crud_profile_fields.py
@@ -1,8 +1,8 @@
 from typing import Optional
 from sqlalchemy.orm import Session
 from mooc.crud.crud_base import CRUDBase
-from mooc.models.profile import ProfileFields
-from mooc.schemas.profile import ProfileFieldsCreate, ProfileFieldsUpdate
+from mooc.models.profile_fields import ProfileFields
+from mooc.schemas.profile_fields import ProfileFieldsCreate, ProfileFieldsUpdate
 
 class CRUDProfileFields(CRUDBase[ProfileFields, ProfileFieldsCreate, ProfileFieldsUpdate]):
     def get_by_id(self, db: Session, *, id: int) -> Optional[ProfileFields]:
diff --git a/mooc/models/coupon_location.py b/mooc/models/coupon_location.py
index 43ba1ae..23959e1 100644
--- a/mooc/models/coupon_location.py
+++ b/mooc/models/coupon_location.py
@@ -1,7 +1,5 @@
 from sqlalchemy import Column, Integer, String, SmallInteger, DECIMAL, Text
-from sqlalchemy.ext.declarative import declarative_base
-
-Base = declarative_base()
+from mooc.db.database import Base
 
 class CouponLocation(Base):
     __tablename__ = 'ims_coupon_location'
diff --git a/mooc/models/cover_reply.py b/mooc/models/cover_reply.py
index f7efaf3..f1eed34 100644
--- a/mooc/models/cover_reply.py
+++ b/mooc/models/cover_reply.py
@@ -1,7 +1,6 @@
 from sqlalchemy import Column, Integer, String, SmallInteger
-from sqlalchemy.ext.declarative import declarative_base
+from mooc.db.database import Base
 
-Base = declarative_base()
 
 class CoverReply(Base):
     __tablename__ = 'cover_reply'
diff --git a/mooc/models/custom_reply.py b/mooc/models/custom_reply.py
index cc16406..60758aa 100644
--- a/mooc/models/custom_reply.py
+++ b/mooc/models/custom_reply.py
@@ -1,7 +1,6 @@
 from sqlalchemy import Column, Integer
-from sqlalchemy.ext.declarative import declarative_base
+from mooc.db.database import Base
 
-Base = declarative_base()
 
 class CustomReply(Base):
     __tablename__ = 'custom_reply'
diff --git a/mooc/models/images_reply.py b/mooc/models/images_reply.py
index 9369096..e2a6f11 100644
--- a/mooc/models/images_reply.py
+++ b/mooc/models/images_reply.py
@@ -1,7 +1,6 @@
 from sqlalchemy import Column, Integer, String, DECIMAL
-from sqlalchemy.ext.declarative import declarative_base
+from mooc.db.database import Base
 
-Base = declarative_base()
 
 class ImagesReply(Base):
     __tablename__ = 'images_reply'
diff --git a/mooc/models/message_notice_log.py b/mooc/models/message_notice_log.py
index 743415a..d7b2ec3 100644
--- a/mooc/models/message_notice_log.py
+++ b/mooc/models/message_notice_log.py
@@ -1,7 +1,6 @@
 from sqlalchemy import Column, Integer, String, SmallInteger
-from sqlalchemy.ext.declarative import declarative_base
+from mooc.db.database import Base
 
-Base = declarative_base()
 
 class MessageNoticeLog(Base):
     __tablename__ = 'message_notice_log'
diff --git a/mooc/models/music_reply.py b/mooc/models/music_reply.py
index d86c890..407611f 100644
--- a/mooc/models/music_reply.py
+++ b/mooc/models/music_reply.py
@@ -1,7 +1,6 @@
 from sqlalchemy import Column, Integer, String, Text
-from sqlalchemy.ext.declarative import declarative_base
+from mooc.db.database import Base
 
-Base = declarative_base()
 
 class MusicReply(Base):
     __tablename__ = "music_reply"
diff --git a/mooc/models/news_reply.py b/mooc/models/news_reply.py
index 7997756..64fdcfe 100644
--- a/mooc/models/news_reply.py
+++ b/mooc/models/news_reply.py
@@ -1,7 +1,6 @@
 from sqlalchemy import Column, Integer, String, Text, SmallInteger
-from sqlalchemy.ext.declarative import declarative_base
 
-Base = declarative_base()
+from mooc.db.database import Base
 
 class NewsReply(Base):
     __tablename__ = "news_reply"
diff --git a/mooc/models/phoneapp_versions.py b/mooc/models/phoneapp_versions.py
index 06b6439..16121d2 100644
--- a/mooc/models/phoneapp_versions.py
+++ b/mooc/models/phoneapp_versions.py
@@ -1,7 +1,6 @@
 from sqlalchemy import Column, Integer, String, Text
-from sqlalchemy.ext.declarative import declarative_base
 
-Base = declarative_base()
+from mooc.db.database import Base
 
 class PhoneappVersions(Base):
     __tablename__ = "phoneapp_versions"
diff --git a/mooc/models/rule.py b/mooc/models/rule.py
index c501654..3464a96 100644
--- a/mooc/models/rule.py
+++ b/mooc/models/rule.py
@@ -1,7 +1,6 @@
 from sqlalchemy import Column, Integer, String, SmallInteger
-from sqlalchemy.ext.declarative import declarative_base
 
-Base = declarative_base()
+from mooc.db.database import Base
 
 class Rule(Base):
     __tablename__ = "rule"
diff --git a/mooc/models/rule_Keyword.py b/mooc/models/rule_Keyword.py
index 9a5c335..69445dc 100644
--- a/mooc/models/rule_Keyword.py
+++ b/mooc/models/rule_Keyword.py
@@ -1,7 +1,6 @@
 from sqlalchemy import Column, Integer, String, SmallInteger
-from sqlalchemy.ext.declarative import declarative_base
 
-Base = declarative_base()
+from mooc.db.database import Base
 
 class RuleKeyword(Base):
     __tablename__ = "rule_keyword"