diff --git a/app.py b/app.py index 2cc0a80..6a8986f 100644 --- a/app.py +++ b/app.py @@ -134,52 +134,7 @@ def scan_wx_login_info(): break -# def app_run(): - -# app = Flask(__name__) - -# # api = Api(app) -# flask_api = Api(app,errors=errors, catch_all_404s=True) - -# # 设置日志(logger 已在 log.py 中配置) -# app.logger.handlers.clear() # 清除 Flask 默认的日志处理器 -# app.logger.addHandler(logger.handlers[1]) # 使用文件日志处理器 -# app.logger.setLevel(logging.DEBUG) # 设置日志级别 - -# # 添加拦截器 -# app.before_request(before_request) -# app.after_request(after_request) -# app.register_error_handler(Exception, handle_exception) - -# # 定义路由 -# flask_api.add_resource(UserResource, '/api/user', '/api/user/') - - -# flask_api.add_resource(MessagesResource, '/messages') - -# flask_api.add_resource(DeleteFriendResource, '/api/contacts/deletefriend') -# flask_api.add_resource(GetFriendsInfoResource, '/api/contacts/getfriends') - -# flask_api.add_resource(GetWxchatConfigResource, '/api/wxchat/getconfig') -# flask_api.add_resource(SaveWxchatConfigResource, '/api/wxchat/saveconfig') - -# flask_api.add_resource(GetGroupsInfoResource, '/api/groups/getchatroominfo') - - -# load_config() -# worker() - - -# # 获取环境变量 -# environment = os.environ.get('environment', 'default') -# port = 5000 if environment == 'default' else 80 # default 使用 5000,其他环境使用 80 -# if environment == 'default': -# app.run(debug=False, host='0.0.0.0', port=port) # 默认直接启动 Flask 内置服务器 -# else: -# # 在非 default 环境中,使用 Gunicorn 启动应用 -# #os.system(f"gunicorn -w 4 -b 0.0.0.0:{port} app:app") # 启动 Gunicorn,4 个工作进程 -# app.run() app = Flask(__name__) diff --git a/wechat/biz.py b/wechat/biz.py index 97fcfcb..b55e514 100644 --- a/wechat/biz.py +++ b/wechat/biz.py @@ -368,8 +368,8 @@ def wx_login(wxchat:gewe_chat.GeWeChatCom,tel,token_id): else: print("重连失败,重新登录...") login_info = login_or_reconnect(wxchat, token_id, app_id, hash_key, is_reconnect=True) - - fetch_and_save_contacts(wxchat, token_id, login_info.get('appId'), hash_key) + if login_info: + fetch_and_save_contacts(wxchat, token_id, login_info.get('appId'), hash_key) def ops_messages_process(message): try: