调整执行finish函数位置

oneforall/modules/datasets/binaryedge_api.py

@@ -35,10 +35,10 @@ class BinaryEdgeAPI(Query):
             return
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/datasets/bufferover.py

@@ -31,10 +31,10 @@ class BufferOver(Query):
         """
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/datasets/chinaz.py

@@ -31,10 +31,10 @@ class Chinaz(Query):
         """
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/datasets/chinaz_api.py

@@ -35,10 +35,10 @@ class ChinazAPI(Query):
             return
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/datasets/circl_api.py

@@ -35,10 +35,10 @@ class CirclAPI(Query):
             return
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/datasets/dnsdb.py

@@ -26,8 +26,9 @@ class DNSdb(Query):
         if resp.status_code == 200:
             if 'index' in resp.text:
                 soup = BeautifulSoup(resp.text, features='lxml')
-                index_urls = set(map(lambda x: self.addr + self.domain + x.text, soup.find_all('a')))
-                for url in index_urls:
+                urls = set(map(lambda x: self.addr + self.domain + x.text,
+                               soup.find_all('a')))
+                for url in urls:
                     # 休眠绕过CloudFlare的DDoS保护
                     self.delay = random.randint(2, 5)
                     time.sleep(self.delay)
@@ -48,10 +49,10 @@ class DNSdb(Query):
         """
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用
@@ -59,12 +60,10 @@ def do(domain):  # 统一入口名字 方便多线程调用
     类统一调用入口
 
     :param str domain: 域名
-
     """
     query = DNSdb(domain)
     query.run()
 
 
 if __name__ == '__main__':
-
     do('example.com')

oneforall/modules/datasets/dnsdb_api.py

@@ -38,10 +38,10 @@ class DNSdbAPI(Query):
             return
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/datasets/dnsdumpster.py

@@ -23,7 +23,8 @@ class DNSdumpster(Query):
         if not resp:
             return
         self.cookie = resp.cookies
-        data = {'csrfmiddlewaretoken': self.cookie.get('csrftoken'), 'targetip': self.domain}
+        data = {'csrfmiddlewaretoken': self.cookie.get('csrftoken'),
+                'targetip': self.domain}
         resp = self.post(self.addr, data)
         if not resp:
             return
@@ -38,10 +39,10 @@ class DNSdumpster(Query):
         """
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/datasets/hackertarget.py

@@ -32,10 +32,10 @@ class HackerTarget(Query):
         """
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/datasets/ipv4info.py

@@ -47,10 +47,10 @@ class IPv4InfoAPI(Query):
         """
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/datasets/netcraft.py

@@ -62,10 +62,10 @@ class NetCraft(Query):
         """
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/datasets/ptrarchive.py

@@ -36,10 +36,10 @@ class PTRArchive(Query):
         """
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/datasets/riddler.py

@@ -31,10 +31,10 @@ class Riddler(Query):
         """
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/datasets/robtex.py

@@ -43,10 +43,10 @@ class Robtex(Query):
         """
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/datasets/securitytrails_api.py

@@ -39,10 +39,10 @@ class SecurityTrailsAPI(Query):
             return
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/datasets/sitedossier.py

@@ -42,10 +42,10 @@ class SiteDossier(Query):
         """
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用