From 2e1e56774f218bc86bee4ccb598a4a085f586bc6 Mon Sep 17 00:00:00 2001
From: Jing Ling <admin@hackfun.org>
Date: Mon, 20 Apr 2020 16:22:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.en.md                 |  2 +-
 README.md                    |  2 +-
 oneforall/common/database.py | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.en.md b/README.en.md
index 62f17ad..1578429 100644
--- a/README.en.md
+++ b/README.en.md
@@ -28,7 +28,7 @@ The importance of information collection in penetration testing is self-evident.
 
 In order to solve the above pain points, As its name suggests, I want OneForAll to be a collection of 100 strong, powerful and fast subdomains that collect the ultimate artifact 🔨.
 
-At present, OneForAll is still under development, there must be a lot of problems and areas for improvement. Welcome to submit [Issues](https://github.com/shmilylty/OneForAll/issues) or [PR](https://github.com/shmilylty/OneForAll/pulls)，If you like, give it to a little star ✨，At present, there is a special QQ group for OneForAll communication and feedback: 👨‍👨‍👦‍👦：:[**824414244**](//shang.qq.com/wpa/qunwpa?idkey=125d3689b60445cdbb11e4ddff38036b7f6f2abbf4f7957df5dddba81aa90771)，You can also 📧[email](mailto://admin@hackfun.org) or [tweet](https://twitter.com/jinglingbiaodi) to me .
+At present, OneForAll is still under development, there must be a lot of problems and areas for improvement. Welcome to submit [Issues](https://github.com/shmilylty/OneForAll/issues) or [PR](https://github.com/shmilylty/OneForAll/pulls)，If you like, give it to a little star ✨，At present, there is a special QQ group for OneForAll communication and feedback: 👨‍👨‍👦‍👦：:[**824414244**](//shang.qq.com/wpa/qunwpa?idkey=125d3689b60445cdbb11e4ddff38036b7f6f2abbf4f7957df5dddba81aa90771)，You can also [tweet](https://twitter.com/jinglingbiaodi) to me .
 
 ## 👍Features
 
diff --git a/README.md b/README.md
index 543f7f3..c8c53f5 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@
 
 为了解决以上痛点，此项目应用而生，正如其名，我希望OneForAll是一款集百家之长，功能强大的全面快速子域收集终极神器🔨。
 
-目前OneForAll还在开发中，肯定有不少问题和需要改进的地方，欢迎大佬们提交[Issues](https://github.com/shmilylty/OneForAll/issues)和[PR](https://github.com/shmilylty/OneForAll/pulls)，用着还行给个小星星✨吧，目前有一个专门用于OneForAll交流和反馈QQ群👨‍👨‍👦‍👦：:[**824414244**](//shang.qq.com/wpa/qunwpa?idkey=125d3689b60445cdbb11e4ddff38036b7f6f2abbf4f7957df5dddba81aa90771)（加群验证：我的英雄学院），也可以给我发邮件📧[admin@hackfun.org]。
+目前OneForAll还在开发中，肯定有不少问题和需要改进的地方，欢迎大佬们提交[Issues](https://github.com/shmilylty/OneForAll/issues)和[PR](https://github.com/shmilylty/OneForAll/pulls)，用着还行给个小星星✨吧，目前有一个专门用于OneForAll交流和反馈QQ群👨‍👨‍👦‍👦：:[**824414244**](//shang.qq.com/wpa/qunwpa?idkey=125d3689b60445cdbb11e4ddff38036b7f6f2abbf4f7957df5dddba81aa90771)（加群验证：我的英雄学院）。
 
 ## 👍功能特性
 
diff --git a/oneforall/common/database.py b/oneforall/common/database.py
index fdd912a..c54c39c 100644
--- a/oneforall/common/database.py
+++ b/oneforall/common/database.py
@@ -220,12 +220,12 @@ class Database(object):
         logger.log('TRACE', f'获取{table_name}表中的所有数据')
         return self.query(f'select * from "{table_name}"')
 
-    def export_data(self, table_name, valid, limit):
+    def export_data(self, table_name, alive, limit):
         """
         获取表中的部分数据
 
         :param str table_name: 表名
-        :param any valid: 有效性
+        :param any alive: 存活
         :param str limit: 限制字段
         """
         table_name = table_name.replace('.', '_')
@@ -233,14 +233,14 @@ class Database(object):
                 f'subdomain, level, cname, content, public, port, status, ' \
                 f'reason, title, banner, times, ttl, resolver, module, ' \
                 f'source, elapse, find, brute, valid from "{table_name}"'
-        if valid and limit:
+        if alive and limit:
             if limit in ['resolve', 'request']:
                 where = f' where {limit} = 1'
                 query += where
-        elif valid:
+        elif alive:
             where = f' where alive = 1'
             query += where
-        logger.log('TRACE', f'获取{table_name}表中的所有数据')
+        logger.log('TRACE', f'获取{table_name}表中的数据')
         return self.query(query)
 
     def close(self):