From 314c283503e488eb0fe9bbbbe56af6b07ff5dc64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Sat, 24 Oct 2026 01:00:54 +0800 Subject: [PATCH] =?UTF-8?q?chore(flask-retire):=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=A7=20Flask=20=E7=89=88=E6=9C=AC=20API=20=E5=90=8E?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app.py | 49 ---------- backend/blueprints/__init__.py | 1 - backend/blueprints/version.py | 51 ---------- backend/config.py | 84 ---------------- backend/requirement.txt | 15 --- backend/run.sh | 98 ------------------- backend/utils/__init__.py | 1 - backend/utils/db.py | 174 --------------------------------- 8 files changed, 473 deletions(-) delete mode 100644 backend/app.py delete mode 100644 backend/blueprints/__init__.py delete mode 100644 backend/blueprints/version.py delete mode 100644 backend/config.py delete mode 100644 backend/requirement.txt delete mode 100644 backend/run.sh delete mode 100644 backend/utils/__init__.py delete mode 100644 backend/utils/db.py diff --git a/backend/app.py b/backend/app.py deleted file mode 100644 index 5189906ab..000000000 --- a/backend/app.py +++ /dev/null @@ -1,49 +0,0 @@ -""" -数富AI - Flask 后端 -管理后台(页面 web_source/ 与 /api/admin/* 蓝图)已整体迁移至 Java + Vue -(/admin-vue/,见 docs/specs/11-flask-removal-cutover.md,旧代码于 task-283 删除)。 -本进程当前只保留客户端仍在使用的版本公开 API:/api/version、/api/version/latest -(桌面客户端 app_client 的更新检查仍以本进程 15124 为 base_url,切换前勿下线)。 -""" -import os -import secrets - -from flask import Flask -from flask_cors import CORS - -from utils.db import close_db, init_db -from blueprints.version import version_bp - -BASE_DIR = os.path.dirname(os.path.abspath(__file__)) -app = Flask(__name__) - -# CORS配置:限制为可信域名(版本检查由桌面客户端/网页发起,跨域仍受限) -CORS(app, resources={ - r"/api/*": { - "origins": [ - "http://localhost:*", - "http://127.0.0.1:*", - "https://*.aishufu.top", - "http://*.aishufu.top" - ], - "methods": ["GET", "POST", "PUT", "DELETE", "OPTIONS"], - "allow_headers": ["Authorization", "Content-Type", "X-Requested-With", "X-Device-Id"], - "supports_credentials": True - } -}) -app.secret_key = os.environ.get('SECRET_KEY', secrets.token_hex(32)) - -# 注册蓝图:仅版本公开 API(管理后台 API 已迁 Java,见模块 docstring) -app.register_blueprint(version_bp) - -# 请求级数据库连接随请求结束释放(utils/db.get_db 复用同一连接) -app.teardown_appcontext(close_db) - - -def run_app(host='0.0.0.0', port=15124): - init_db() - app.run(host=host, port=port, threaded=True, use_reloader=False) - - -if __name__ == '__main__': - run_app() diff --git a/backend/blueprints/__init__.py b/backend/blueprints/__init__.py deleted file mode 100644 index 836aa1ea7..000000000 --- a/backend/blueprints/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# Blueprints 包 diff --git a/backend/blueprints/version.py b/backend/blueprints/version.py deleted file mode 100644 index e719bc37f..000000000 --- a/backend/blueprints/version.py +++ /dev/null @@ -1,51 +0,0 @@ -""" -版本公开 API 蓝图:当前版本、最新版本下载链接 -""" -import os -from flask import Blueprint, jsonify, current_app - -from utils.db import get_db - -version_bp = Blueprint('version', __name__, url_prefix='/api') - - -@version_bp.route('/version') -def api_version(): - """检测更新:返回当前版本及可选的最新版本信息""" - return jsonify({ - 'version': os.environ.get('APP_VERSION', '1.0.0'), - 'desc': '', - 'url': os.environ.get('APP_UPDATE_URL', ''), - }) - - -@version_bp.route('/version/latest') -def api_version_latest(): - """GET 获取最新版本的下载链接(取最新一条) - - 排序改用 id 而非 created_at:同一秒内写入多行时 created_at 无法定序,会取错版本。 - """ - conn = None - try: - conn = get_db() - with conn.cursor() as cur: - cur.execute( - "SELECT version, file_url FROM web_config ORDER BY id DESC LIMIT 1" - ) - row = cur.fetchone() - if not row: - return jsonify({'version': None, 'file_url': None}) - return jsonify({ - 'version': row['version'] or '', - 'file_url': row['file_url'] or '', - }) - except Exception as e: - current_app.logger.error('[version] internal error: %s', e, exc_info=True) - return jsonify({'error': '服务器内部错误,请稍后重试'}), 500 - finally: - # 异常路径同样要关连接:此前 conn.close() 写在 try 内,查询抛错即泄漏连接 - if conn is not None: - try: - conn.close() - except Exception: - pass diff --git a/backend/config.py b/backend/config.py deleted file mode 100644 index c791846b3..000000000 --- a/backend/config.py +++ /dev/null @@ -1,84 +0,0 @@ -import os -from pathlib import Path - -try: - from dotenv import load_dotenv -except ImportError: - def load_dotenv(*args, **kwargs): - return False - -base_url = "" -coze_token = "" -workflow_id = "" - -BASE_DIR = Path(__file__).resolve().parent -LOADED_ENV_FILES = [] - - -def _load_env_files(): - candidates = ( - BASE_DIR / ".env", - BASE_DIR.parent / "app" / ".env", - BASE_DIR.parent / ".env", - ) - for env_path in candidates: - if env_path.is_file(): - load_dotenv(dotenv_path=env_path, override=False) - LOADED_ENV_FILES.append(str(env_path)) - - -def _get_env(*names, default=None): - for name in names: - value = os.getenv(name) - if value not in (None, ""): - return value, name - return default, "config.default" - - -_load_env_files() - -# MySQL 配置 -mysql_host, mysql_host_source = _get_env("mysql_host", "MYSQL_HOST", default="47.110.241.161") -mysql_user, mysql_user_source = _get_env("mysql_user", "MYSQL_USER", default="aiimage") -mysql_password, mysql_password_source = _get_env("mysql_password", "MYSQL_PASSWORD", default="WTFrb5y6hNLz6hNy") -mysql_database, mysql_database_source = _get_env("mysql_database", "MYSQL_DATABASE", default="aiimage") - - -cache_path = "./user_data" - -backend_java_base_url, backend_java_base_url_source = _get_env( - "java_api_base", - "BACKEND_JAVA_BASE_URL", - # default="http://api.aishufu.top:18080/", - default="http://127.0.0.1:18080/", -) -backend_java_base_url = backend_java_base_url.rstrip("/") - - -# ==================== 对象存储配置(MinIO,S3 协议兼容) ==================== -# MinIO 默认 region 为 us-east-1 -region = os.getenv("oss_region", "us-east-1") -# S3 API 地址(域名 http://api.aishufu.top,或直连 http://47.110.241.161:9000) -endpoint = os.getenv("oss_endpoint", "https://oss.aishufu.top") -bucket = os.getenv("oss_bucket", "client") -accessKeyId = os.getenv("oss_access_key_id", "minioadmin") -accessKeySecret = os.getenv("oss_access_key_secret", "Minio@2024Secure") -bucket_path = os.getenv("oss_bucket_path", "nanri-image/") - -# 对外访问地址(可与上传用 endpoint 不同,例如走 CDN/域名),MinIO 为 path-style:{host}/{bucket}/{key} -_public_host = os.getenv("oss_public_host", endpoint).rstrip("/") -file_url_pre = f"{_public_host}/{bucket}/" - - -os.environ['OSS_ACCESS_KEY_ID'] = accessKeyId -os.environ['OSS_ACCESS_KEY_SECRET'] = accessKeySecret -os.environ.setdefault('AWS_ACCESS_KEY_ID', accessKeyId) -os.environ.setdefault('AWS_SECRET_ACCESS_KEY', accessKeySecret) - - - -debug = True -version = "1.0.0" -APP_UPDATE_URL = "" -os.environ["APP_VERSION"] = version -os.environ["APP_UPDATE_URL"] = version diff --git a/backend/requirement.txt b/backend/requirement.txt deleted file mode 100644 index 27213ce4e..000000000 --- a/backend/requirement.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Flask 版本公开 API 服务依赖(2026-09-11 由 pip freeze 全量清单裁剪) -# -# 原文件是 63 条的 pip freeze 快照,含 Nuitka/PyQt5/pywebview/pandas/numpy/bottle/websockets -# 等桌面端与旧后台打包遗留,本服务实际一个都不用。此处只保留真实 import 到的包: -# app.py / blueprints/version.py -> flask, flask-cors -# utils/db.py -> pymysql, werkzeug(security.generate_password_hash) -# config.py -> python-dotenv(可选,import 失败时走环境变量) -# -# 注意:run.sh 会检查本文件是否存在(缺失直接报错退出),并在关键依赖缺失时 -# 执行 `pip install -r requirement.txt`,因此不要删除本文件。 -Flask==3.1.3 -flask-cors==6.0.2 -PyMySQL==1.1.2 -Werkzeug==3.1.6 -python-dotenv==1.0.1 diff --git a/backend/run.sh b/backend/run.sh deleted file mode 100644 index 83112e6d8..000000000 --- a/backend/run.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -PORT="${PORT:-15124}" -HOST="${HOST:-0.0.0.0}" -APP_MODULE="${APP_MODULE:-app.py}" -PID_FILE="${PID_FILE:-backend.pid}" -LOG_FILE="${LOG_FILE:-backend.log}" - -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -cd "$SCRIPT_DIR" - -echo "检查端口 ${PORT} ..." -if command -v ss >/dev/null 2>&1; then - if ss -ltn | awk '{print $4}' | grep -Eq "(^|:)${PORT}$"; then - echo "错误: 端口 ${PORT} 已被占用,请先释放后再启动。" - exit 1 - fi -elif command -v netstat >/dev/null 2>&1; then - if netstat -ltn 2>/dev/null | awk '{print $4}' | grep -Eq "(^|:)${PORT}$"; then - echo "错误: 端口 ${PORT} 已被占用,请先释放后再启动。" - exit 1 - fi -else - echo "警告: 未找到 ss 或 netstat,跳过端口占用检查。" -fi -echo "端口 ${PORT} 未被占用。" -echo "工作目录已切换至: ${SCRIPT_DIR}" - -PYTHON_BIN="" -if [[ -x "${SCRIPT_DIR}/venv/bin/python" ]]; then - PYTHON_BIN="${SCRIPT_DIR}/venv/bin/python" -elif [[ -x "${SCRIPT_DIR}/.venv/bin/python" ]]; then - PYTHON_BIN="${SCRIPT_DIR}/.venv/bin/python" -elif command -v python3 >/dev/null 2>&1; then - PYTHON_BIN="$(command -v python3)" -elif command -v python >/dev/null 2>&1; then - PYTHON_BIN="$(command -v python)" -else - echo "错误: 未找到可用的 Python,请先安装 Python 3.9+。" - exit 1 -fi - -echo "使用 Python: ${PYTHON_BIN}" -"${PYTHON_BIN}" - <<'PY' -import sys -major, minor = sys.version_info[:2] -if (major, minor) < (3, 9): - print(f"错误: 当前 Python 版本为 {major}.{minor},项目至少需要 Python 3.9。") - print("原因: requirement.txt 中的 Flask 3.x、pandas 2.x 等依赖不支持 Python 3.6。") - raise SystemExit(1) -print(f"Python 版本检查通过: {major}.{minor}") -PY - -if [[ ! -f "requirement.txt" ]]; then - echo "错误: 未找到 requirement.txt。" - exit 1 -fi - -echo "检查关键依赖 ..." -if ! "${PYTHON_BIN}" - <<'PY' -import importlib.util -modules = ("flask", "flask_cors", "pymysql", "werkzeug") -missing = [name for name in modules if importlib.util.find_spec(name) is None] -if missing: - print("缺少依赖: " + ", ".join(missing)) - raise SystemExit(1) -print("关键依赖已安装。") -PY -then - echo "开始安装 requirement.txt ..." - "${PYTHON_BIN}" -m pip install --upgrade pip - "${PYTHON_BIN}" -m pip install -r requirement.txt -fi - -if [[ -f "${PID_FILE}" ]]; then - OLD_PID="$(cat "${PID_FILE}" 2>/dev/null || true)" - if [[ -n "${OLD_PID}" ]] && kill -0 "${OLD_PID}" 2>/dev/null; then - echo "错误: 检测到服务已在运行,PID=${OLD_PID}" - exit 1 - fi - rm -f "${PID_FILE}" -fi - -echo "启动 Flask 服务 ${HOST}:${PORT} ..." -nohup "${PYTHON_BIN}" "${APP_MODULE}" >> "${LOG_FILE}" 2>&1 & -NEW_PID=$! -echo "${NEW_PID}" > "${PID_FILE}" - -sleep 2 -if kill -0 "${NEW_PID}" 2>/dev/null; then - echo "启动成功,PID=${NEW_PID}" - echo "日志文件: ${SCRIPT_DIR}/${LOG_FILE}" -else - echo "错误: 服务启动失败,请检查日志 ${SCRIPT_DIR}/${LOG_FILE}" - exit 1 -fi diff --git a/backend/utils/__init__.py b/backend/utils/__init__.py deleted file mode 100644 index 9d0ed9e65..000000000 --- a/backend/utils/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# Utils 包:数据库连接(管理后台旧代码 task-283 删除后仅保留 db 工具) diff --git a/backend/utils/db.py b/backend/utils/db.py deleted file mode 100644 index 7083738f1..000000000 --- a/backend/utils/db.py +++ /dev/null @@ -1,174 +0,0 @@ -""" -数据库连接与初始化 - -请求级连接复用:pymysql 每次 connect 都要做一次完整的鉴权握手,而本进程 -(15124)只服务 /api/version、/api/version/latest 这类轻量查询,握手开销 -占了单次请求的大头。连接因此挂在 flask.g 上按请求复用,请求结束由 -close_db(注册在 app.teardown_appcontext)统一释放。 -""" -import re - -import pymysql - -try: - from flask import g, has_app_context -except ImportError: # 非 Flask 环境(脚本/离线核查)下退化为每次新建连接 - g = None - - def has_app_context() -> bool: - return False - -# 请求级连接挂在 flask.g 上的属性名(避免与业务字段冲突) -_CONN_ATTR = "_shufu_db_conn" - -try: - from config import mysql_host as config_mysql_host - from config import mysql_user as config_mysql_user - from config import mysql_password as config_mysql_password - from config import mysql_database as config_mysql_database - from config import mysql_host_source as config_mysql_host_source - from config import mysql_user_source as config_mysql_user_source - from config import mysql_database_source as config_mysql_database_source -except ImportError: - config_mysql_host = 'localhost' - config_mysql_user = 'root' - config_mysql_password = '' - config_mysql_database = 'maixiang_ai' - config_mysql_host_source = 'fallback.default' - config_mysql_user_source = 'fallback.default' - config_mysql_database_source = 'fallback.default' - -mysql_host = config_mysql_host -mysql_user = config_mysql_user -mysql_password = config_mysql_password -mysql_database = config_mysql_database -mysql_host_source = config_mysql_host_source -mysql_user_source = config_mysql_user_source -mysql_database_source = config_mysql_database_source - - -def _safe_identifier(name): - """仅允许字母、数字、下划线的数据库/表名片段,防止注入 DDL 片段。""" - if not re.fullmatch(r'[A-Za-z0-9_]+', name or ''): - raise ValueError(f'非法标识符: {name!r}') - return name - - -def describe_db_target(): - return ( - f"{mysql_user}@{mysql_host}/{mysql_database} " - f"(host={mysql_host_source}, user={mysql_user_source}, database={mysql_database_source})" - ) - - -def _connect(): - return pymysql.connect( - host=mysql_host, - user=mysql_user, - password=mysql_password, - database=mysql_database, - charset='utf8mb4', - cursorclass=pymysql.cursors.DictCursor - ) - - -def _is_alive(conn) -> bool: - """连接可用性探测:已关闭直接判死,否则发一次 COM_PING。 - - COM_PING 一次往返远小于一次完整鉴权握手;不用 ping(reconnect=True) - (该参数在新版 pymysql 已废弃,且失败时会自行重连、语义不可控)。 - """ - try: - if not conn.open: - return False - conn.ping(reconnect=False) - return True - except Exception: - return False - - -def _close_quietly(conn) -> None: - """静默关闭连接(可能为 None / 已关闭 / 断连)。""" - if conn is None: - return - try: - conn.close() - except Exception: - pass - - -def get_db(): - """取当前请求的数据库连接(同一请求内复用,避免每次请求都做鉴权握手)。 - - 连接挂在 flask.g 上,请求结束由 close_db 释放;被服务端 wait_timeout - 断开、或调用方提前 close 过,这里都会静默换成新连接,调用方无感知。 - 无 Flask 应用上下文时(脚本调用)退回每次新建,保持旧行为。 - """ - ctx = g if has_app_context() else None - conn = getattr(ctx, _CONN_ATTR, None) if ctx is not None else None - if conn is not None: - if _is_alive(conn): - return conn - # 断连/已被关闭:丢弃旧连接后重建(不把坏连接交给业务查询) - _close_quietly(conn) - try: - delattr(ctx, _CONN_ATTR) - except Exception: - pass - conn = _connect() - if ctx is not None: - setattr(ctx, _CONN_ATTR, conn) - return conn - - -def close_db(exc=None) -> None: - """释放当前请求的连接(注册为 app.teardown_appcontext 回调)。 - - 异常路径同样会走 teardown,因此查询抛错时连接不会泄漏到下一次请求。 - """ - ctx = g if has_app_context() else None - if ctx is None: - return - conn = getattr(ctx, _CONN_ATTR, None) - if conn is None: - return - try: - delattr(ctx, _CONN_ATTR) - except Exception: - pass - _close_quietly(conn) - - -def init_db(): - """确保版本公开 API 依赖的最小表结构存在。 - - 本进程(15124)只服务 /api/version、/api/version/latest,仅依赖 web_config 表。 - - 历史遗留说明(2026-09 全维度审查后删除):这里原本还会创建 users 表、执行 role 角色 - 迁移、并在查不到 super_admin 时用 ADMIN_PASSWORD(默认 admin123)插入一个超管。 - 管理后台早已迁到 Java,users 表结构由 Flyway 迁移管理,本进程再写会与之冲突; - 其中「无超管即用默认密码建超管」在生产等同于后门(删除超管或改 role 枚举后本进程 - 重启就会静默重建一个密码已知的超管),故整段移除。 - """ - conn = pymysql.connect( - host=mysql_host, - user=mysql_user, - password=mysql_password, - charset='utf8mb4' - ) - try: - db_name = _safe_identifier(mysql_database) - with conn.cursor() as cur: - cur.execute(f"CREATE DATABASE IF NOT EXISTS `{db_name}` DEFAULT CHARSET utf8mb4") - cur.execute(f"USE `{db_name}`") - cur.execute(""" - CREATE TABLE IF NOT EXISTS web_config ( - id INT AUTO_INCREMENT PRIMARY KEY, - version VARCHAR(64) NOT NULL, - file_url VARCHAR(1024) NOT NULL, - created_at DATETIME DEFAULT CURRENT_TIMESTAMP - ) - """) - conn.commit() - finally: - conn.close()