修改登录退出逻辑
This commit is contained in:
@ -2,7 +2,6 @@
|
||||
|
||||
from flask import Flask
|
||||
from config import Config
|
||||
# 【修改】增加 jwt 引入
|
||||
from app.extensions import db, migrate, cors, jwt
|
||||
import os
|
||||
|
||||
@ -16,36 +15,44 @@ def create_app():
|
||||
# =========================================================
|
||||
db.init_app(app)
|
||||
migrate.init_app(app, db)
|
||||
jwt.init_app(app) # 初始化 JWT
|
||||
|
||||
# 【新增】初始化 JWT (用于 Token 认证)
|
||||
jwt.init_app(app)
|
||||
|
||||
# 确保跨域配置
|
||||
# 允许 /api/ 开头的请求跨域
|
||||
cors.init_app(app, resources={r"/*": {"origins": "*"}})
|
||||
# 允许所有 /api/ 开头的请求跨域，支持 credentials
|
||||
cors.init_app(app, resources={r"/*": {"origins": "*"}}, supports_credentials=True)
|
||||
|
||||
# =========================================================
|
||||
# 2. 注册蓝图 (Blueprints)
|
||||
# ---------------------------------------------------------
|
||||
# 注意：为了解决前端请求不带 /v1 导致的 404 错误，
|
||||
# 下面的模块都采用了 "双重注册" 策略：
|
||||
# 1. 标准地址: /api/v1/...
|
||||
# 2. 兼容地址: /api/... (name 参数必须不同)
|
||||
# =========================================================
|
||||
|
||||
# -----------------------------------------------------
|
||||
# 2.0 [新增] 注册权限与认证模块 (Auth) - 最关键修复
|
||||
# 2.0 注册权限与认证模块 (Auth)
|
||||
# -----------------------------------------------------
|
||||
try:
|
||||
from app.api.v1.auth import auth_bp
|
||||
# 前端请求地址: /api/v1/auth/login
|
||||
# 标准
|
||||
app.register_blueprint(auth_bp, url_prefix='/api/v1/auth')
|
||||
print("✅ Auth (System & Login) 模块注册成功")
|
||||
# 兼容 (防止前端忘记写 v1)
|
||||
app.register_blueprint(auth_bp, url_prefix='/api/auth', name='auth_legacy')
|
||||
print("✅ Auth 模块注册成功")
|
||||
except ImportError as e:
|
||||
print(f"❌ 错误: Auth 模块导入失败: {e}")
|
||||
|
||||
# -----------------------------------------------------
|
||||
# 2.1 注册入库聚合模块 (Inbound)
|
||||
# 2.1 注册入库聚合模块 (Inbound) - 【核心修复点】
|
||||
# -----------------------------------------------------
|
||||
try:
|
||||
from app.api.v1.inbound import inbound_bp
|
||||
# 标准: /api/v1/inbound/base/list
|
||||
app.register_blueprint(inbound_bp, url_prefix='/api/v1/inbound')
|
||||
print("✅ Inbound (Buy, Semi, Product, Base) 模块注册成功")
|
||||
|
||||
# 兼容: /api/inbound/base/list (修复前端 404)
|
||||
app.register_blueprint(inbound_bp, url_prefix='/api/inbound', name='inbound_legacy')
|
||||
print("✅ Inbound 模块注册成功 (已启用兼容模式: /api/inbound)")
|
||||
except ImportError as e:
|
||||
print(f"❌ 错误: Inbound 模块导入失败: {e}")
|
||||
|
||||
@ -55,7 +62,8 @@ def create_app():
|
||||
try:
|
||||
from app.api.v1.common.print import print_bp
|
||||
app.register_blueprint(print_bp, url_prefix='/api/v1/common/print')
|
||||
print("✅ Print (Label Printing) 模块注册成功")
|
||||
app.register_blueprint(print_bp, url_prefix='/api/common/print', name='print_legacy')
|
||||
print("✅ Print 模块注册成功")
|
||||
except ImportError as e:
|
||||
print(f"❌ 错误: Print 模块导入失败: {e}")
|
||||
|
||||
@ -64,51 +72,44 @@ def create_app():
|
||||
# -----------------------------------------------------
|
||||
try:
|
||||
from app.api.v1.common.upload import upload_bp
|
||||
# 注册方式 1: 标准路径
|
||||
app.register_blueprint(upload_bp, url_prefix='/api/v1/common')
|
||||
# 注册方式 2: 兼容路径 (防止反向代理剥离 /api)
|
||||
app.register_blueprint(upload_bp, url_prefix='/v1/common', name='upload_fallback')
|
||||
print("✅ Upload (File Storage) 模块注册成功 (双路径兼容模式)")
|
||||
app.register_blueprint(upload_bp, url_prefix='/api/common', name='upload_legacy')
|
||||
print("✅ Upload 模块注册成功")
|
||||
except ImportError as e:
|
||||
print(f"❌ 错误: Upload 模块导入失败: {e}")
|
||||
|
||||
# -----------------------------------------------------
|
||||
# 2.4 [新增] 注册业务操作模块 (Transactions)
|
||||
# 2.4 注册业务操作模块 (Transactions)
|
||||
# -----------------------------------------------------
|
||||
try:
|
||||
# 对应 borrow, return, scrap 等操作
|
||||
from app.api.v1.transactions import trans_bp
|
||||
app.register_blueprint(trans_bp, url_prefix='/api/v1/trans')
|
||||
print("✅ Transactions (Borrow, Return, Scrap) 模块注册成功")
|
||||
app.register_blueprint(trans_bp, url_prefix='/api/trans', name='trans_legacy')
|
||||
print("✅ Transactions 模块注册成功")
|
||||
except ImportError as e:
|
||||
# 如果文件还没写好，这里会报错，但不影响主程序启动
|
||||
print(f"⚠️ 警告: Transaction 模块导入失败 (如果是新建项目可忽略): {e}")
|
||||
# 允许模块不存在时不崩溃
|
||||
print(f"⚠️ 提示: Transaction 模块尚未创建或导入失败: {e}")
|
||||
|
||||
# =========================================================
|
||||
# 3. 预加载数据模型 (解决 relationship 找不到模型的问题)
|
||||
# 3. 预加载数据模型
|
||||
# =========================================================
|
||||
with app.app_context():
|
||||
try:
|
||||
# 1. 基础物料
|
||||
# 基础与库存模型
|
||||
from app.models.base import MaterialBase
|
||||
# 2. 采购入库
|
||||
from app.models.inbound.buy import StockBuy
|
||||
# 3. 半成品入库
|
||||
from app.models.inbound.semi import StockSemi
|
||||
# 4. 成品入库
|
||||
from app.models.inbound.product import StockProduct
|
||||
|
||||
# 【新增】5. 系统用户 (关键：确保创建 user 表)
|
||||
# 系统与业务模型
|
||||
from app.models.system import SysUser, SysLog
|
||||
|
||||
# 【新增】6. 业务流水
|
||||
from app.models.transaction import TransBorrow, TransRepair, TransScrap
|
||||
|
||||
# 开发环境自动建表 (根据之前的对话，强烈建议在容器第一次启动时开启或手动调用)
|
||||
# 首次运行时可取消注释自动建表 (但在生产环境建议使用 flask db upgrade)
|
||||
# db.create_all()
|
||||
|
||||
except ImportError as e:
|
||||
print(f"⚠️ 模型预加载失败: {e}")
|
||||
print(f"⚠️ 模型预加载部分失败 (检查是否缺少文件): {e}")
|
||||
except Exception as e:
|
||||
print(f"⚠️ 模型预加载发生未知错误: {e}")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user