From 598bb654c7f7797586527f544de5290eb423e1b9 Mon Sep 17 00:00:00 2001
From: chenwj113 <chenwj113@gmail.com>
Date: Tue, 11 Jun 2024 17:06:19 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8DDockerfile=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RuntimeDockerfile  |  7 +++----
 conf/conf-dev.ini  |  9 ++++-----
 conf/conf-prod.ini |  5 ++---
 config.py          |  3 +--
 main.py            | 14 ++++++++------
 5 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/RuntimeDockerfile b/RuntimeDockerfile
index 6e719fa..a5c5447 100644
--- a/RuntimeDockerfile
+++ b/RuntimeDockerfile
@@ -16,11 +16,10 @@ COPY pyproject.toml  .
 #     && apt-get clean
 
 # RUN pip install -r requirements.txt   -i https://mirrors.aliyun.com/pypi/simple/ --prefix=/install
-RUN pip install -r poetry -i https://mirrors.aliyun.com/pypi/simple/
+RUN pip install poetry -i https://mirrors.aliyun.com/pypi/simple/ \
+    && poetry source add --priority=primary mirrors https://pypi.tuna.tsinghua.edu.cn/simple/ \
+    && poetry install -C /install
 
-RUN poetry source add --priority=primary mirrors https://pypi.tuna.tsinghua.edu.cn/simple/
-
-RUN poetry install -C /install
 # 应用启动
 FROM python:3.11-slim
 
diff --git a/conf/conf-dev.ini b/conf/conf-dev.ini
index dd787cd..47bcae3 100644
--- a/conf/conf-dev.ini
+++ b/conf/conf-dev.ini
@@ -4,17 +4,16 @@ lifetime_seconds=3600
 
 [mysql]
 username=root
-password=123456
-host=mysql
+password=Chenweijia113!
+host=127.0.0.1
 port=3306
 database=test
 
 
 [redis]
-redis_url=""
-redis_host=redis
+redis_host=127.0.0.1
 redis_port=6379
-redis_password=""
+redis_password=
 
 [rabbitmq]
 rabbitmq_host=rabbitmq
diff --git a/conf/conf-prod.ini b/conf/conf-prod.ini
index dd787cd..79b1387 100644
--- a/conf/conf-prod.ini
+++ b/conf/conf-prod.ini
@@ -4,17 +4,16 @@ lifetime_seconds=3600
 
 [mysql]
 username=root
-password=123456
+password=Chenweijia113!
 host=mysql
 port=3306
 database=test
 
 
 [redis]
-redis_url=""
 redis_host=redis
 redis_port=6379
-redis_password=""
+redis_password=Chenweijia113!
 
 [rabbitmq]
 rabbitmq_host=rabbitmq
diff --git a/config.py b/config.py
index 270b1b2..6c3afb1 100644
--- a/config.py
+++ b/config.py
@@ -34,7 +34,6 @@ class MySQLConfig(BaseSettings):
 
 
 class RedisConfig(RedisSettings):
-    redis_url: str = None
     redis_host: Optional[str] = 'localhost'
     redis_port: Optional[int] = 6379
     redis_password: str = None
@@ -60,7 +59,7 @@ def init_config():
         # common_config = CommonConfig(**dict(config.items('common')))
         mysql_config = MySQLConfig(**dict(config.items('mysql')))
         redis_config = RedisConfig(**dict(config.items('redis')))
-        rabbitmq_config = RabbitmqConfig(**dict(config.items("rabbitmq")))
+        # rabbitmq_config = RabbitmqConfig(**dict(config.items("rabbitmq")))
         # return common_config, mysql_config, redis_config, rabbitmq_config
         return mysql_config, redis_config
     except Exception as e:
diff --git a/main.py b/main.py
index 3a2fef1..ee35a2b 100644
--- a/main.py
+++ b/main.py
@@ -15,6 +15,11 @@ from src.utils.exception import (http_exception_handler,
 def create_app():
     app = FastAPI()
 
+    mysql_config, redis_config = init_config()
+    # 添加sqlalchemy数据库中间件
+    # once the middleware is applied, any route can then access the database session from the global ``db``
+    app.add_middleware(DBSessionMiddleware, db_url=mysql_config.sqlalchemy_db_uri)
+
     @app.on_event("startup")
     async def startup_event():
         # 创建日志文件夹和临时文件上传文件夹
@@ -26,13 +31,10 @@ def create_app():
                 os.mkdir("logs")
             logging_config.fileConfig('conf/log.ini')
         # 初始化配置文件
-        mysql_config, redis_config = init_config()
-        # 添加sqlalchemy数据库中间件
-        # once the middleware is applied, any route can then access the database session from the global ``db``
-        # app.add_middleware(DBSessionMiddleware, db_url=mysql_config.sqlalchemy_db_uri)
         # Redis 缓存初始化
-        # await fastapi_plugins.redis_plugin.init_app(app, redis_config)
-        # await fastapi_plugins.redis_plugin.init()
+        print(redis_config)
+        await fastapi_plugins.redis_plugin.init_app(app, redis_config)
+        await fastapi_plugins.redis_plugin.init()
 
     @app.on_event("shutdown")
     async def shutdown_event():