diff --git a/Config/common.ini b/Config/common.ini index 55728e7..4cc2a59 100644 --- a/Config/common.ini +++ b/Config/common.ini @@ -1,14 +1,19 @@ [mysql] -ip = 111.11.111.1:3343 +host = 127.0.0.1 +post= 3306 user = root password = 12345 +db = user [redis] -ip = 111.11.111.1:3343 -user = root -password = 12345 +host = 192.168.18.128 +port = 6379 +password = "" + +[email] +api = 'http://116.63.130.34:30001' +sender = "fecribd@fecr.com.cn" [app] port = 8001 jwt_key = AB123FDX1ER3QE1231 - diff --git a/README.md b/README.md index d9dd291..012d86d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # 用户模块说明 ## 一.项目开发环境 - +pip install -r .\requirements.txt ## 二.项目结构 ## 三.配置说明 \ No newline at end of file diff --git a/Utils/ConfigUtils.py b/Utils/ConfigUtils.py index e69de29..1565495 100644 --- a/Utils/ConfigUtils.py +++ b/Utils/ConfigUtils.py @@ -0,0 +1,20 @@ +from configparser import ConfigParser + + +class Config: + common: ConfigParser + + +def get_common_config(): + conf = ConfigParser() + conf.read("Config/common.ini", encoding='utf-8-sig') + return conf + + +def init_common_config(): + Config.conf = get_common_config() + return Config.conf + + +def get_config_value(conf: ConfigParser, section, key): + return conf[section][key] diff --git a/Utils/__init__.py b/Utils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/main.py b/main.py index e69de29..d6ed894 100644 --- a/main.py +++ b/main.py @@ -0,0 +1,31 @@ +import uvicorn +from fastapi import FastAPI +from fastapi.middleware.cors import CORSMiddleware +from Router import UserRouter, UserRegisterRouter +from Utils.ConfigUtils import init_common_config +from Utils.RedisUtils import init_redis_pool +from Utils.SqlAlchemyUtils import Base, init_database +from Context.common import ctx + +ctx.common_conf = init_common_config() +init_database() +init_redis_pool() + +app = FastAPI( + title="用户模块", + description="", + version="v1.0.0" +) + +app.add_middleware( + CORSMiddleware, + allow_origins=["*"], + allow_credentials=True, + allow_methods=["*"], + allow_headers=["*"], +) + +app.include_router(UserRouter.router) +app.include_router(UserRegisterRouter.router) + +uvicorn.run(app=app, port=8001) diff --git a/requirements.txt b/requirements.txt index d6da4d4..3861679 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,7 @@ SQLAlchemy==2.0.0 passlib==1.7.4 bcrypt==4.0.1 python-jose==3.3.0 -cryptography==39.0.0 \ No newline at end of file +cryptography==39.0.0 +requests==2.28.2 +captcha==0.4 +pymysql==1.0.2 \ No newline at end of file