From 45fbb3f51e01a3ae272b422ff3055197ac5e2b0a Mon Sep 17 00:00:00 2001
From: zy123 <646228430@qq.com>
Date: Thu, 5 Dec 2024 09:22:45 +0800
Subject: [PATCH] 12.4

---
 docker-compose.yml     | 9 +--------
 flask_app/run_serve.py | 6 ++++++
 flask_app/start_up.py  | 6 +++---
 requirements.txt       | 3 ++-
 4 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 flask_app/run_serve.py

diff --git a/docker-compose.yml b/docker-compose.yml
index 76c1e3b..a017377 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,14 +11,7 @@ services:
 #      - .:/flask_project  # 将当前目录挂载到容器的 /flask_project 目录（可选，便于开发时实时更新代码）
       - /home/Z/zbparse_output_dev:/flask_project/flask_app/static/output  # 额外的数据卷挂载
     restart: unless-stopped  # 容器退出时自动重启，除非明确停止
-    mem_limit: "8g"          # 容器最大可使用内存为8GB
-    mem_reservation: "4g"    # 容器保证可使用内存为4GB
-    cpus: 2.0                # 限制容器使用2个CPU核心
-    ulimits:
-      nproc: 65535            # 允许的最大进程数
-      nofile:
-        soft: 65535           # 软限制的文件描述符数
-        hard: 65535           # 硬限制的文件描述符数
+    privileged: true
 
 # 可选：定义网络或其他全局配置
 # networks:
diff --git a/flask_app/run_serve.py b/flask_app/run_serve.py
new file mode 100644
index 0000000..100de81
--- /dev/null
+++ b/flask_app/run_serve.py
@@ -0,0 +1,6 @@
+#flask_app/run_serve.py
+from waitress import serve
+from flask_app.start_up import create_app
+if __name__ == "__main__":
+    app=create_app()
+    serve(app, host='0.0.0.0', port=5000)
\ No newline at end of file
diff --git a/flask_app/start_up.py b/flask_app/start_up.py
index fc9e781..0cbb077 100644
--- a/flask_app/start_up.py
+++ b/flask_app/start_up.py
@@ -47,6 +47,6 @@ def create_app():
 
 #TODO:培训要求、总体要求、进度要求、'建设要求'到技术要求中，归类到其他要求中
 
-if __name__ == '__main__':
-    app = create_app()
-    app.run(debug=True, host='0.0.0.0', port=5000)
+# if __name__ == '__main__':
+#     app = create_app()
+#     app.run(debug=True, host='0.0.0.0', port=5000)
diff --git a/requirements.txt b/requirements.txt
index d2cda5d..cf6b879 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,4 +15,5 @@ PyMuPDF==1.24.1
 openai==1.33.0
 pathlib==1.0.1
 alibabacloud_bailian20231229==1.7.0
-ratelimit==2.2.1
\ No newline at end of file
+ratelimit==2.2.1
+waitress~=3.0.0
\ No newline at end of file