diff --git a/pywxdump/api/remote_server.py b/pywxdump/api/remote_server.py index d1212dd..5a9bfaf 100644 --- a/pywxdump/api/remote_server.py +++ b/pywxdump/api/remote_server.py @@ -234,12 +234,12 @@ def get_msgs(): return ReJson(1002, body=f"start or limit is not int {start} {limit}") db = DBHandler(db_config) - msgs, wxid_list = db.get_msg_list(wxid, start, limit) + msgs, wxid_list = db.get_msg_list(wxid=wxid, start_index=start, page_size=limit) if not msgs: - msgs, wxid_list = db.get_plc_msg_list(wxid, start, limit) + msgs, wxid_list = db.get_plc_msg_list(wxid=wxid, start_index=start, page_size=limit) wxid_list.append(my_wxid) - user_list = db.get_user_list(wxids=wxid_list) - return ReJson(0, {"msg_list": msgs, "user_list": user_list}) + user = db.get_user_list(wxids=wxid_list) + return ReJson(0, {"msg_list": msgs, "user_list": user}) @rs_api.route('/api/rs/video/', methods=["GET", 'POST']) diff --git a/pywxdump/db/dbMSG.py b/pywxdump/db/dbMSG.py index d80c476..a5a1f7b 100644 --- a/pywxdump/db/dbMSG.py +++ b/pywxdump/db/dbMSG.py @@ -137,7 +137,7 @@ class MsgHandler(DatabaseBase): DictExtra = get_BytesExtra(BytesExtra) cdnurl = match_BytesExtra(DictExtra) if cdnurl: - content = {"src": cdnurl, "msg": "表情"} + msg, src = "表情", cdnurl elif type_id == (48, 0): # 地图信息 content_tmp = xml2dict(StrContent)