整合register端口进入login端口
This commit is contained in:
13
app.py
13
app.py
@@ -2570,6 +2570,8 @@ def check_wechat_scan():
|
|||||||
del wechat_qr_sessions[session_id]
|
del wechat_qr_sessions[session_id]
|
||||||
return jsonify({'status': 'expired'}), 200
|
return jsonify({'status': 'expired'}), 200
|
||||||
|
|
||||||
|
print(f"📡 [CHECK] session_id: {session_id[:8]}..., status: {session['status']}, user_info: {session.get('user_info')}")
|
||||||
|
|
||||||
return jsonify({
|
return jsonify({
|
||||||
'status': session['status'],
|
'status': session['status'],
|
||||||
'user_info': session.get('user_info'),
|
'user_info': session.get('user_info'),
|
||||||
@@ -2713,15 +2715,22 @@ def wechat_callback():
|
|||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
|
||||||
# 更新 wechat_qr_sessions 状态,供前端轮询检测
|
# 更新 wechat_qr_sessions 状态,供前端轮询检测
|
||||||
|
print(f"🔍 [DEBUG] state={state}, state in wechat_qr_sessions: {state in wechat_qr_sessions}")
|
||||||
if state in wechat_qr_sessions:
|
if state in wechat_qr_sessions:
|
||||||
session_item = wechat_qr_sessions[state]
|
session_item = wechat_qr_sessions[state]
|
||||||
|
mode = session_item.get('mode')
|
||||||
|
print(f"🔍 [DEBUG] session_item mode: {mode}, is_new_user: {is_new_user}")
|
||||||
# 不是绑定模式才更新为登录状态
|
# 不是绑定模式才更新为登录状态
|
||||||
if not session_item.get('mode'):
|
if not mode:
|
||||||
session_item['status'] = 'register_ready' if is_new_user else 'login_ready'
|
new_status = 'register_ready' if is_new_user else 'login_ready'
|
||||||
|
session_item['status'] = new_status
|
||||||
session_item['user_info'] = {
|
session_item['user_info'] = {
|
||||||
'user_id': user.id,
|
'user_id': user.id,
|
||||||
'is_new_user': is_new_user
|
'is_new_user': is_new_user
|
||||||
}
|
}
|
||||||
|
print(f"✅ [DEBUG] 更新 wechat_qr_sessions 状态: {new_status}, user_id: {user.id}")
|
||||||
|
else:
|
||||||
|
print(f"⚠️ [DEBUG] 跳过状态更新,因为 mode={mode}")
|
||||||
|
|
||||||
# 返回一个简单的成功页面(前端轮询会检测到状态变化)
|
# 返回一个简单的成功页面(前端轮询会检测到状态变化)
|
||||||
return '''
|
return '''
|
||||||
|
|||||||
Reference in New Issue
Block a user