From 01c57d489ac9f6a900e6ce9b1e012bc62ce08643 Mon Sep 17 00:00:00 2001 From: xaoyaoo Date: Fri, 12 Jan 2024 12:13:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=93=E4=B8=9A=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E4=B8=AD=E5=90=88=E5=B9=B6=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pywxdump/api/api.py | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pywxdump/api/api.py b/pywxdump/api/api.py index 802a06a..b2dc87d 100644 --- a/pywxdump/api/api.py +++ b/pywxdump/api/api.py @@ -11,7 +11,7 @@ import os from flask import Flask, request, render_template, g, Blueprint, send_file from pywxdump import analyzer, read_img_dat, read_audio from pywxdump.api.rjson import ReJson, RqJson -from pywxdump import read_info, VERSION_LIST, batch_decrypt, BiasAddr +from pywxdump import read_info, VERSION_LIST, batch_decrypt, BiasAddr, merge_db # app = Flask(__name__, static_folder='../ui/web/dist', static_url_path='/') @@ -219,6 +219,7 @@ def decrypt(): wxinfos = batch_decrypt(key, wxdb_path, out_path=out_path) return ReJson(0, str(wxinfos)) + @api.route('/api/biasaddr', methods=["GET", 'POST']) def biasaddr(): """ @@ -232,10 +233,29 @@ def biasaddr(): wxdbPath = request.json.get("wxdbPath", "") if not mobile or not name or not account: return ReJson(1002) - rdata = BiasAddr(account,mobile, name, key, wxdbPath).run() + rdata = BiasAddr(account, mobile, name, key, wxdbPath).run() return ReJson(0, str(rdata)) + +@api.route('/api/merge', methods=["GET", 'POST']) +def merge(): + """ + 合并 + :return: + """ + wxdb_path = request.json.get("dbPath") + if not wxdb_path: + return ReJson(1002) + out_path = request.json.get("outPath") + if not out_path: + return ReJson(1002) + rdata = merge_db(wxdb_path, out_path) + return ReJson(0, str(rdata)) + + # END 这部分为专业工具的api + + @api.route('/') def index(): return render_template('index.html')