diff --git a/conf/conf-dev.ini b/conf/conf-dev.ini index 4c97a07..6aa7713 100644 --- a/conf/conf-dev.ini +++ b/conf/conf-dev.ini @@ -5,16 +5,16 @@ lifetime_seconds=3600 [mysql] username=root password=123456 -host=192.168.2.94 +host=mysql port=3306 -database=admgs_v2 +database=test [redis] -redis_host=192.168.2.94 +redis_host=redis redis_port=6379 [rabbitmq] -rabbitmq_host=192.168.2.94 +rabbitmq_host=rabbitmq rabbitmq_user=root rabbitmq_password=123123 \ No newline at end of file diff --git a/conf/conf-prod.ini b/conf/conf-prod.ini index 4c97a07..6aa7713 100644 --- a/conf/conf-prod.ini +++ b/conf/conf-prod.ini @@ -5,16 +5,16 @@ lifetime_seconds=3600 [mysql] username=root password=123456 -host=192.168.2.94 +host=mysql port=3306 -database=admgs_v2 +database=test [redis] -redis_host=192.168.2.94 +redis_host=redis redis_port=6379 [rabbitmq] -rabbitmq_host=192.168.2.94 +rabbitmq_host=rabbitmq rabbitmq_user=root rabbitmq_password=123123 \ No newline at end of file diff --git a/main.py b/main.py index 63858c2..099eb08 100644 --- a/main.py +++ b/main.py @@ -50,8 +50,6 @@ def create_app(): from src.api import example app.include_router(example.router, tags=["API示例"], prefix="/example") - - return app diff --git a/requirements.txt b/requirements.txt index f545197..d9250dc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ aioredis==2.0.1 aiomysql==0.1.1 bcrypt==4.0.1 email-validator==1.3.1 -fastapi==0.89.1 +fastapi==0.111.0 fastapi-plugins==0.11.0 FastAPI-SQLAlchemy==0.2.1 pydantic==1.10.4 diff --git a/src/api/example.py b/src/api/example.py index f2822a4..12a6471 100644 --- a/src/api/example.py +++ b/src/api/example.py @@ -7,7 +7,7 @@ from fastapi.security import OAuth2PasswordBearer from fastapi_plugins import depends_redis from pydantic import BaseModel -from src.biz.example import get_user_by_id +from src.service.example import get_user_by_id from src.dtos import response from src.dtos.example import UserExampleListPagesResult diff --git a/src/dtos/__init__.py b/src/request/__init__.py similarity index 100% rename from src/dtos/__init__.py rename to src/request/__init__.py diff --git a/src/dtos/example.py b/src/request/example.py similarity index 100% rename from src/dtos/example.py rename to src/request/example.py diff --git a/src/biz/__init__.py b/src/service/__init__.py similarity index 100% rename from src/biz/__init__.py rename to src/service/__init__.py diff --git a/src/biz/example.py b/src/service/example.py similarity index 71% rename from src/biz/example.py rename to src/service/example.py index 54ba029..b3f667a 100644 --- a/src/biz/example.py +++ b/src/service/example.py @@ -1,4 +1,4 @@ -from src.biz import execute_sql +from src.service import execute_sql def get_user_by_id(user_id):