From 69f94193f65f901a028b42a9b2aa6ba769dce473 Mon Sep 17 00:00:00 2001
From: shmilylty <admin@hackfun.org>
Date: Fri, 23 Aug 2019 10:17:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AF=BC=E5=87=BA=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=E4=B8=BAcsv?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oneforall/aiobrute.py  | 4 ++--
 oneforall/collect.py   | 2 +-
 oneforall/dbexport.py  | 2 +-
 oneforall/oneforall.py | 4 ++--
 oneforall/takeover.py  | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/oneforall/aiobrute.py b/oneforall/aiobrute.py
index a7580a5..6e1438e 100644
--- a/oneforall/aiobrute.py
+++ b/oneforall/aiobrute.py
@@ -160,14 +160,14 @@ class AIOBrute(Module):
     :param str rule:         fuzz模式使用的正则规则(默认使用config.py配置)
     :param bool export:      是否导出爆破结果(默认True)
     :param int valid:        导出子域的有效性(默认None)
-    :param str format:       导出格式(默认xls)
+    :param str format:       导出格式(默认csv)
     :param str path:         导出路径(默认None)
     :param bool show:        终端显示导出数据(默认False)
     """
 
     def __init__(self, target, process=None, coroutine=64, wordlist=None,
                  segment=500, recursive=False, depth=2, namelist=None,
-                 fuzz=False, rule=None, export=True, valid=None, format='xls',
+                 fuzz=False, rule=None, export=True, valid=None, format='csv',
                  path=None, show=False):
         Module.__init__(self)
         self.domains = set()
diff --git a/oneforall/collect.py b/oneforall/collect.py
index 1fe2f76..89cad7e 100644
--- a/oneforall/collect.py
+++ b/oneforall/collect.py
@@ -17,7 +17,7 @@ class Collect(object):
         self.collect_func = []
         self.path = None
         self.export = export
-        self.format = 'xls'
+        self.format = 'csv'
 
     def get_mod(self):
         """
diff --git a/oneforall/dbexport.py b/oneforall/dbexport.py
index 5a9c150..f8e6c2c 100644
--- a/oneforall/dbexport.py
+++ b/oneforall/dbexport.py
@@ -13,7 +13,7 @@ from common import utils
 from common.database import Database
 
 
-def export(table, db=None, valid=None, dpath=None, format='xls', show=False):
+def export(table, db=None, valid=None, dpath=None, format='csv', show=False):
     """
     OneForAll数据库导出模块
 
diff --git a/oneforall/oneforall.py b/oneforall/oneforall.py
index 7d1555c..2e4f054 100644
--- a/oneforall/oneforall.py
+++ b/oneforall/oneforall.py
@@ -68,11 +68,11 @@ class OneForAll(object):
     :param bool verify: 验证子域有效性(默认True)
     :param str port:    请求验证的端口范围(默认medium)
     :param int valid:   导出子域的有效性(默认1)
-    :param str format:  导出格式(默认xls)
+    :param str format:  导出格式(默认csv)
     :param bool show:   终端显示导出数据(默认False)
     """
     def __init__(self, target, brute=None, verify=None, port='medium', valid=1,
-                 format='xls', takeover=True, show=False):
+                 format='csv', takeover=True, show=False):
         self.target = target
         self.port = port
         self.domains = set()
diff --git a/oneforall/takeover.py b/oneforall/takeover.py
index ab9603c..c7c88d9 100644
--- a/oneforall/takeover.py
+++ b/oneforall/takeover.py
@@ -60,10 +60,10 @@ class Takeover(Module):
 
     :param str target:  单个子域或者每行一个子域的文件路径(必需参数)
     :param int thread:  线程数(默认100)
-    :param str format:  导出格式(默认xls)
+    :param str format:  导出格式(默认csv)
     :param str dpath:   导出目录(默认None)
     """
-    def __init__(self, target, thread=100, dpath=None, format='xls'):
+    def __init__(self, target, thread=100, dpath=None, format='csv'):
         Module.__init__(self)
         self.subdomains = set()
         self.module = 'Check'