From 69744cf7cbd8939fa01eef4481f79ad075680214 Mon Sep 17 00:00:00 2001
From: Jing Ling <shmilylty@gmail.com>
Date: Sun, 10 May 2020 15:19:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A5=E9=80=82=E5=BA=94?=
 =?UTF-8?q?=E6=96=B0=E6=8E=A5=E5=8F=A3#82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{certificates => datasets}/spyse_api.py   | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)
 rename modules/{certificates => datasets}/spyse_api.py (72%)

diff --git a/modules/certificates/spyse_api.py b/modules/datasets/spyse_api.py
similarity index 72%
rename from modules/certificates/spyse_api.py
rename to modules/datasets/spyse_api.py
index a5e56b1..ce707b5 100644
--- a/modules/certificates/spyse_api.py
+++ b/modules/datasets/spyse_api.py
@@ -7,23 +7,23 @@ class SpyseAPI(Query):
     def __init__(self, domain):
         Query.__init__(self)
         self.domain = domain
-        self.module = 'Certificate'
-        self.source = 'CertDBAPIQuery'
-        self.addr = 'https://api.spyse.com/v1/subdomains'
+        self.module = 'Dataset'
+        self.source = 'SpyseAPIQuery'
         self.token = api.spyse_api_token
 
     def query(self):
         """
         向接口查询子域并做子域匹配
         """
-        page_num = 1
+        limit = 100
+        offset = 0
         while True:
             self.header = self.get_header()
+            self.header.update({'Authorization': 'Bearer ' + self.token})
             self.proxy = self.get_proxy(self.source)
-            params = {'domain': self.domain,
-                      'api_token': self.token,
-                      'page': page_num}
-            resp = self.get(self.addr, params)
+            addr = 'https://api.spyse.com/v2/data/domain/subdomain'
+            params = {'domain': self.domain, 'offset': offset, 'limit': limit}
+            resp = self.get(addr, params)
             if not resp:
                 return
             json = resp.json()
@@ -32,9 +32,8 @@ class SpyseAPI(Query):
                 break
             # 合并搜索子域名搜索结果
             self.subdomains = self.subdomains.union(subdomains)
-            page_num += 1
-            # 默认每次查询最多返回30条 当前条数小于30条说明已经查完
-            if json.get('count') < 30:
+            offset += limit
+            if len(json.get('data').get('items')) < limit:
                 break
 
     def run(self):