update to v2.0

xzajyjs · Jul 9, 2022 · 8814de2 · 8814de2
1 parent ab0ee8b
commit 8814de2
Show file tree

Hide file tree

Showing 17 changed files with 242 additions and 126 deletions.
diff --git a/README.md b/README.md
@@ -9,29 +9,34 @@
 </p>
 
 ## 🎸 Intro介绍
-调用ZoomEye的官方api(未来会支持更多资产搜索引擎)，开发的GUI界面的信息搜集工具。支持查询`主机搜索`、`域名/IP`、`web应用搜索`、`个人信息`
+调用ZoomEye(即将支持Fofa、Hunter、Shodan等)的官方api，结合[开发文档](https://www.zoomeye.org/doc#user)，开发的GUI界面的信息搜集工具。支持查询`主机搜索`、`域名/IP`、`web应用搜索`、`个人信息`
 
-- 支持读取`config.json`文件进行登陆
+- 支持通过通过图形化修改配置信息
 - 支持账号密码和API-KEY登陆
+- 支持多个网络资产搜索引擎(即将支持)
 - 查询显示结果仅为部分，完整内容保存至`指定文件`或`数据库`
 - 支持查询用户个人信息
 
 ---
 ## 💡 使用方式
 ### -> Run  
-- 填写当前目录的`config.json`文件进行登陆(优先读取`API-KEY`)  
-    > mac打包版在显示包文件--Contents--Resources--config.json
-- 或在GUI界面直接进行登陆
+- 直接运行即可。每次通过GUI修改配置后务必`保存配置`
+- 每种搜索引擎支持两种登录方式(账户密码/API-KEY)，选其一即可，优先使用API-KEY登录
 
 #### 配置文件`config.json`说明
 ```
-"API-KEY":"",
-"username":"",      # zoomeye用户名(邮箱)
-"password":"",      # 登陆密码
-"db_name":"",       # 数据库名(需预先手动创建)
-"db_host":"",       # 数据库host
-"db_username":"",   # 数据库用户名
-"db_password":""    # 数据库密码
+"zoomeye_username": ""
+"zoomeye_password": ""
+"zoomeye_api": ""
+"fofa_username": ""
+"fofa_password": ""
+"fofa_api": ""
+"file": ""
+"host": ""
+"port": ""
+"database": ""
+"username": ""
+"password": ""
 ```
 
 ### -> Build
@@ -76,9 +81,14 @@ pip install -r requirements.txt
 - [x] 优化登陆模式
 - [x] 增加web应用搜索模块
 - [x] 增加多种结果导出模式
-- [ ] 增加不同搜索引擎支持如quake、fofa、hunter等
+- [ ] 支持多种搜索引擎，如Shodan、Fofa、Hunter、Quake等
 ---
 ## 🏝 更新日志
+#### v2.0
+- 优化配置设置
+- 全新界面
+- 支持Fofa(即将开放)
+
 #### v1.7.6
 - 增加数据不保存模式
 
@@ -120,4 +130,5 @@ pip install -r requirements.txt
 ## 🌏 效果演示
 ![](pic/host_search.png)  
 ![](pic/web_search.png)  
-![](pic/mysql.png)  
+![](pic/config.png)  
+![](pic/mysql.png)  
diff --git a/ThunderSearch.py b/ThunderSearch.py
diff --git a/config.json b/config.json
@@ -1,9 +1 @@
-{
-    "API-KEY":"",
-    "username":"",
-    "password":"",
-    "db_name":"",
-    "db_host":"",
-    "db_username":"",
-    "db_password":""
-}
+{"zoomeye_username": "", "zoomeye_password": "", "zoomeye_api": "", "fofa_username": "", "fofa_password": "", "fofa_api": "", "file": "", "host": "", "port": "", "database": "", "username": "", "password": ""}
diff --git a/module/fofa/__init__.py b/module/fofa/__init__.py
diff --git a/module/zoomeye/__init__.py b/module/zoomeye/__init__.py
diff --git a/module/zoomeye/__pycache__/__init__.cpython-39.pyc b/module/zoomeye/__pycache__/__init__.cpython-39.pyc
diff --git a/module/zoomeye/__pycache__/domain_ip.cpython-39.pyc b/module/zoomeye/__pycache__/domain_ip.cpython-39.pyc
diff --git a/module/zoomeye/__pycache__/host_search.cpython-39.pyc b/module/zoomeye/__pycache__/host_search.cpython-39.pyc
diff --git a/module/zoomeye/__pycache__/resource.cpython-39.pyc b/module/zoomeye/__pycache__/resource.cpython-39.pyc
diff --git a/module/zoomeye/__pycache__/web_search.cpython-39.pyc b/module/zoomeye/__pycache__/web_search.cpython-39.pyc
diff --git a/module/domain_ip.py → module/zoomeye/domain_ip.py b/module/domain_ip.py → module/zoomeye/domain_ip.py
diff --git a/module/host_search.py → module/zoomeye/host_search.py b/module/host_search.py → module/zoomeye/host_search.py
diff --git a/module/resource.py → module/zoomeye/resource.py b/module/resource.py → module/zoomeye/resource.py
diff --git a/module/web_search.py → module/zoomeye/web_search.py b/module/web_search.py → module/zoomeye/web_search.py
diff --git a/pic/config.png b/pic/config.png
diff --git a/pic/host_search.png b/pic/host_search.png
diff --git a/pic/web_search.png b/pic/web_search.png