diff options
| author | handingkang <[email protected]> | 2024-04-12 16:30:46 +0800 |
|---|---|---|
| committer | handingkang <[email protected]> | 2024-04-12 16:30:46 +0800 |
| commit | 914a569750942e61af3bebbbf99e834d35a66200 (patch) | |
| tree | ed9ba10937aa2faf427184c57b3e719784029b80 | |
| parent | 8c6d7e3dc8a29d67dcf0638aac8b22d24eaa9eea (diff) | |
1. 目标信息获取接口初步测试完成
| -rw-r--r-- | server/apps/agentcomm.py | 3 | ||||
| -rw-r--r-- | server/apps/target.py | 5 | ||||
| -rw-r--r-- | server/apps/util.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/server/apps/agentcomm.py b/server/apps/agentcomm.py index 0047c4d..178f66e 100644 --- a/server/apps/agentcomm.py +++ b/server/apps/agentcomm.py @@ -7,7 +7,7 @@ from apiflask.validators import OneOf from flask import request from settings import * -from .util import da, debug +from .util import da bp = APIBlueprint("代理管理接口集合", __name__, url_prefix="/agent") @@ -132,7 +132,6 @@ def agent_info(query_data): page = query_data["page"] agent_list = [] res = da.get_data(data_type="agent", offset=(page - 1) * per_page, limit=per_page) - debug(res) for r in res: agent = {} for key, value in r.items(): diff --git a/server/apps/target.py b/server/apps/target.py index a0606a4..6ea43d1 100644 --- a/server/apps/target.py +++ b/server/apps/target.py @@ -8,7 +8,7 @@ from apiflask import APIBlueprint, Schema from apiflask.fields import Integer, String, List, Nested, IP, DateTime, Dict from requests.exceptions import Timeout -from .util import da +from .util import da, debug bp = APIBlueprint("目标信息及状态接口集合", __name__, url_prefix="/target") @@ -241,7 +241,8 @@ def target_info(query_data): # 支持的协议特殊处理 protocol = [] for k, v in r.items(): - if k in ["IPv6", "DNSSEC", "DOH", "DOT"] and v is True: + debug(k + ":" + str(v)) + if k in ["IPv6", "DNSSEC", "DOH", "DOT"] and bool(v) is True: protocol.append(k) target["protocol"] = protocol # 防护措施特殊处理 diff --git a/server/apps/util.py b/server/apps/util.py index 7c0c99a..c789f61 100644 --- a/server/apps/util.py +++ b/server/apps/util.py @@ -97,11 +97,11 @@ class DataHandler: )ENGINE=innodb DEFAULT CHARSET=utf8; """ % (MYSQL_TAB_SYSLOG, MYSQL_TAB_USER) targetsql = """CREATE TABLE IF NOT EXISTS %s( - `TARGET_ID` varchar(255) NOT NULL PRIMARY KEY, + `TARGET_ID` int NOT NULL AUTO_INCREMENT PRIMARY KEY, `ADDRv4` varchar(255), `ADDRv6` varchar(255), `IPv6` bool, - `DNSESEC` bool, + `DNSSEC` bool, `DOT` bool, `DOH` bool, `COU` varchar(255), |
