diff --git a/README.en.md b/README.en.md index db87020..1771c69 100644 --- a/README.en.md +++ b/README.en.md @@ -4,7 +4,7 @@ [![codecov](https://codecov.io/gh/shmilylty/OneForAll/branch/master/graph/badge.svg)](https://codecov.io/gh/shmilylty/OneForAll) [![Maintainability](https://api.codeclimate.com/v1/badges/1287668a6b4c72af683e/maintainability)](https://codeclimate.com/github/shmilylty/OneForAll/maintainability) [![License](https://img.shields.io/github/license/shmilylty/OneForAll)](https://github.com/shmilylty/OneForAll/tree/master/LICENSE) -[![python](https://img.shields.io/badge/python-3.6%20%7C%203.7%20%7C%203.8-blue)](https://github.com/shmilylty/OneForAll/tree/master/) +[![python](https://img.shields.io/badge/python-3.7%20%7C%203.8-blue)](https://github.com/shmilylty/OneForAll/tree/master/) [![python](https://img.shields.io/badge/release-v0.0.7-brightgreen)](https://github.com/shmilylty/OneForAll/releases) 👊**OneForAll is a powerful subdomain collection tool** 📝[中文文档](https://github.com/shmilylty/OneForAll/tree/master/README.md) @@ -59,15 +59,15 @@ At present, OneForAll is still under development, there must be a lot of problem **🐍Installation requirements** -OneForAll is based on CPython, so you need a Python environment to run. If your system doesn't already have a Python environment, you can refer to the [Python 3 Installation Guide](https://pythonguidecn.readthedocs.io/en/latest/starting/installation.html#python-3), theoretically Python 3.6, 3.7 and 3.8 can run OneForAll, **but** many tests are done on Python 3.7, so **recommended** you use **Python 3.7** version runs OneForAll. Run the following command to check the Python and pip3 versions: +OneForAll is based on CPython, so you need a Python environment to run. If your system doesn't already have a Python environment, you can refer to the [Python 3 Installation Guide](https://pythonguidecn.readthedocs.io/en/latest/starting/installation.html#python-3), theoretically Python 3.7 and 3.8 can run OneForAll, **but** many tests are done on Python 3.8, so **recommended** you use **Python 3.8** version runs OneForAll. Run the following command to check the Python and pip3 versions: ```bash python -V pip3 -V ``` If you see the following output, there is no problem with the Python environment: ```bash -Python 3.7.4 -pip 19.2.2 from C:\Users\shmilylty\AppData\Roaming\Python\Python37\site-packages\pip (python 3.7) +Python 3.8.0 +pip 19.2.2 from C:\Users\shmilylty\AppData\Roaming\Python\Python37\site-packages\pip (python 3.8) ``` **✔Installation steps** diff --git a/README.md b/README.md index 743b9f2..f9bcec4 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![codecov](https://codecov.io/gh/shmilylty/OneForAll/branch/master/graph/badge.svg)](https://codecov.io/gh/shmilylty/OneForAll) [![Maintainability](https://api.codeclimate.com/v1/badges/1287668a6b4c72af683e/maintainability)](https://codeclimate.com/github/shmilylty/OneForAll/maintainability) [![License](https://img.shields.io/github/license/shmilylty/OneForAll)](https://github.com/shmilylty/OneForAll/tree/master/LICENSE) -[![python](https://img.shields.io/badge/python-3.6%20%7C%203.7%20%7C%203.8-blue)](https://github.com/shmilylty/OneForAll/tree/master/) +[![python](https://img.shields.io/badge/python-3.7%20%7C%203.8-blue)](https://github.com/shmilylty/OneForAll/tree/master/) [![python](https://img.shields.io/badge/release-v0.0.7-brightgreen)](https://github.com/shmilylty/OneForAll/releases) 👊**OneForAll是一款功能强大的子域收集工具** 📝[English Document](https://github.com/shmilylty/OneForAll/tree/master/README.en.md) @@ -59,15 +59,15 @@ **🐍安装要求** -OneForAll是基于CPython开发的,所以你需要Python环境才能运行,如果你的系统还没有Python环境你可以参考[Python 3 安装指南](https://pythonguidecn.readthedocs.io/zh/latest/starting/installation.html#python-3),理论上Python 3.6,3.7和3.8都可以正常运行OneForAll,**但是**许多测试都是在Python 3.7上进行的,所以**推荐**你使用**Python 3.7**版本运行OneForAll。运行以下命令检查Python和pip3版本: +OneForAll是基于CPython开发的,所以你需要Python环境才能运行,如果你的系统还没有Python环境你可以参考[Python 3 安装指南](https://pythonguidecn.readthedocs.io/zh/latest/starting/installation.html#python-3),理论上Python 3.7和3.8都可以正常运行OneForAll,**但是**许多测试都是在Python 3.8上进行的,所以**推荐**你使用**Python 3.8**版本运行OneForAll。运行以下命令检查Python和pip3版本: ```bash python -V pip3 -V ``` 如果你看到以下类似输出便说明Python环境没有问题: ```bash -Python 3.7.4 -pip 19.2.2 from C:\Users\shmilylty\AppData\Roaming\Python\Python37\site-packages\pip (python 3.7) +Python 3.8.0 +pip 19.2.2 from C:\Users\shmilylty\AppData\Roaming\Python\Python38\site-packages\pip (python 3.8) ``` **✔安装步骤** @@ -92,7 +92,7 @@ pip 19.2.2 from C:\Users\shmilylty\AppData\Roaming\Python\Python37\site-packages pip3 install --user -r requirements.txt -i https://mirrors.aliyun.com/pypi/simple/ cd oneforall/ python oneforall.py --help - ``` +``` 其他系统平台的请参考[依赖安装](https://github.com/shmilylty/OneForAll/tree/master/docs/installation_dependency.md),如果在安装依赖过程中发现编译某个依赖库失败时可以参考[Q&A](https://github.com/shmilylty/OneForAll/tree/master/docs/Q&A.md)中解决方法,如果还没有解决欢迎加群反馈。 3. **更新** diff --git a/docs/Q&A.md b/docs/Q&A.md index 0d12499..6e4adca 100644 --- a/docs/Q&A.md +++ b/docs/Q&A.md @@ -10,10 +10,10 @@ A: 可以尝试以下方法: * [https://www.lfd.uci.edu/~gohlke/pythonlibs](https://www.lfd.uci.edu/~gohlke/pythonlibs) * [https://pythonwheels.com/](https://pythonwheels.com/) -选择好对应版本执行以下命令手动安装。举个例子,当编译pycares时失败时,找到[https://www.lfd.uci.edu/~gohlke/pythonlibs/#pycares](https://www.lfd.uci.edu/~gohlke/pythonlibs/#pycares),由于我的系统是Windows 10 64位,使用的Python 3.7便下载`pycares‑3.0.0‑cp37‑cp37m‑win_amd64.whl`(一般来说下载最新版本的),然后手动安装: +选择好对应版本执行以下命令手动安装。举个例子,当编译 brotlipy 时失败时,找到[https://www.lfd.uci.edu/~gohlke/pythonlibs/#brotlipy](https://www.lfd.uci.edu/~gohlke/pythonlibs/#brotlipy),由于我的系统是Windows 10 64位,使用的Python 3.8便下载`brotlipy‑0.7.0‑cp38‑cp38‑win_amd64.whl`(一般来说下载最新版本的),然后手动安装: ```bash -pip3 install pycares‑3.0.0‑cp37‑cp37m‑win_amd64.whl +pip3 install brotlipy‑0.7.0‑cp38‑cp38‑win_amd64.whl ``` 2. 到库的项目地址issues和wiki等找找有没有解决方法,如果没有就给他们提issues发邮件😜。 diff --git a/docs/installation_dependency.md b/docs/installation_dependency.md index 2b1cc65..0afc8cb 100644 --- a/docs/installation_dependency.md +++ b/docs/installation_dependency.md @@ -2,7 +2,7 @@ 你可以通过pip3和pipenv两种方法安装OneForAll的依赖(如果你熟悉[pipenv](https://docs.pipenv.org/en/latest/),那么推荐使用你使用pipenv): -* **Windows系统**(注意:如果你的Python3安装在系统Program Files目录下,如:`C:\Program Files\Python37`,那么请以管理员身份运行命令提示符cmd执行以下命令!) +* **Windows系统**(注意:如果你的Python3安装在系统Program Files目录下,如:`C:\Program Files\Python38`,那么请以管理员身份运行命令提示符cmd执行以下命令!) 1. 使用pipenv @@ -10,7 +10,7 @@ cd OneForAll/ python -m pip install --user -U pip setuptools wheel -i https://mirrors.aliyun.com/pypi/simple/ pip3 install --user pipenv -i https://mirrors.aliyun.com/pypi/simple/ - pipenv install --user --python 3.7 + pipenv install --user --python 3.8 cd oneforall pipenv run python oneforall.py --help ``` @@ -31,7 +31,7 @@ cd OneForAll/ python3 -m pip install --user -U pip setuptools wheel -i https://mirrors.aliyun.com/pypi/simple/ sudo pip3 install --user pipenv -i https://mirrors.aliyun.com/pypi/simple/ - sudo pipenv install --user --python 3.7 + sudo pipenv install --user --python 3.8 cd oneforall pipenv run python3 oneforall.py --help ``` @@ -50,7 +50,7 @@ cd OneForAll/ python3 -m pip install --user -U pip setuptools wheel -i https://mirrors.aliyun.com/pypi/simple/ pip3 install --user pipenv -i https://mirrors.aliyun.com/pypi/simple/ - pipenv install --user --python 3.7 + pipenv install --user --python 3.8 cd oneforall pipenv run python3 oneforall.py --help ```