1. 修复策略初始化中因不存在目标数据存在的问题

2. 隐去task.py无用debug输出点
3. TASK表结构新增SCAN_AGENT_ID_LIST列，记录负责目标状态感知的代理ID和IPv4地址

3 files changed, 8 insertions, 7 deletions

diff --git a/server/apps/policy.py b/server/apps/policy.py
index 3c75175..93f0ca7 100644
--- a/server/apps/policy.py
+++ b/server/apps/policy.py
@@ -14,10 +14,10 @@ def init_task_policy(ptype, target, task):
         res = da.get_data(data_type="target", search={""})
     # IPv4
     elif ip_version == 4:
-        res = da.get_data(data_type="target", search={"ADDRv4": target})[0]
+        res = da.get_data(data_type="target", search={"ADDRv4": target})
     # IPv6
     elif ip_version == 6:
-        res = da.get_data(data_type="target", search={"ADDRv6": target})[0]
+        res = da.get_data(data_type="target", search={"ADDRv6": target})
     else:
         exit(1)
 
@@ -29,8 +29,9 @@ def init_task_policy(ptype, target, task):
         proto = ["IPv6", "DOH", "DOT", "DNSSEC"]
     # 存在该目标的记录
     else:
+        t = res[0]
         for k in ["IPv6", "DOH", "DOT", "DNSSEC"]:
-            if res[k]:
+            if t[k]:
                 proto.append(k)
 
     # 可选策略范围 policy
diff --git a/server/apps/task.py b/server/apps/task.py
index 981b1c6..5f83954 100644
--- a/server/apps/task.py
+++ b/server/apps/task.py
@@ -10,7 +10,7 @@ from exts import db
 from model import TaskPolicy
 from .agentcomm import deliver_task
 from .policy import *
-from .util import da, error, debug
+from .util import da, error
 
 bp = APIBlueprint("任务管理接口集合", __name__, url_prefix="/task")
 
@@ -208,7 +208,7 @@ def make_task(json_data):
     '%(nodes)s'
     );
     """ % task_info
-    debug(sql)
+    # debug(sql)
     da.cursor.execute(sql)
     da.conn.commit()
 
diff --git a/server/apps/util.py b/server/apps/util.py
index 9ea099d..c5892d7 100644
--- a/server/apps/util.py
+++ b/server/apps/util.py
@@ -101,6 +101,7 @@ class DataHandler:
         `TARGET_DOMAIN` varchar(255),
         `TARGET_RTYPE` varchar(255),
         `TARGET_RR` varchar(255),
+        `SCAN_AGENT_ID_LIST` json,
         FOREIGN KEY(`AGENT_ID`) REFERENCES %s(`AGENT_ID`),
         FOREIGN KEY(`CREATED_BY`) REFERENCES %s(`USER_ID`)
         )ENGINE=innodb DEFAULT CHARSET=utf8; """ % (
@@ -135,7 +136,6 @@ class DataHandler:
         `USER_PWD_HASH` varchar(255),
         `USER_GROUP` varchar(255)) ENGINE=innodb DEFAULT CHARSET=utf8;""" % MYSQL_TAB_USER
 
-
         # 执行sql语句
         try:
             # 创建数据库
@@ -196,7 +196,7 @@ class DataHandler:
             if not count:
                 sql = """SELECT * FROM %s WHERE %s LIMIT %s, %s""" % (
                     tabname, " AND ".join(["=".join(condition.popitem()) for _ in range(l)]), offset, offset + limit)
-                print(sql)
+                # print(sql)
                 self.cursor.execute(sql)
                 return self.cursor.fetchall()
             else: