1. 添加下载任务线程

2. 修改任务记录
忽略文件列表中添加xlsx文件
21 changed files with 796 additions and 1143 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,6 @@
 result_*.txt
 result_*.xls
+result_*.xlsx
 download/
 history/
 out/
@ -114,3 +115,7 @@ venv.bak/

 # add
 .idea/
+
+#
+1.py
+.vscode/
--- a/README.md
+++ b/README.md
@ -1,30 +1,30 @@
- ![License](https://img.shields.io/badge/Version-V1.0.8-red) ![Language](https://img.shields.io/badge/Language-Python3-blue) ![License](https://img.shields.io/badge/License-GPL3.0-orange) [![HitCount](https://hits.dwyl.com/kelvinBen/kelvinBen/AppInfoScanner.svg?style=flat&show=unique)](http://hits.dwyl.com/kelvinBen/kelvinBen/AppInfoScanner)
+ ![License](https://img.shields.io/badge/Version-V1.0.8-red) ![Language](https://img.shields.io/badge/Language-Python3-blue) ![License](https://img.shields.io/badge/License-GPL3.0-orange)


 该项目目前仅仅是规划项目中的冰山一角，如果您对此项目感兴趣或者想参与后继项目的开发工作或者翻译工作中，请发送邮件至blsm@vip.qq.com说明你的能力和诉求。

-## AppInfoScanner
+### AppInfoScanner

 一款适用于以HW行动/红队/渗透测试团队为场景的移动端(Android、iOS、WEB、H5、静态网站)信息收集扫描工具，可以帮助渗透测试工程师、攻击队成员、红队成员快速收集到移动端或者静态WEB站点中关键的资产信息并提供基本的信息输出,如：Title、Domain、CDN、指纹信息、状态信息等。

-## 前言
+### 前言
 - 本项目的开发者目前为个人开发者同时有自己的工作，新的功能或者需求会在闲暇时间进行开发，BUG会优先进行处理。
 - 如果在使用中遇到问题或者有新的需求，请在[](https://github.com/kelvinBen/AppInfoScanner/issues)提交BUG反馈，提交BUG前请先阅读最后的"常见问题"。
 - 如果您觉得这个项目对您有用，请点击本项目右上角的"star"按钮。
 - 如果您想持续跟进新的版本情况，请点击本项目右上角的"Watch"按钮。
 - 如果您想参与本项目的开发，请点击本项目右上角的"Fork"按钮,否则请勿点击"Fork"按钮。

-## 免责声明
+### 免责声明
 请勿将本项目技术或代码应用在恶意软件制作、软件著作权/知识产权盗取或不当牟利等**非法用途**中。实施上述行为或利用本项目对非自己著作权所有的程序进行数据嗅探将涉嫌违反《中华人民共和国刑法》第二百一十七条、第二百八十六条，《中华人民共和国网络安全法》《中华人民共和国计算机软件保护条例》等法律规定。本项目提及的技术仅可用于私人学习测试等合法场景中，任何不当利用该技术所造成的刑事、民事责任均与本项目作者无关。

-## 适用场景
+### 适用场景
 - 日常渗透测试中对APP中进行关键资产信息收集，比如URL地址、IP地址、关键字等信息的采集等。
 - 大型攻防演练场景中对APP中进行关键资产信息收集，比如URL地址、IP地址、关键字等信息的采集等。
 - 对WEB网站源代码进行URL地址、IP地址、关键字等信息进行采集等(可以是开源的代码也可以是右击网页源代码另存为)。
 - 对H5页面进行进行URL地址、IP地址、关键字等信息进行采集等。
 - 对某个APP进行定相信息收集等

-## 功能介绍:
+### 功能介绍:
 - [x] 支持目录级别的批量扫描
 - [x] 支持DEX、APK、IPA、MACH-O、HTML、JS、Smali、ELF等文件的信息收集
 - [x] 支持APK、IPA、H5等文件自动下载并进行一键信息收集
@ -44,15 +44,15 @@
 - [ ] 一键对APK文件进行自动修复
 - [ ] 识别到壳后自动进行脱壳处理

-## 部分截图
+### 部分截图

 ![](result.png)

-## 环境说明
+### 环境说明
 - Apk文件解析需要使用JAVA环境,JAVA版本1.8及以下
 - Python3的运行环境

-## 目录说明
+### 目录说明
 ```
 AppInfoScanner
    |-- libs  程序的核心代码
@ -81,7 +81,7 @@ AppInfoScanner
    |-- requirements.txt 程序中需要安装的依赖库
    |-- update.md 程序历史版本信息
 ```
-## 使用说明
+### 使用说明

 1. 下载
 ```
@ -100,7 +100,7 @@ AppInfoScanner
 2. 安装依赖库
 ```
    cd AppInfoScanner
-    python -m pip install -r requirements.txt
+    python3 -m pip install -r requirements.txt
 ```

 3. 运行(基础版)
@ -108,29 +108,29 @@ AppInfoScanner
 - 扫描Android应用的APK文件、DEX文件、需要下载的APK文件下载地址、保存需要扫描的文件的目录

 ```
-    python app.py android -i <Your APK File or DEX File or APK Download Url or Save File Dir>
+    python3 app.py android -i <Your APK File or DEX File or APK Download Url or Save File Dir>
 ```

 - 扫描iOS应用的IPA文件、Mach-o文件、需要下载的IPA文件下载地址、保存需要扫描的文件目录

 ```
-    python app.py ios -i <Your IPA file or Mach-o File or IPA Download Url or Save File Dir>
+    python3 app.py ios -i <Your IPA file or Mach-o File or IPA Download Url or Save File Dir>
 ```

 - 扫描Web站点的文件、目录、需要缓存的站点URl

 ```
-    python app.py web -i <Your Web file or Save Web Dir or Web Cache Url>
+    python3 app.py web -i <Your Web file or Save Web Dir or Web Cache Url>
 ```

-## 进阶操作指南
+### 进阶操作指南

-### 基本命令格式
+#### 基本命令格式
 ```
-python app.py [TYPE] [OPTIONS] <The URL or directory to scan>
+python3 app.py [TYPE] [OPTIONS] <The URL or directory to scan>
 ```

-### 符号信息说明
+#### 符号信息说明

 ```
 <> 代表需要扫描的文件或者目录或者URL地址
@ -138,7 +138,7 @@ python app.py [TYPE] [OPTIONS] <The URL or directory to scan>
 [] 代表需要输入的参数
 ```

-### TYPE参数详细说明
+#### TYPE参数详细说明
 此参数类型对应基本命令格式中的[TYPE],目前仅支持[android/ios/web]三种类型形式，三种类型形式必须指定一个。

 ```
@ -150,7 +150,7 @@ web: 用于扫描WEB站点或者H5相关的文件内容
 支持自动根据后缀名称进行修正，即便输入的是ios，实际上-i 输入的参数的文件名为XXX.apk，则会执行android相关的扫描。


-### OPTIONS参数详细说明
+#### OPTIONS参数详细说明
 该参数类型对应基本命令格式中的[OPTIONS]，支持多个参数共同使用

 ```
@ -164,173 +164,173 @@ web: 用于扫描WEB站点或者H5相关的文件内容
 -p 或者 -- package: 指定Android的APK文件或者DEX文件需要扫描的JAVA包名信息。此参数只能在android类型下使用。
 ```

-### 具体使用方法
+#### 具体使用方法

-#### Android相关基本操作
+##### Android相关基本操作
 - 对本地APK文件进行扫描
 ```
-python app.py android -i <Your apk file>  
+python3 app.py android -i <Your apk file>  

 例:

-python app.py android -i  C:\Users\Administrator\Desktop\Demo.apk
+python3 app.py android -i  C:\Users\Administrator\Desktop\Demo.apk
 ```

 - 对本地Dex文件进行扫描
 ```
-python app.py android -i <Your DEX file>  
+python3 app.py android -i <Your DEX file>  

 例:

-python app.py android -i  C:\Users\Administrator\Desktop\Demo.dex
+python3 app.py android -i  C:\Users\Administrator\Desktop\Demo.dex

 ```
 - 对URL地址中包含的APK文件进行扫描
 ```
-python app.py android -i <APK Download Url>  
+python3 app.py android -i <APK Download Url>  

 例:

-python app.py android -i "https://127.0.0.1/Demo.apk" 
+python3 app.py android -i "https://127.0.0.1/Demo.apk" 

 ```
 需要注意此处如果URL地址过长需要使用双引号(")进行包裹

-#### iOS相关基本操作
+##### iOS相关基本操作
 - 对本地IPA文件进行扫描
 ```
-python app.py ios -i <Your ipa file>
+python3 app.py ios -i <Your ipa file>

 例:

-python app.py ios -i "C:\Users\Administrator\Desktop\Demo.ipa" 
+python3 app.py ios -i "C:\Users\Administrator\Desktop\Demo.ipa" 
 ```

 - 对本地Macho文件进行扫描
 ```
-python app.py ios -i <Your Mach-o file>
+python3 app.py ios -i <Your Mach-o file>

 例:

-python app.py ios -i "C:\Users\Administrator\Desktop\Demo\Payload\Demo.app\Demo" 
+python3 app.py ios -i "C:\Users\Administrator\Desktop\Demo\Payload\Demo.app\Demo" 
 ```

 - 对URL地址中包含的IPA文件进行扫描
 ```
-python app.py ios -i <IPA Download Url>  
+python3 app.py ios -i <IPA Download Url>  

 例:

-python app.py ios -i "https://127.0.0.1/Demo.ipa" 
+python3 app.py ios -i "https://127.0.0.1/Demo.ipa" 

 ```
 需要注意此处如果URL地址过长需要使用双引号(")进行包裹,暂时不支持对Apple Store中的IPA文件进行扫描

-#### Web相关基本操作
+##### Web相关基本操作

 - 对本地WEB站点进行扫描
 ```
-python app.py web -i <Your web file>
+python3 app.py web -i <Your web file>

 例:

-python app.py web -i "C:\Users\Administrator\Desktop\Demo.html" 
+python3 app.py web -i "C:\Users\Administrator\Desktop\Demo.html" 
 ```
 - 对URL地址中包含的WEB站点文件进行扫描
 ```
-python app.py web -i <Web Download Url>  
+python3 app.py web -i <Web Download Url>  

 例:

-python app.py web -i "https://127.0.0.1/Demo.html" 
+python3 app.py web -i "https://127.0.0.1/Demo.html" 

 ```

-#### 具有共同性的操作
+##### 具有共同性的操作

 以下操作均以android类型为例：

 - 对一个本地的目录进行扫描
 ```
-python app.py android -i <Your Dir>
+python3 app.py android -i <Your Dir>

 例：

-python app.py android -i C:\Users\Administrator\Desktop\Demo
+python3 app.py android -i C:\Users\Administrator\Desktop\Demo
 ```

 - 添加临时规则或者关键字

 ```
-python app.py android -i <Your apk> -r <the keyword | the rules>
+python3 app.py android -i <Your apk> -r <the keyword | the rules>

 例：
 添加对百度域名的扫描

-python app.py android -i C:\Users\Administrator\Desktop\Demo.apk -r ".*baidu.com.*"
+python3 app.py android -i C:\Users\Administrator\Desktop\Demo.apk -r ".*baidu.com.*"
 ```

 - 关闭网络嗅探功能
 ```
-python app.py android -i <Your apk> -s
+python3 app.py android -i <Your apk> -s

 例：
-python app.py android -i C:\Users\Administrator\Desktop\Demo.apk -s
+python3 app.py android -i C:\Users\Administrator\Desktop\Demo.apk -s

 ```
 - 忽略所有的资源文件
 ```
-python app.py android -i <Your apk> -n
+python3 app.py android -i <Your apk> -n

 例：
-python app.py android -i C:\Users\Administrator\Desktop\Demo.apk -n
+python3 app.py android -i C:\Users\Administrator\Desktop\Demo.apk -n

 ```

 - 关闭输出所有符合扫描规则内容的功能
 ```
-python app.py android -i <Your apk> -a
+python3 app.py android -i <Your apk> -a

 例：

-python app.py android -i C:\Users\Administrator\Desktop\Demo.apk -a
+python3 app.py android -i C:\Users\Administrator\Desktop\Demo.apk -a
 ```

 - 设置并发数量
 ```
-python app.py android -i <Your apk> -t 20
+python3 app.py android -i <Your apk> -t 20

 例：
 设置20个并发线程
-python app.py android -i C:\Users\Administrator\Desktop\Demo.apk -t 20 
+python3 app.py android -i C:\Users\Administrator\Desktop\Demo.apk -t 20 
 ```
 - 指定结果集和缓存文件输出目录
 ```
-python app.py android -i <Your apk> -o <output path>
+python3 app.py android -i <Your apk> -o <output path>

 例：
 比如输出到桌面的Temp目录
-python app.py android -i C:\Users\Administrator\Desktop\Demo.apk -o C:\Users\Administrator\Desktop\Temp
+python3 app.py android -i C:\Users\Administrator\Desktop\Demo.apk -o C:\Users\Administrator\Desktop\Temp
 ```

 - 对指定包名下的文件内容进行扫描，该功能仅支持android类型

 ```
-python app.py android -i <Your apk> -p <Java package name>
+python3 app.py android -i <Your apk> -p <Java package name>

 例：
 比如需要过滤com.baidu包名下的内容

-python app.py android -i C:\Users\Administrator\Desktop\Demo.apk -p "com.baidu"
+python3 app.py android -i C:\Users\Administrator\Desktop\Demo.apk -p "com.baidu"
 ```

-## 高级版使用说明
+### 高级版使用说明
 该项目中的程序仅作为一个基本的架子，会内置一些基本的规则，并不是每一个输入的内容都可以完成相关的扫描工作。所以可以根据自己的需要进行相关规则的配置，优秀的配置内容可以达到质的的效果。


 - 配置文件路径为 根目录下的config.py文件，即README.md的同级目录

-### 配置项说明
+#### 配置项说明
 ```
 filter_components: 此配置项用于配置相关组件内容，包括Json组件或者XML组件等
 filter_strs: 用于配置需要进行扫描的文件内容，比如需要扫描端口号，则配置为："r'.*://([\d{1,3}\.]{3}\d{1,3}).*'"
@ -343,38 +343,36 @@ data: 用于配置自动下载过程中需要的请求报文体
 method: 用于配置自动下载过程中需要的请求方法
 ```

-## 常见问题
+### 常见问题

-###  1. 信息检索垃圾数据过多？
+####  1. 信息检索垃圾数据过多？

 ```
 方法1： 根据实际情况调整config.py中的规则信息
 方法2： 忽略资源文件
 ```

-### 2. 出现错误：Error: This application has shell, the retrieval results may not be accurate, Please remove the shell and try again!
+#### 2. 出现错误：Error: This application has shell, the retrieval results may not be accurate, Please remove the shell and try again!

 说明需要扫描的应用存在壳，需要进行脱壳/砸壳以后才能进行扫描，目前可以结合以下工具进行脱壳/砸壳处理
 ```
-    
    Android:
        xposed模块： dexdump
        frida模块： FRIDA-DEXDump
-        无Root脱壳：blackdex
    iOS:
        firda模块：
            windows系统使用： frida-ipa-dump
            MacOS系统使用：frida-ios-dump
 ```

-### 3. 出现错误: File download failed! Please download the file manually and try again.
+#### 3. 出现错误: File download failed! Please download the file manually and try again.

 文件下载失败。
 ```
 1) 请检查输入的URL地址是否正确
 2）请检查网络是否存在问题或者在配置文件config.py中配置请求头信息(headers)、请求报文体(data)、请求方法(method)保存后重新再执行。
 ```
-### 4. 出现错误：Decompilation failed, please submit error information at https://github.com/kelvinBen/AppInfoScanner/issues"
+#### 4. 出现错误：Decompilation failed, please submit error information at https://github.com/kelvinBen/AppInfoScanner/issues"

 文件反编译失败。

@ -415,20 +413,14 @@ APP组件: fastjson com.alibaba.fastjson

 **微信**：bromomo (添加好友请备注：GitHub)

-**微信群**：
-
-![image](https://user-images.githubusercontent.com/19259171/177041407-66b627d7-39b5-40e7-9858-85dca5b4f958.png)
-
-如无法加入请添加微信好友后进群。
-
 **邮箱**：blsm@vip.qq.com

 提交需求、提交BUG修复、技术交流、商务合作均可添加作者好友。

-## Stargazers over time
+## Stargazers
 [![Stargazers over time](https://starchart.cc/kelvinBen/AppInfoScanner.svg)](https://starchart.cc/kelvinBen/AppInfoScanner)

-## 404StarLink 2.0 - Galaxy
+# 404StarLink 2.0 - Galaxy
 ![](https://github.com/knownsec/404StarLink-Project/raw/master/logo.png)

 AppInfoScanner 是 404Team [星链计划2.0](https://github.com/knownsec/404StarLink2.0-Galaxy)中的一环，如果对AppInfoScanner 有任何疑问又或是想要找小伙伴交流，可以参考星链计划的加群方式。
--- a/app.py
+++ b/app.py
@ -4,97 +4,75 @@
 # Github: https://github.com/kelvinBen/AppInfoScanner

 import click
+import logging

 from libs.core import Bootstrapper
 from libs.task.base_task import BaseTask

-
@click.group(help="Python script for automatically retrieving key information in app.")
 def cli():
-    pass
-
+    try:
+        LOG_FORMAT = "%(message)s"    # 日志格式化输出
+        fp = logging.FileHandler('info.log', mode='w',encoding='utf-8')
+        fs = logging.StreamHandler()
+        logging.basicConfig(level=logging.INFO, format=LOG_FORMAT, handlers=[fp, fs])    # 调用
+    except Exception as e:
+        logging.error("{}".format(e))

 # 创建Android任务
-
-
@cli.command(help="Get the key information of Android system.")
-@click.option("-i", "--inputs", required=True, type=str,
-              help="Please enter the APK file or DEX file to be scanned or the corresponding APK download address.")
-@click.option("-r", "--rules", required=False, type=str, default="",
-              help="Please enter a rule for temporary scanning of file contents.")
-@click.option("-s", "--sniffer", is_flag=True, default=False,
-              help="Enable the network sniffer function. It is on by default.")
-@click.option("-n", '--no-resource', is_flag=True, default=False,
-              help="Ignore all resource files, including network sniffing. It is not enabled by default.")
-@click.option("-a", '--all', is_flag=True, default=False,
-              help="Output the string content that conforms to the scan rules.It is on by default.")
-@click.option("-t", '--threads', required=False, type=int, default=10,
-              help="Set the number of concurrency. The larger the concurrency, the faster the speed. The default value is 10.")
+@click.option("-i", "--inputs", required=True, type=str, help="Please enter the APK file or DEX file to be scanned or the corresponding APK download address.")
+@click.option("-r", "--rules", required=False, type=str, default="", help="Please enter a rule for temporary scanning of file contents.")
+@click.option("-s", "--sniffer", is_flag=True, default=False, help="Enable the network sniffer function. It is on by default.")
+@click.option("-n", '--no-resource', is_flag=True, default=False,help="Ignore all resource files, including network sniffing. It is not enabled by default.")
+@click.option("-a", '--all',is_flag=True, default=False,help="Output the string content that conforms to the scan rules.It is on by default.")
+@click.option("-t", '--threads',required=False, type=int,default=10,help="Set the number of concurrency. The larger the concurrency, the faster the speed. The default value is 10.")
@click.option("-o", '--output',required=False, type=str,default=None,help="Specify the result set output directory.")
-@click.option("-p", '--package', required=False, type=str, default="",
-              help="Specifies the package name information that needs to be scanned.")
-def android(inputs: str, rules: str, sniffer: bool, no_resource: bool, all: bool, threads: int, output,
-            package: str) -> None:
-    try:
-        bootstrapper = Bootstrapper(__file__, output, all, no_resource)
-        bootstrapper.init()
+@click.option("-p", '--package',required=False,type=str,default="",help="Specifies the package name information that needs to be scanned.")
+def android(inputs: str, rules: str, sniffer: bool, no_resource:bool, all:bool, threads:int, output, package:str) -> None:
    
-        BaseTask("Android", inputs, rules, sniffer, threads, package).start()
-    except Exception as e:
-        raise e
+    
+    bootstrapper = Bootstrapper(rules, sniffer, threads, all ,no_resource)
+    bootstrapper.init_dir(__file__, output)
+
+    BaseTask().start("Android", inputs, package)


@cli.command(help="Get the key information of iOS system.")
-@click.option("-i", "--inputs", required=True, type=str,
-              help="Please enter IPA file or ELF file to scan or corresponding IPA download address. App store is not supported at present.")
-@click.option("-r", "--rules", required=False, type=str, default="",
-              help="Please enter a rule for temporary scanning of file contents.")
-@click.option("-s", "--sniffer", is_flag=True, default=False,
-              help="Enable the network sniffer function. It is on by default.")
-@click.option("-n", '--no-resource', is_flag=True, default=False,
-              help="Ignore all resource files, including network sniffing. It is not enabled by default.")
-@click.option("-a", '--all', is_flag=True, default=False,
-              help="Output the string content that conforms to the scan rules.It is on by default.")
-@click.option("-t", '--threads', required=False, type=int, default=10,
-              help="Set the number of concurrency. The larger the concurrency, the faster the speed. The default value is 10.")
+@click.option("-i", "--inputs", required=True, type=str, help="Please enter IPA file or ELF file to scan or corresponding IPA download address. App store is not supported at present.")
+@click.option("-r", "--rules", required=False, type=str, default="", help="Please enter a rule for temporary scanning of file contents.")
+@click.option("-s", "--sniffer", is_flag=True, default=False, help="Enable the network sniffer function. It is on by default.")
+@click.option("-n", '--no-resource', is_flag=True, default=False,help="Ignore all resource files, including network sniffing. It is not enabled by default.")
+@click.option("-a", '--all',is_flag=True, default=False,help="Output the string content that conforms to the scan rules.It is on by default.")
+@click.option("-t", '--threads',required=False, type=int,default=10,help="Set the number of concurrency. The larger the concurrency, the faster the speed. The default value is 10.")
@click.option("-o", '--output',required=False, type=str,default=None,help="Specify the result set output directory.")
 def ios(inputs: str, rules: str, sniffer: bool, no_resource:bool, all:bool, threads:int, output:str) -> None:
-    try:
-        bootstrapper = Bootstrapper(__file__, output, all, no_resource)
-        bootstrapper.init()
    
-        BaseTask("iOS", inputs, rules, sniffer, threads).start()
-    except Exception as e:
-        raise e

    
+    bootstrapper = Bootstrapper(rules, sniffer, threads, all ,no_resource)
+    bootstrapper.init_dir(__file__, output)
+    BaseTask().start("iOS", inputs)
+
@cli.command(help="Get the key information of Web system.")
-@click.option("-i", "--inputs", required=True, type=str,
-              help="Please enter the site directory or site file to scan or the corresponding site download address.")
-@click.option("-r", "--rules", required=False, type=str, default="",
-              help="Please enter a rule for temporary scanning of file contents.")
-@click.option("-s", "--sniffer", is_flag=True, default=False,
-              help="Enable the network sniffer function. It is on by default.")
-@click.option("-n", '--no-resource', is_flag=True, default=False,
-              help="Ignore all resource files, including network sniffing. It is not enabled by default.")
-@click.option("-a", '--all', is_flag=True, default=False,
-              help="Output the string content that conforms to the scan rules.It is on by default.")
-@click.option("-t", '--threads', required=False, type=int, default=10,
-              help="Set the number of concurrency. The larger the concurrency, the faster the speed. The default value is 10.")
+@click.option("-i", "--inputs", required=True, type=str, help="Please enter the site directory or site file to scan or the corresponding site download address.")
+@click.option("-r", "--rules", required=False, type=str, default="", help="Please enter a rule for temporary scanning of file contents.")
+@click.option("-s", "--sniffer", is_flag=True, default=False, help="Enable the network sniffer function. It is on by default.")
+@click.option("-n", '--no-resource', is_flag=True, default=False,help="Ignore all resource files, including network sniffing. It is not enabled by default.")
+@click.option("-a", '--all',is_flag=True, default=False,help="Output the string content that conforms to the scan rules.It is on by default.")
+@click.option("-t", '--threads',required=False, type=int,default=10,help="Set the number of concurrency. The larger the concurrency, the faster the speed. The default value is 10.")
@click.option("-o", '--output',required=False, type=str,default=None,help="Specify the result set output directory.")
 def web(inputs: str, rules: str, sniffer: bool, no_resource:bool, all:bool, threads:int, output:str) -> None:
-    try:
-        bootstrapper = Bootstrapper(__file__, output, all, no_resource)
-        bootstrapper.init()
    
-        BaseTask("Web", inputs, rules, sniffer, threads).start()
-    except Exception as e:
-        raise e

+    bootstrapper = Bootstrapper(rules, sniffer, threads, all ,no_resource)
+    bootstrapper.init_dir(__file__, output)
+    BaseTask().start("Web", inputs)

 def main():
-    cli()

+    cli()

 if __name__ == "__main__":
    main()
+
--- a/config.py
+++ b/config.py
@ -50,78 +50,8 @@ filter_no = [
    r'.*w3school.com.cn',
    r'.*apple.com',
    r'.*.amap.com',
-    r'.*slf4j.org',
 ]

-# AK集合
-filter_ak_map = {
-    "Aliyun_OSS": [
-        r'.*accessKeyId.*".*?"',
-        r'.*accessKeySecret.*".*?"',
-        r'.*secret.*".*?"'
-    ],
-    # "Amazon_AWS_Access_Key_ID": r"([^A-Z0-9]|^)(AKIA|A3T|AGPA|AIDA|AROA|AIPA|ANPA|ANVA|ASIA)[A-Z0-9]{12,}",
-    # "Amazon_AWS_S3_Bucket": [
-    #	r"//s3-[a-z0-9-]+\\.amazonaws\\.com/[a-z0-9._-]+",
-    #	r"//s3\\.amazonaws\\.com/[a-z0-9._-]+",
-    #	r"[a-z0-9.-]+\\.s3-[a-z0-9-]\\.amazonaws\\.com",
-    #	r"[a-z0-9.-]+\\.s3-website[.-](eu|ap|us|ca|sa|cn)",
-    #	r"[a-z0-9.-]+\\.s3\\.amazonaws\\.com",
-    #	r"amzn\\.mws\\.[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"
-    # ],
-    # "Artifactory_API_Token": r"(?:\\s|=|:|\"|^)AKC[a-zA-Z0-9]{10,}",
-    # "Artifactory_Password": r"(?:\\s|=|:|\"|^)AP[\\dABCDEF][a-zA-Z0-9]{8,}",
-    # "Authorization_Basic": r"basic\\s[a-zA-Z0-9_\\-:\\.=]+",
-    # "Authorization_Bearer": r"bearer\\s[a-zA-Z0-9_\\-:\\.=]+",
-    # "AWS_API_Key": r"AKIA[0-9A-Z]{16}",
-    # "Basic_Auth_Credentials": r"(?<=:\/\/)[a-zA-Z0-9]+:[a-zA-Z0-9]+@[a-zA-Z0-9]+\\.[a-zA-Z]+",
-    # "Cloudinary_Basic_Auth": r"cloudinary:\/\/[0-9]{15}:[0-9A-Za-z]+@[a-z]+",
-    # "DEFCON_CTF_Flag": r"O{3}\\{.*\\}",
-    # "Discord_BOT_Token": r"((?:N|M|O)[a-zA-Z0-9]{23}\\.[a-zA-Z0-9-_]{6}\\.[a-zA-Z0-9-_]{27})$",
-    # "Facebook_Access_Token": r"EAACEdEose0cBA[0-9A-Za-z]+",
-    # "Facebook_ClientID": r"[f|F][a|A][c|C][e|E][b|B][o|O][o|O][k|K](.{0,20})?['\"][0-9]{13,17}",
-    # "Facebook_OAuth": r"[f|F][a|A][c|C][e|E][b|B][o|O][o|O][k|K].*['|\"][0-9a-f]{32}['|\"]",
-    # "Facebook_Secret_Key": r"([f|F][a|A][c|C][e|E][b|B][o|O][o|O][k|K]|[f|F][b|B])(.{0,20})?['\"][0-9a-f]{32}",
-    # "Firebase": r"[a-z0-9.-]+\\.firebaseio\\.com",
-    # "Generic_API_Key": r"[a|A][p|P][i|I][_]?[k|K][e|E][y|Y].*['|\"][0-9a-zA-Z]{32,45}['|\"]",
-    # "Generic_Secret": r"[s|S][e|E][c|C][r|R][e|E][t|T].*['|\"][0-9a-zA-Z]{32,45}['|\"]",
-    # "GitHub": r"[g|G][i|I][t|T][h|H][u|U][b|B].*['|\"][0-9a-zA-Z]{35,40}['|\"]",
-    # "GitHub_Access_Token": r"([a-zA-Z0-9_-]*:[a-zA-Z0-9_-]+@github.com*)$",
-    # "Google_API_Key": r"AIza[0-9A-Za-z\\-_]{35}",
-    # "Google_Cloud_Platform_OAuth": r"[0-9]+-[0-9A-Za-z_]{32}\\.apps\\.googleusercontent\\.com",
-    # "Google_Cloud_Platform_Service_Account": r"\"type\": \"service_account\"",
-    # "Google_OAuth_Access_Token": r"ya29\\.[0-9A-Za-z\\-_]+",
-    # "HackerOne_CTF_Flag": r"[h|H]1(?:[c|C][t|T][f|F])?\\{.*\\}",
-    # "HackTheBox_CTF_Flag": r"[h|H](?:[a|A][c|C][k|K][t|T][h|H][e|E][b|B][o|O][x|X]|[t|T][b|B])\\{.*\\}$",
-    # "Heroku_API_Key": r"[h|H][e|E][r|R][o|O][k|K][u|U].*[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}",
-    # "IP_Address": r"(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])",
-    # "JSON_Web_Token": r"(?i)^((?=.*[a-z])(?=.*[0-9])(?:[a-z0-9_=]+\\.){2}(?:[a-z0-9_\\-\\+\/=]*))$",
-    # "LinkFinder": r"(?:\"|')(((?:[a-zA-Z]{1,10}:\/\/|\/\/)[^\"'\/]{1,}\\.[a-zA-Z]{2,}[^\"']{0,})|((?:\/|\\.\\.\/|\\.\/)[^\"'><,;| *()(%%$^\/\\\\\\[\\]][^\"'><,;|()]{1,})|([a-zA-Z0-9_\\-\/]{1,}\/[a-zA-Z0-9_\\-\/]{1,}\\.(?:[a-zA-Z]{1,4}|action)(?:[\\?|#][^\"|']{0,}|))|([a-zA-Z0-9_\\-\/]{1,}\/[a-zA-Z0-9_\\-\/]{3,}(?:[\\?|#][^\"|']{0,}|))|([a-zA-Z0-9_\\-]{1,}\\.(?:php|asp|aspx|jsp|json|action|html|js|txt|xml)(?:[\\?|#][^\"|']{0,}|)))(?:\"|')",
-    # "Mac_Address": r"(([0-9A-Fa-f]{2}[:]){5}[0-9A-Fa-f]{2}|([0-9A-Fa-f]{2}[-]){5}[0-9A-Fa-f]{2}|([0-9A-Fa-f]{4}[\\.]){2}[0-9A-Fa-f]{4})$",
-    # "MailChimp_API_Key": r"[0-9a-f]{32}-us[0-9]{1,2}",
-    # "Mailgun_API_Key": r"key-[0-9a-zA-Z]{32}",
-    # "Mailto": r"(?<=mailto:)[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9.-]+",
-    # "Password_in_URL": r"[a-zA-Z]{3,10}://[^/\\s:@]{3,20}:[^/\\s:@]{3,20}@.{1,100}[\"'\\s]",
-    # "PayPal_Braintree_Access_Token": r"access_token\\$production\\$[0-9a-z]{16}\\$[0-9a-f]{32}",
-    # "PGP_private_key_block": r"-----BEGIN PGP PRIVATE KEY BLOCK-----",
-    # "Picatic_API_Key": r"sk_live_[0-9a-z]{32}",
-    # "RSA_Private_Key": r"-----BEGIN RSA PRIVATE KEY-----",
-    # "Slack_Token": r"(xox[p|b|o|a]-[0-9]{12}-[0-9]{12}-[0-9]{12}-[a-z0-9]{32})",
-    # "Slack_Webhook": r"https://hooks.slack.com/services/T[a-zA-Z0-9_]{8}/B[a-zA-Z0-9_]{8}/[a-zA-Z0-9_]{24}",
-    # "Square_Access_Token": r"sq0atp-[0-9A-Za-z\\-_]{22}",
-    # "Square_OAuth_Secret": r"sq0csp-[0-9A-Za-z\\-_]{43}",
-    # "SSH_DSA_Private_Key": r"-----BEGIN DSA PRIVATE KEY-----",
-    # "SSH_EC_Private_Key": r"-----BEGIN EC PRIVATE KEY-----",
-    # "Stripe_API_Key": r"sk_live_[0-9a-zA-Z]{24}",
-    # "Stripe_Restricted_API_Key": r"rk_live_[0-9a-zA-Z]{24}",
-    # "TryHackMe_CTF_Flag": r"[t|T](?:[r|R][y|Y][h|H][a|A][c|C][k|K][m|M][e|E]|[h|H][m|M])\\{.*\\}$",
-    # "Twilio_API_Key": r"SK[0-9a-fA-F]{32}",
-    # "Twitter_Access_Token": r"[t|T][w|W][i|I][t|T][t|T][e|E][r|R].*[1-9][0-9]+-[0-9a-zA-Z]{40}",
-    # "Twitter_ClientID": r"[t|T][w|W][i|I][t|T][t|T][e|E][r|R](.{0,20})?['\"][0-9a-z]{18,25}",
-    # "Twitter_OAuth": r"[t|T][w|W][i|I][t|T][t|T][e|E][r|R].*['|\"][0-9a-zA-Z]{35,44}['|\"]",
-    # "Twitter_Secret_Key": r"[t|T][w|W][i|I][t|T][t|T][e|E][r|R](.{0,20})?['\"][0-9a-z]{35,44}"
-}
-
 # 此处配置壳信息
 shell_list =[
    'com.stub.StubApp',
@ -140,16 +70,6 @@ shell_list = [
    'io.flutter.app.FlutterApplication'
 ]

-# 此处配置Android权限信息
-apk_permissions = [
-    'android.permission.CAMERA',
-    'android.permission.READ_CONTACTS',
-    'android.permission.READ_SMS',
-    'android.permission.READ_PROFILE',
-    'android.permission.READ_PHONE_STATE',
-    'android.permission.CONTROL_LOCATION_UPDATES'
-]
-
 # 此处配置需要扫描的web文件后缀
 web_file_suffix =[
    "html",
@ -184,3 +104,4 @@ data = {

 # 配置自动下载Apk文件或者缓存HTML的请求方法信息，目前仅支持GET和POST
 method = "GET"
+
--- a/libs/core/init.py
+++ b/libs/core/init.py
@ -2,135 +2,178 @@
 # -*- coding: utf-8 -*-
 # Author: kelvinBen
 # Github: https://github.com/kelvinBen/AppInfoScanner
+
 import os
-import time
 import shutil
 import platform
+import logging
+
+backsmali_file = None
+apktool_file = None
+strings_file = None
+app_history_file= None
+domain_history_file = None
+result_dir = None
+download_dir = None
+decode_dir = None
+user_add_rules = None

-# smali 所在路径
-smali_path = ""
-
-# backsmli 所在路径
-backsmali_path = ""
-
-# apktool 所在路径
-apktool_path = ""
-
-# adb 所在路径
-adb_path = ""
-
-# frida server 所在路径
-frida32_path = ""
-frida64_path = ""
-
-# aapt 所在路径
-aapt_apth = ""
-
-# 系统类型
-os_type = ""
-
-# 输出路径
-output_path = ""
-
-# 下载完成标记
 download_flag = False
+net_sniffer_flag = False
+all_string_out = False
+no_resource_flag = False

-# excel 起始行号
 excel_row = 1
+threads_num = 10


 class Bootstrapper(object):

-    def __init__(self, path, out_path, all=False, no_resource=False):
-        global smali_path
-        global backsmali_path
-        global apktool_path
-        global adb_path
-        global frida32_path
-        global frida64_path
-        global aapt_apth
-        global os_type
-        global output_path
-        global script_root_dir
-        global txt_result_path
-        global xls_result_path
-        global strings_path
-        global history_path
-        global app_history_path
-        global domain_history_path
-        global excel_row
-        global download_path
+    def __init__(self, rules, threads, sniffer, all, no_resource):
+        # backsmali 加载路径
+        global backsmali_file
+        # apktool 加载路径
+        global apktool_file
+        # string 加载路径
+        global strings_file
+        # App 扫描历史文件
+        global app_history_file
+        # 域名 扫描历史文件
+        global domain_history_file
+        # 结果输出目录
+        global result_dir
+        # 临时文件下载目录
+        global download_dir
+        # 临时反编译目录
+        global decode_dir
+        # 下载完成标记
        global download_flag
-        global out_dir
-        global all_flag
-        global resource_flag
+        # excel 行号
+        global excel_row 
+        # 用户自定义规则
+        global user_add_rules 
+        # 用户指定线程数
+        global threads_num
+        # 网络嗅探标记
+        global net_sniffer_flag
+        # 输出所有字符传
+        global all_string_out
+        # 忽略资源标记
+        global no_resource_flag
+
+        user_add_rules = rules
+        threads_num = threads
+        net_sniffer_flag = not sniffer
+        all_string_out = all 
+        no_resource_flag = no_resource
+
+        # 需要创建的目录列表
+        self.__create_dir_list__= []
+        # 需要删除目录的列表
+        self.__remove_dir_list__= []
+
+        logging.info("[*] System env: {}".format(platform.system()))
+
+    def init_dir(self, app_input_path, user_out_path):
+        logging.info("[*] init dir...")
+        
+        # 脚本执行目录
+        script_root_dir =  os.path.dirname(os.path.abspath(app_input_path))
+
+        # 加载集成的工具
+        self.__tools_loading__(script_root_dir)
+        
+        # 构建持久化目录
+        self.__build_persistent_path__(script_root_dir)
+       
+        # 构建结果输出目录
+        self.__build_result_out__path__(script_root_dir,user_out_path)
+        
+        # 统一目录构建中心
+        self.__build_dir__()
+    
+    # 加载集成的工具
+    def __tools_loading__(self,script_root_dir):
+        tools_dir = os.path.join(script_root_dir,"tools")
        
-        all_flag = not all
-        resource_flag = no_resource
+        backsmali_file = os.path.join(tools_dir,"baksmali.jar")
+        logging.info("[*] Backsmali Path: {}".format(backsmali_file))
        
-        create_time = time.strftime("%Y%m%d%H%M%S", time.localtime())
-        script_root_dir = os.path.dirname(os.path.abspath(path))
-        if out_path:
-            out_dir = out_path
-        else:
-            out_dir = script_root_dir
-        tools_dir = os.path.join(script_root_dir, "tools")
-        output_path = os.path.join(out_dir, "out")
-        history_path = os.path.join(script_root_dir, "history")
+        apktool_file = os.path.join(tools_dir, "apktool.jar")
+        logging.info("[*] Apktool Path: {}".format(apktool_file))
        
        if platform.system() == "Windows":
            machine2bits = {'AMD64':64, 'x86_64': 64, 'i386': 32, 'x86': 32}
            machine2bits.get(platform.machine())

            if platform.machine() == 'i386' or platform.machine() == 'x86':
-                strings_path = os.path.join(tools_dir, "strings.exe")
+                strings_file = os.path.join(tools_dir,"strings.exe")
            else:
-                strings_path = os.path.join(tools_dir, "strings64.exe")
+                strings_file = os.path.join(tools_dir,"strings64.exe")
        else:
-            strings_path = "strings"
-
-        backsmali_path = os.path.join(tools_dir, "baksmali.jar")
-        apktool_path = os.path.join(tools_dir, "apktool.jar")
-        adb_path = os.path.join(tools_dir + '\\unpacker', "adb.exe")
-        frida32_path = os.path.join(tools_dir + '\\unpacker', "hexl-server-arm32")
-        frida64_path = os.path.join(tools_dir + '\\unpacker', "hexl-server-arm64")
-        aapt_apth = os.path.join(tools_dir + '\\unpacker', "aapt.exe")
-        download_path = os.path.join(out_dir, "download")
-        txt_result_path = os.path.join(out_dir, "result_" + str(create_time) + ".txt")
-        xls_result_path = os.path.join(out_dir, "result_" + str(create_time) + ".xlsx")
-        app_history_path = os.path.join(history_path, "app_history.txt")
-        domain_history_path = os.path.join(history_path, "domain_history.txt")
-
-    def init(self):
-        if not os.path.exists(out_dir):
-            os.makedirs(out_dir)
-            print("[*] Create directory {}".format(out_dir))
-
-        if os.path.exists(output_path):
+            strings_file ="strings"
+
+        logging.info("[*] Strings Path: {}".format(strings_file))
+
+    # 构建持久化目录
+    def __build_persistent_path__(self,script_root_dir):
+        # 当前用户文档目录
+        doc_path = os.path.join(os.path.expanduser("~"), 'Documents')
+        if os.path.exists(doc_path):
+            app_dir = os.path.join(doc_path,"AppInfoScanner")
+        else:
+            app_dir = os.path.join(script_root_dir,"AppInfoScanner")
+
+        # 历史任务加载目录
+        history_path = os.path.join(app_dir,"history")
+
+        app_history_file = os.path.join(history_path,"app_history.txt")
+        domain_history_file = os.path.join(history_path,"domain_history.txt")
+        
+        self.__create_dir_list__.append(app_dir)
+        self.__create_dir_list__.append(history_path)
+
+    # 构建结果输出目录
+    def __build_result_out__path__(self,script_root_dir,user_out_path):
+        result_out_dir = script_root_dir
+        
+        # 用户指定输出目录结果则为输出到指定目录
+        if user_out_path:
+            result_out_dir = user_out_path        
+        
+        # 统一输出目录
+        out_dir = os.path.join(result_out_dir,"out")
+        # 临时结果输出目录
+        decode_dir = os.path.join(out_dir,"decode")
+        # 临时文件下载目录
+        download_dir = os.path.join(out_dir,"download")
+        # 最终结果输出目录
+        result_dir = os.path.join(out_dir,"result")
+
+        self.__create_dir_list__.append(out_dir)
+        self.__create_dir_list__.append(decode_dir)
+        self.__create_dir_list__.append(download_dir)
+        self.__create_dir_list__.append(result_dir)
+        self.__remove_dir_list__.append(decode_dir)
+
+    # 统一目录构建中心
+    def __build_dir__(self):
+        for dir_path in self.__create_dir_list__:
+            if (os.path.exists(dir_path)) and (dir_path in self.__remove_dir_list__):
+                # 删除目录
                try:
-                shutil.rmtree(output_path)
+                    shutil.rmtree(dir_path)
+                    logging.info("[-] Remove Dir: {}".format(dir_path))
                except Exception as e:
                    # 解决windows超长文件名删除问题
                    if not (platform.system() == "Windows"):
                        raise e
-                self.__removed_dirs_cmd__(output_path)
-
-        os.makedirs(output_path)
-        print("[*] Create directory {}".format(output_path))
-
-        if not os.path.exists(download_path):
-            os.makedirs(download_path)
-            print("[*] Create directory {}".format(download_path))
-
-        if not os.path.exists(history_path):
-            os.makedirs(history_path)
-            print("[*] Create directory {}".format(history_path))
-
-        if os.path.exists(txt_result_path):
-            os.remove(txt_result_path)
+                    self.__removed_dirs_cmd__(dir_path)
            
-        if os.path.exists(xls_result_path):
-            os.remove(xls_result_path)
+            # 创建目录
+            if not os.path.exists(dir_path):
+                os.makedirs(dir_path)
+                logging.info("[+] Create Dir: {}".format(dir_path))

    def __removed_dirs_cmd__(self,output_path):
        files = os.listdir(output_path)
@ -139,8 +182,12 @@ class Bootstrapper(object):
            old_dir = os.path.join(output_path,file)
            if not os.path.exists(new_dir):
                os.makedirs(new_dir)
+                logging.info("[+] Create Dir: {}".format(new_dir))
            os.chdir(output_path)
            cmd = ("robocopy %s %s /purge") % (new_dir, old_dir)
+            logging.debug("[*] cmd : {}".format(cmd))
            os.system(cmd)
            os.removedirs(new_dir)
            os.removedirs(old_dir)
+            logging.info("[-] Remove Dir: {}".format(new_dir))
+            logging.info("[-] Remove Dir: {}".format(old_dir))
--- a/libs/core/download.py
+++ b/libs/core/download.py
@ -2,25 +2,87 @@
 # -*- coding: utf-8 -*-
 # Author: kelvinBen
 # Github: https://github.com/kelvinBen/AppInfoScanner
+from genericpath import exists
+import re
+import os
 import sys
+import time
+import uuid
 import config
+import logging
 import requests
 import threading
 import libs.core as cores
 from requests.packages import urllib3
 from requests.adapters import HTTPAdapter    

-
 class DownloadThreads(threading.Thread):   

-    def __init__(self, input_path, file_name, cache_path, types):
+    def __init__(self,threadID, threadName, download_file_queue, download_file_list, types):
        threading.Thread.__init__(self) 
-        self.url = input_path
+        self.threadID = threadID
+        self.threadName = threadName
+        self.download_file_queue = download_file_queue
+        self.download_file_list = download_file_list
        self.types = types
+        self.cache_path = None
+    
+    def __start__(self):
+        # 从队列中取数据，直到队列数据不为空为止
+        while not self.download_file_queue.empty():
+            file_or_url = self.download_file_queue.get()
+            if not file_or_url:
+                logging.error("[x] Failed to get file!")
+                continue
+            self.__auto_update_type__(file_or_url)
+
+    # 自动更新文件类型
+    def __auto_update_type__(self,file_or_url):
+        uuid_name =  str(uuid.uuid1()).replace("-","")
+        # 文件后缀为apk 或者 类型为 Android 则自动修正为Android类型
+        if file_or_url.endswith("apk") or self.types == "Android":
+            types = "Android"
+            file_name = uuid_name + ".apk"
+        # 文件后缀为dex 或者 类型为 Android 则自动修正为Android类型
+        elif file_or_url.endswith("dex") or self.types == "Android":
+            types = "Android"
+            file_name = uuid_name + ".dex"
+        # 文件后缀为ipa 或者 类型为 iOS 则自动修正为iOS类型
+        elif file_or_url.endswith("ipa") or self.types == "iOS":
+            types = "iOS"
+            file_name = uuid_name + ".ipa"
+        else:
+            # 路径以http://开头或者以https://开头 且 文件是不存在的自动修正为web类型
+            if (file_or_url.startswith("http://") or file_or_url.startswith("https://")) and (not os.path.exists(file_or_url)):
+                types = "WEB"
+                file_name = uuid_name + ".html"
+            # 其他情况如：types为WEB 或者目录 或者 单独的二进制文件 等交给后面逻辑处理
+        
+        if file_or_url.startswith("http://") or file_or_url.startswith("https://"):
+            # 进行文件下载
+            self.__file_deduplication__(file_name, uuid_name)
+            if self.cache_path:
+                file_path = self.cache_path
+                self.__download_file__(file_or_url,file_path)
+            #TODO 标记下载过的文件，避免重复下载
+        else:
+            types = self.types
+            file_path = file_or_url
+
+        self.download_file_list.append({"path": file_path, "type": types})
+         
+    # 防止文件名重复导致文件被复写
+    def __file_deduplication__(self,file_name, uuid_name):
+        cache_path = os.path.join(cores.download_dir, file_name)
+        if not os.path.exists(cache_path):
            self.cache_path = cache_path
-        self.file_name = file_name
+            return
+        new_uuid_name = str(uuid.uuid1()).replace("-","")
+        new_file_name = file_name.replace(uuid_name,new_uuid_name) 
+        self.__file_deduplication__(new_file_name,new_uuid_name)

-    def __requset__(self):
+    # 文件下载    
+    def __download_file__(self, url, file_path):
        try:
            session = requests.Session()
            session.mount('http://', HTTPAdapter(max_retries=3))
@ -30,18 +92,17 @@ class DownloadThreads(threading.Thread):
            urllib3.disable_warnings()

            if config.method.upper() == "POST":
-                resp = session.post(
-                    url=self.url, params=config.data, headers=config.headers, timeout=30)
+                resp = session.post(url=url, params=config.data, headers=config.headers, timeout=30)
            else:
-                resp = session.get(url=self.url, data=config.data,
-                                   headers=config.headers, timeout=30)
+                resp = session.get(url=url, data=config.data, headers=config.headers, timeout=30)
            
            if resp.status_code == requests.codes.ok:
+                # 下载二进制文件
                if self.types == "Android" or self.types == "iOS":
                    count = 0
                    progress_tmp = 0
                    length = float(resp.headers['content-length'])
-                    with open(self.cache_path, "wb") as f:
+                    with open(file_path, "wb") as f:
                        for chunk in resp.iter_content(chunk_size = 512):
                            if chunk:
                                f.write(chunk)
@ -49,20 +110,23 @@ class DownloadThreads(threading.Thread):
                                progress = int(count / length * 100)
                                if progress != progress_tmp:
                                    progress_tmp = progress
-                                    print("\r", end="")
-                                    print(
-                                        "[*] Download progress: {}%: ".format(progress), "▋" * (progress // 2), end="")
+                                    logging.info("\r", end="")
+                                    logging.info("[*] Download progress: {}%: ".format(progress), "▋" * (progress // 2), end="")
                                    sys.stdout.flush()
                        f.close()
                else:
                    html = resp.text
-                    with open(self.cache_path, "w", encoding='utf-8', errors='ignore') as f:
+                    with open(file_path,"w",encoding='utf-8',errors='ignore') as f:
                        f.write(html)
                        f.close()
                cores.download_flag = True
+            else:
+               logging.error("[x] {} download fails, status code is {} !!!".format(url, str(resp.status_code)))
+
        except Exception as e:
-            raise Exception(e)
+            logging.error("[x] {} download fails, the following exception information:".format(url))
+            logging.exception(e)

    def run(self):
        threadLock = threading.Lock()
-        self.__requset__()
+        self.__start__()
--- a/libs/core/net.py
+++ b/libs/core/net.py
@ -4,6 +4,7 @@
 # Github: https://github.com/kelvinBen/AppInfoScanner
 import re
 import time
+import logging
 import threading
 import requests
 import libs.core as cores
@ -27,34 +28,26 @@ class NetThreads(threading.Thread):
            url_ip = domains["url_ip"]
            time.sleep(2)
            result = self.__get_request_result__(url_ip)
-            print("[+] Processing URL address："+url_ip)
+            logging.info("[+] " + url_ip)
            if result != "error":
                if self.lock.acquire(True):
                    cores.excel_row = cores.excel_row + 1
-                    self.worksheet.cell(row=cores.excel_row,
-                                        column=1, value=cores.excel_row-1)
-                    self.worksheet.cell(row=cores.excel_row,
-                                        column=2, value=url_ip)
-                    self.worksheet.cell(row=cores.excel_row,
-                                        column=3, value=domain)
+                    self.worksheet.cell(row=cores.excel_row, column=1).value = cores.excel_row
+                    self.worksheet.cell(row=cores.excel_row, column=2).value = url_ip
+                    self.worksheet.cell(row=cores.excel_row, column=3).value = domain

                    if result != "timeout":
-                        self.worksheet.cell(
-                            row=cores.excel_row, column=4, value=result["status"])
-                        self.worksheet.cell(
-                            row=cores.excel_row, column=5, value=result["des_ip"])
-                        self.worksheet.cell(
-                            row=cores.excel_row, column=6, value=result["server"])
-                        self.worksheet.cell(
-                            row=cores.excel_row, column=7, value=result["title"])
-                        self.worksheet.cell(
-                            row=cores.excel_row, column=8, value=result["cdn"])
+                        self.worksheet.cell(row=cores.excel_row, column=4).value = result["status"]
+                        self.worksheet.cell(row=cores.excel_row, column=5).value = result["des_ip"]
+                        self.worksheet.cell(row=cores.excel_row, column=6).value = result["server"]
+                        self.worksheet.cell(row=cores.excel_row, column=7).value = result["title"]
+                        self.worksheet.cell(row=cores.excel_row, column=8).value = result["cdn"]
+                        self.worksheet.cell(row=cores.excel_row, column=9).value = ""
                        
                    self.lock.release()
            
    def __get_request_result__(self,url):
-        result = {"status": "", "server": "", "cookie": "",
-                  "cdn": "", "des_ip": "", "sou_ip": "", "title": ""}
+        result={"status":"","server":"","cookie":"","cdn":"","des_ip":"","sou_ip":"","title":""}
        cdn = ""
        try:
            with requests.get(url, timeout=5,stream=True) as rsp:
--- a/libs/core/parses.py
+++ b/libs/core/parses.py
@ -6,6 +6,7 @@
 import re
 import os
 import config
+import logging
 import threading
 import libs.core as cores

@ -38,10 +39,8 @@ class ParsesThreads(threading.Thread):

    def __get_string_by_iOS__(self,file_path):
        output_path = cores.output_path
-        strings_path = cores.strings_path
        temp =  os.path.join(output_path,"temp.txt")
-        cmd_str = ('"%s" "%s" > "%s"') % (
-            str(strings_path), str(file_path), str(temp))
+        cmd_str = ('"%s" "%s" > "%s"') % (str(cores.strings_file),str(file_path),str(temp))
        if os.system(cmd_str) == 0:
            with open(temp,"r",encoding='utf-8',errors='ignore') as f:
                lines = f.readlines()
@ -55,30 +54,17 @@ class ParsesThreads(threading.Thread):
            pattern = re.compile(r'\"(.*?)\"') 
            results = pattern.findall(file_content)

-            # 搜素AK和SK信息,由于iOS的逻辑处理效率过慢暂时忽略对iOS的AK检测
-            if not (".js" == file_path[-3:] and self.types == "iOS"):
-                # 未包含相关字段不进行ak或者sk信息采集
-                if "access" in file_content or "secret" in file_content:
-                    for key, values in config.filter_ak_map.items():
-                        if isinstance(values, list):
-                            for value in values:
-                                self.__ak_and_sk__(key, value, file_content)
-                        else:
-                            self.__ak_and_sk__(key, values, file_content)
+            # 搜素AK和SK信息
+            if not ".js" == file_path[-3:]:
+                akAndSkList = re.compile(r'.*accessKeyId.*".*"|.*accessKeySecret.*".*"|.*secret.*".*"').findall(file_content)
+                for akAndSk in akAndSkList:
+                    self.result_list.append(akAndSk.strip())
+                    logging.info("[+] AK or SK in:",akAndSk.strip())

            # 遍历所有的字符串
            for result in set(results): 
-                if ("http://" == result) or ("https://" == result) or result.startswith("https://.") or result.startswith("http://.") :
-                    continue
                self.__parse_string__(result)    
        
-    def __ak_and_sk__(self, name, ak_rule, content):
-        akAndSkList = re.compile(ak_rule).findall(content)
-        for akAndSk in akAndSkList:
-            ak = ("[%s]-->:%s") % (name, akAndSk.strip())
-            self.result_list.append(ak)
-            print(("[+] [%s] AK or SK in %s:") % (name, akAndSk.strip()))
-
    def __parse_string__(self,result):
        # 通过正则筛选需要过滤的字符串
        for filter_str in config.filter_strs:
@ -94,16 +80,14 @@ class ParsesThreads(threading.Thread):

                self.threadLock.acquire()
                if cores.all_flag:
-                    print(
-                        ("[+] The string searched for matching rule is: %s") % (resl_str))
+                    logging.info("[+] String : {}".format(resl_str))
                self.result_list.append(resl_str)
                self.threadLock.release()
            continue

    def __filter__(self,resl_str):
        return_flag = 1 
-        resl_str = resl_str.replace("\r", "").replace(
-            "\n", "").replace(" ", "")
+        resl_str = resl_str.replace("\r","").replace("\n","").replace(" ","")
        
        if len(resl_str) == 0:
            return 0
@ -117,7 +101,6 @@ class ParsesThreads(threading.Thread):
            if re.match(filte,resl_str):
                return_flag = 0 
                continue
-
        return return_flag  

    def run(self):
--- a/libs/task/android_task.py
+++ b/libs/task/android_task.py
@ -2,388 +2,50 @@
 # -*- coding: utf-8 -*-
 # Author: kelvinBen
 # Github: https://github.com/kelvinBen/AppInfoScanner
-import json
 import os
 import re
-import shutil
-import subprocess
-
 import config
+import logging
 import hashlib
-import zipfile
-import platform
 from queue import Queue
 import libs.core as cores


 class AndroidTask(object):

-    def __init__(self, path, package):
-        self.path = path
+    def __init__(self, file_path, package):
+        self.input_file_path = file_path
        self.package = package
        self.file_queue = Queue()
        self.shell_flag = False
        self.packagename = ""
        self.comp_list = []
        self.file_identifier = []
-        self.permissions = []
-        self.files = []
-        self.protect_flag = """{
-          "360加固": [
-            "assets/.appkey",
-            "assets/libjiagu.so",
-            "libjiagu.so",
-            "libjiagu_art.so",
-            "libjiagu_x86.so",
-            "libprotectClass.so",
-            ".appkey",
-            "1ibjgdtc.so",
-            "libjgdtc.so",
-            "libjgdtc_a64.so",
-            "libjgdtc_art.so",
-            "libjgdtc_x64.so",
-            "libjgdtc_x86.so",
-            "libjiagu_a64.so",
-            "libjiagu_ls.so",
-            "libjiagu_x64.so"
-          ],
-          "APKProtect": [
-            "libAPKProtect.so"
-          ],
-          "UU安全": [
-            "libuusafe.jar.so",
-            "libuusafe.so",
-            "libuusafeempty.so",
-            "assets/libuusafe.jar.so",
-            "assets/libuusafe.so",
-            "lib/armeabi/libuusafeempty.so"
-          ],
-          "apktoolplus": [
-            "assets/jiagu_data.bin",
-            "assets/sign.bin",
-            "jiagu_data.bin",
-            "lib/armeabi/libapktoolplus_jiagu.so",
-            "libapktoolplus_jiagu.so",
-            "sign.bin"
-          ],
-          "中国移动加固": [
-            "assets/mogosec_classes",
-            "assets/mogosec_data",
-            "assets/mogosec_dexinfo",
-            "assets/mogosec_march",
-            "ibmogosecurity.so",
-            "lib/armeabi/libcmvmp.so",
-            "lib/armeabi/libmogosec_dex.so",
-            "lib/armeabi/libmogosec_sodecrypt.so",
-            "lib/armeabi/libmogosecurity.so",
-            "libcmvmp.so",
-            "libmogosec_dex.so",
-            "libmogosec_sodecrypt.so",
-            "mogosec_classes",
-            "mogosec_data",
-            "mogosec_dexinfo",
-            "mogosec_march"
-          ],
-          "几维安全": [
-            "assets/dex.dat",
-            "lib/armeabi/kdpdata.so",
-            "lib/armeabi/libkdp.so",
-            "lib/armeabi/libkwscmm.so",
-            "libkwscmm.so",
-            "libkwscr.so",
-            "libkwslinker.so"
-          ],
-          "启明星辰": [
-            "libvenSec.so",
-            "libvenustech.so"
-          ],
-          "网秦加固": [
-            "libnqshield.so"
-          ],
-          "娜迦加固": [
-            "libchaosvmp.so",
-            "libddog.so",
-            "libfdog.so"
-          ],
-          "娜迦加固（新版2022）": [
-            "assets/maindata/fake_classes.dex",
-            "lib/armeabi/libxloader.so",
-            "lib/armeabi-v7a/libxloader.so",
-            "lib/arm64-v8a/libxloader.so",
-            "libxloader.so"
-          ],
-          "娜迦加固（企业版）": [
-            "libedog.so"
-          ],
-          "梆梆安全（企业版）": [
-            "libDexHelper-x86.so",
-            "libDexHelper.so",
-            "1ibDexHelper.so"
-          ],
-          "梆梆安全": [
-            "libSecShell.so",
-            "libsecexe.so",
-            "libsecmain.so",
-            "libSecShel1.so"
-          ],
-          "梆梆安全（定制版）": [
-            "assets/classes.jar",
-            "lib/armeabi/DexHelper.so"
-          ],
-          "梆梆安全（免费版）": [
-            "assets/secData0.jar",
-            "lib/armeabi/libSecShell-x86.so",
-            "lib/armeabi/libSecShell.so"
-          ],
-          "海云安加固": [
-            "assets/itse",
-            "lib/armeabi/libitsec.so",
-            "libitsec.so"
-          ],
-          "爱加密": [
-            "assets/af.bin",
-            "assets/ijiami.ajm",
-            "assets/ijm_lib/X86/libexec.so",
-            "assets/ijm_lib/armeabi/libexec.so",
-            "assets/signed.bin",
-            "ijiami.dat",
-            "lib/armeabi/libexecmain.so",
-            "libexecmain.so"
-          ],
-          "爱加密企业版": [
-            "ijiami.ajm"
-          ],
-          "珊瑚灵御": [
-            "assets/libreincp.so",
-            "assets/libreincp_x86.so",
-            "libreincp.so",
-            "libreincp_x86.so"
-          ],
-          "瑞星加固": [
-            "librsprotect.so"
-          ],
-          "百度加固": [
-            "libbaiduprotect.so",
-            "assets/baiduprotect.jar",
-            "assets/baiduprotect1.jar",
-            "baiduprotect1.jar",
-            "lib/armeabi/libbaiduprotect.so",
-            "libbaiduprotect_art.so",
-            "libbaiduprotect_x86.so"
-          ],
-          "盛大加固": [
-            "libapssec.so"
-          ],
-          "网易易盾": [
-            "libnesec.so"
-          ],
-          "腾讯": [
-            "libexec.so",
-            "libshell.so"
-          ],
-          "腾讯加固": [
-            "lib/armeabi/mix.dex",
-            "lib/armeabi/mixz.dex",
-            "lib/armeabi/libshella-xxxx.so",
-            "lib/armeabi/libshellx-xxxx.so",
-            "tencent_stub"
-          ],
-          "腾讯乐固（旧版）": [
-            "libtup.so",
-            "mix.dex",
-            "liblegudb.so",
-            "libshella",
-            "mixz.dex",
-            "libshel1x"
-          ],
-          "腾讯乐固": [
-            "libshellx"
-          ],
-          "腾讯乐固（VMP）": [
-            "lib/arm64-v8a/libxgVipSecurity.so",
-            "lib/armeabi-v7a/libxgVipSecurity.so",
-            "libxgVipSecurity.so"
-          ],
-          "腾讯云": [
-            "assets/libshellx-super.2021.so",
-            "lib/armeabi/libshell-super.2019.so",
-            "lib/armeabi/libshell-super.2020.so",
-            "lib/armeabi/libshell-super.2021.so",
-            "lib/armeabi/libshell-super.2022.so",
-            "lib/armeabi/libshell-super.2023.so",
-            "tencent_sub"
-          ],
-          "腾讯云移动应用安全": [
-            "0000000lllll.dex",
-            "00000olllll.dex",
-            "000O00ll111l.dex",
-            "00O000ll111l.dex",
-            "0OO00l111l1l",
-            "o0oooOO0ooOo.dat"
-          ],
-          "腾讯云移动应用安全（腾讯御安全）": [
-            "libBugly-yaq.so",
-            "libshell-super.2019.so",
-            "libshellx-super.2019.so",
-            "libzBugly-yaq.so",
-            "t86",
-            "tosprotection",
-            "tosversion",
-            "000000011111.dex",
-            "000000111111.dex",
-            "000001111111",
-            "00000o11111.dex",
-            "o0ooo000oo0o.dat"
-          ],
-          "腾讯御安全": [
-            "libtosprotection.armeabi-v7a.so",
-            "libtosprotection.armeabi.so",
-            "libtosprotection.x86.so",
-            "assets/libtosprotection.armeabi-v7a.so",
-            "assets/libtosprotection.armeabi.so",
-            "assets/libtosprotection.x86.so",
-            "assets/tosversion",
-            "lib/armeabi/libTmsdk-xxx-mfr.so",
-            "lib/armeabi/libtest.so"
-          ],
-          "腾讯Bugly": [
-            "lib/arm64-v8a/libBugly.so",
-            "libBugly.so"
-          ],
-          "蛮犀": [
-            "assets/mxsafe.config",
-            "assets/mxsafe.data",
-            "assets/mxsafe.jar",
-            "assets/mxsafe/arm64-v8a/libdSafeShell.so",
-            "assets/mxsafe/x86_64/libdSafeShell.so",
-            "libdSafeShell.so"
-          ],
-          "通付盾": [
-            "libNSaferOnly.so",
-            "libegis.so"
-          ],
-          "阿里加固": [
-            "assets/armeabi/libfakejni.so",
-            "assets/armeabi/libzuma.so",
-            "assets/classes.dex.dat",
-            "assets/dp.arm-v7.so.dat",
-            "assets/dp.arm.so.dat",
-            "assets/libpreverify1.so",
-            "assets/libzuma.so",
-            "assets/libzumadata.so",
-            "dexprotect"
-          ],
-          "阿里聚安全": [
-            "aliprotect.dat",
-            "libdemolish.so",
-            "libfakejni.so",
-            "libmobisec.so",
-            "libsgmain.so",
-            "libzuma.so",
-            "libzumadata.so",
-            "libdemolishdata.so",
-            "libpreverify1.so",
-            "libsgsecuritybody.so"
-          ],
-          "顶像科技": [
-            "libx3g.so",
-            "lib/armeabi/libx3g.so"
-          ]
-        }"""
        
    def start(self):
        # 检查java环境是否存在
        if os.system("java -version") !=0 :
            raise Exception("Please install the Java environment!")
-        # 检查Frida环境是否存在
-        if os.system("frida --version") != 0:
-            raise Exception("Please install the Frida environment!")
        
        input_file_path = self.path
+        
        if os.path.isdir(input_file_path):
            self.__decode_dir__(input_file_path)
        else:
           if self.__decode_file__(input_file_path) == "error":
-                raise Exception(
-                    "Retrieval of this file type is not supported. Select APK file or DEX file.")
-
-        return {"comp_list": self.comp_list, "shell_flag": self.shell_flag, "file_queue": self.file_queue,
-                "packagename": self.packagename, "file_identifier": self.file_identifier,
-                "permissions": self.permissions}
+               raise Exception("Retrieval of this file type is not supported. Select APK file or DEX file.")
        
-    def __detect_protect__(self, file_path):
-        markNameMap = json.loads(self.protect_flag)
-        markNameMap = dict(markNameMap)
-        zip_stream = zipfile.ZipFile(file_path)  # 默认模式r,读
-        flag = ''
-        for zippath in zip_stream.namelist():
-            if 'lib' in zippath:
-                for key, value in markNameMap.items():
-                    for mark in value:
-                        if mark in zippath:
-                            print("detect 【{}】 protector\nspecific code:{}->{}\n".format(key, zippath, mark))
-                            flag += ("detect 【{}】 protector\nspecific code:{}->{}\n".format(key, zippath, mark))
-        if len(flag) > 0:
-            self.__android_unpack__()
-        # so库文件模式找不到就全量匹配
-        for zippath in zip_stream.namelist():
-            for key, value in markNameMap.items():
-                for mark in value:
-                    if mark in zippath:
-                        print("detect 【{}】 protector\nspecific code:{}->{}\n".format(key, zippath, mark))
-                        flag += ("detect 【{}】 protector\nspecific code:{}->{}\n".format(key, zippath, mark))
-        if len(flag) > 0:
-            self.__android_unpack__()
-        print("We can't detect protect")
-
-    def __android_unpack__(self):
-        print('[*] unpacking')
-        cmd_str = ('%s install %s') % (str(cores.adb_path), str(self.path))
-        print('[*] Install the APK')
-        if os.system(cmd_str) == 0:
-            print("Push Frida Server")
-            cmd_str = ('%s push %s /data/local/tmp') % (str(cores.adb_path), str(cores.frida32_path))
-            cmd_str1 = ('%s push %s /data/local/tmp') % (str(cores.adb_path), str(cores.frida64_path))
-            cmd_str2 = ('%s shell su -c "chmod 777 /data/local/tmp/hexl-server-arm64"') % (str(cores.adb_path))
-            cmd_str3 = ('%s shell su -c "setenforce 0"') % (str(cores.adb_path))
-            cmd_str4 = ('%s shell su -c "./data/local/tmp/hexl-server-arm64 &"') % (str(cores.adb_path))
-            print("[*] Running Frida Server")
-            if os.system(cmd_str) == 0 and os.system(cmd_str1) == 0 and os.system(cmd_str2) == 0 \
-                    and os.system(cmd_str3) == 0 and os.system(cmd_str4) == 0:
-                print("[*] Frida Server started")
-            else:
-                print("[-] Running failed, please check the error in terminal")
-                exit()
-        else:
-            print("[-] We can't install the APP")
-            exit()
-        get_info_command = "%s dump badging %s" % (cores.aapt_apth, self.path)
-        pip = os.popen(get_info_command)
-        output = pip.buffer.read().decode('utf-8', 'ignore')
-        if output == "":
-            raise Exception("can't get the app info")
-        match = re.compile("package: name='(\S+)'").match(
-            output)  # 通过正则匹配，获取包名
-        print(match.group(1))
-        cmd_str = ('frida-dexdump -U -f %s') % (str(match.group(1)))
-        if os.system(cmd_str) != 0:
-            print("An error occurred in the unpack")
-            exit()
+        return {"comp_list":self.comp_list,"shell_flag":self.shell_flag,"file_queue":self.file_queue,"packagename":self.packagename,"file_identifier":self.file_identifier}

    def __decode_file__(self,file_path):
-        apktool_path = str(cores.apktool_path)
-        backsmali_path = str(cores.backsmali_path)
        base_out_path = str(cores.output_path)
        filename =  os.path.basename(file_path)
        suffix_name = filename.split(".")[-1]

        if suffix_name == "apk":
-            self.__detect_protect__(file_path)
-
-        if suffix_name == "apk" or suffix_name == "hpk":
            name = filename.split(".")[0]
            output_path = os.path.join(base_out_path,name)
-            self.__decode_apk__(file_path, apktool_path, output_path)
+            self.__decode_apk__(file_path,output_path)
        elif suffix_name == "dex":
            f = open(file_path,'rb')
            md5_obj = hashlib.md5()
@ -397,7 +59,7 @@ class AndroidTask(object):
            output_path = os.path.join(base_out_path,dex_md5)
            if not os.path.exists(output_path):
                os.makedirs(output_path)
-            self.__decode_dex__(file_path, backsmali_path, output_path)
+            self.__decode_dex__(file_path,output_path)
        else:
            return "error"
    
@ -412,28 +74,28 @@ class AndroidTask(object):
                    continue

    # 分解apk
-    def __decode_apk__(self, file_path, apktool_path, output_path):
-        cmd_str = ('java -jar "%s" d -f "%s" -o "%s" --only-main-classe') % (
-            str(apktool_path), str(file_path), str(output_path))
+    def __decode_apk__(self,file_path,output_path):
+        cmd_str = ('java -jar "%s" d -f "%s" -o "%s" --only-main-classe') % (cores.apktool_file,str(file_path),str(output_path))
+        logging.debug("[*] cmd {}".format(cmd_str))
        if os.system(cmd_str) == 0:
            self.__shell_test__(output_path)
            self.__scanner_file_by_apktool__(output_path)
        else:
-            print(
-                "[-] Decompilation failed, please submit error information at https://github.com/kelvinBen/AppInfoScanner/issues")
+            logging.error("[x] Decompilation failed, please submit error information at https://github.com/kelvinBen/AppInfoScanner/issues")
            raise Exception(file_path + ", Decompilation failed.")
                
+
    # 分解dex
-    def __decode_dex__(self, file_path, backsmali_path, output_path):
-        cmd_str = ('java -jar "%s" d "%s"') % (str(backsmali_path),
-                                               str(file_path))
+    def __decode_dex__(self,file_path,output_path):
+        cmd_str = ('java -jar "%s" d "%s"') % (cores.backsmali_file,str(file_path))
+        logging.debug("[*] cmd {}".format(cmd_str))
        if os.system(cmd_str) == 0:
            self.__get_scanner_file__(output_path)
        else:
-            print(
-                "[-] Decompilation failed, please submit error information at https://github.com/kelvinBen/AppInfoScanner/issues")
+            logging.error("[x] Decompilation failed, please submit error information at https://github.com/kelvinBen/AppInfoScanner/issues")
            raise Exception(file_path + ", Decompilation failed.")
    
+
    # 初始化检测文件信息
    def __scanner_file_by_apktool__(self,output_path):
        file_names = os.listdir(output_path)
@ -456,8 +118,7 @@ class AndroidTask(object):
            if os.path.isdir(dir_file_path):
                self.__get_scanner_file__(dir_file_path,scanner_file_suffixs)
            else:
-                if ("." not in dir_or_file) or (len(dir_or_file.split(".")) < 1) or (
-                        dir_or_file.split(".")[-1] not in scanner_file_suffixs):
+                if ("." not in dir_or_file) or (len(dir_or_file.split(".")) < 1) or (dir_or_file.split(".")[-1] not in scanner_file_suffixs):
                    continue
                self.file_queue.put(dir_file_path)
                for component in config.filter_components:
@ -483,9 +144,3 @@ class AndroidTask(object):
            if aname and len(aname)>=1:
                if aname[0] in config.shell_list:
                    self.shell_flag = True
-
-            am_permission = re.compile(r'<uses-permission android:name="(.*)"/>')
-            ampermissions = am_permission.findall(am_str)
-            for ampermission in ampermissions:
-                if ampermission in config.apk_permissions:
-                    self.permissions.append(ampermission)
--- a/libs/task/base_task.py
+++ b/libs/task/base_task.py
@ -3,7 +3,10 @@
 # Author: kelvinBen
 # Github: https://github.com/kelvinBen/AppInfoScanner
 import os
+import re
 import config
+import logging
+import threading
 from queue import Queue
 import libs.core as cores
 from libs.task.ios_task import iOSTask
@ -11,57 +14,100 @@ from libs.task.web_task import WebTask
 from libs.task.net_task import NetTask
 from libs.core.parses import ParsesThreads
 from libs.task.android_task import AndroidTask
-from libs.task.download_task import DownloadTask
-
+from libs.core.download import DownloadThreads

 class BaseTask(object):
-    thread_list = []
-    result_dict = {}
-    app_history_list = []
-    domain_history_list = []
-    # 统一初始化入口
-
-    def __init__(self, types="Android", inputs="", rules="", sniffer=True, threads=10, package=""):
-        self.types = types
-        self.path = inputs
-        if rules:
-            config.filter_strs.append(r'.*'+str(rules)+'.*')
-        self.sniffer = not sniffer
-        self.threads = threads
-        self.package = package
-        self.file_queue = Queue()

-    # 统一调度平台
+    def __init__(self):
+        if cores.user_add_rules:
+            config.filter_strs.append(r'.*'+str(cores.user_add_rules)+'.*')
+        self.file_queue = Queue()
+        # 文件下载队列
+        self.download_file_queue = Queue()
+        # 文件下载列表
+        self.download_file_list = []
+        self.thread_list = []
+        self.app_history_list= []
+        self.domain_history_list = []
+        self.result_dict = {}
+        
+    # 统一启动
+    def start(self, types="Android", user_input_path="", package=""):
+        # 如果输入路径为目录,且类型非web,则自动检索DEX、IPA、APK等文件
+        if not(types == "Web") and os.path.isdir(user_input_path):
+            self.__scanner_specified_file__(user_input_path)
+        
+        # 如果输入的路径为txt, 则加载txt中的内容实现批量操作
+        elif user_input_path.endswith("txt"):
+            with open(user_input_path) as f:
+                lines = f.readlines()
+                for line in lines:
+                    # http:// 或者 https:// 开头 或者 apk/dex/ipa结尾的文件且文件存在
+                    if (line.startswith("http://") or line.startswith("https://")) or ((line.endswith("apk") or line.endswith(".dex") or line.endswith("ipa")) and os.path.exists(line)):
+                        self.download_file_queue.put(line)
+                f.close()
+        else:
+            # 如果是文件或者类型为web的目录
+            self.download_file_queue.put(user_input_path)
+
+        # 长度小于1需重新选择目录
+        if self.download_file_queue.qsize() < 1:
+            raise Exception('[x] The specified DEX, IPA and APK files are not found. Please re-enter the directory to be scanned!') 
+
+        # 统一文件下载中心
+        self.__download_file_center__(types)
+        
+        for download_file in self.download_file_list:
+            file_path = download_file["path"]
+            types = download_file["type"]
+            # 控制中心
+            self.__control_center__(file_path, types)
+
+    # 统一文件下载中心
+    def __download_file_center__(self,types):
+        # 杜绝资源浪费
+        if self.download_file_queue.qsize() < cores.threads_num:
+            threads_num = self.download_file_queue.qsize()
+        else:
+            threads_num = cores.threads_num

-    def start(self):
+        for threadID in range(1, threads_num): 
+            threadName = "Thread - " + str(int(threadID))
+            thread = DownloadThreads(threadID, threadName, self.download_file_queue, self.download_file_list, types)
+            thread.start()
+            thread.join()

-        print("[*] AI is analyzing filtering rules......")
+    # 控制中心
+    def __control_center__(self, file_path, types):
+        logging.info("[*] Processing {}".format(file_path))
+        logging.info("[*] AI is analyzing filtering rules......")
        
-        # 获取历史记录
+        # 处理历史记录
        self.__history_handle__()
-
-        print("[*] The filtering rules obtained by AI are as follows: %s" %
-              (set(config.filter_no)))
+        logging.info("[*] The filtering rules obtained by AI are as follows: {}".format(set(config.filter_no)))

        # 任务控制中心
-        task_info = self.__tast_control__()
+        task_info = self.__tast_control__(file_path, types)
        if len(task_info) < 1:
            return 

+        # 文件队列    
        file_queue = task_info["file_queue"]
+        # 是否存在壳
        shell_flag = task_info["shell_flag"]
+        # 组件列表(仅适用于Android)
        comp_list = task_info["comp_list"]
+        # 报名信息(仅适用于Android)
        packagename = task_info["packagename"]
+        # 文件标识符
        file_identifier = task_info["file_identifier"]
-        permissions = task_info["permissions"]
            
        if shell_flag:
-            print('[-] \033[3;31m Error: This application has shell, the retrieval results may not be accurate, Please remove the shell and try again!')
+            logging.error('[x] This application has shell, the retrieval results may not be accurate, Please remove the shell and try again!')
            return

        # 线程控制中心
-        print(
-            "[*] =========  Searching for strings that match the rules ===============")
+        logging.info("[*] =========  Searching for strings that match the rules ===============")
        self.__threads_control__(file_queue)

        # 等待线程结束
@ -69,67 +115,53 @@ class BaseTask(object):
            thread.join()
        
        # 结果输出中心
-        self.__print_control__(packagename, comp_list,
-                               file_identifier, permissions)
+        self.__print_control__(packagename,comp_list,file_identifier)
+

-    def __tast_control__(self):
+    # 任务控制中心
+    def __tast_control__(self, file_path, types):
        task_info = {}
-        # 自动根据文件后缀名称进行修正
-        cache_info = DownloadTask().start(self.path, self.types)
-        cacar_path = cache_info["path"]
-        types = cache_info["type"]
-
-        if (not os.path.exists(cacar_path) and cores.download_flag):
-            print(
-                "[-] File download failed! Please download the file manually and try again.")
+        
+        # 通过网络下载的文件如果不存在就直接返回任务控制中心
+        if (not os.path.exists(file_path) and cores.download_flag):
+            logging.error("[x] {} download failed! Please download the file manually and try again.".format(file_path))
            return task_info

        # 调用Android 相关处理逻辑
        if types == "Android":
-            task_info = AndroidTask(cacar_path, self.package).start()
+            task_info = AndroidTask(file_path, self.package).start()
        # 调用iOS 相关处理逻辑
        elif types == "iOS":
-            task_info = iOSTask(cacar_path).start()
+            task_info = iOSTask(file_path).start()
        # 调用Web 相关处理逻辑
        else:
-            task_info = WebTask(cacar_path).start()
+            task_info = WebTask(file_path).start()
        return task_info

+    # 线程控制中心
    def __threads_control__(self,file_queue):
-        for threadID in range(1, self.threads):
+        for threadID in range(1, cores.threads_num): 
            name = "Thread - " + str(int(threadID))
-            thread = ParsesThreads(
-                threadID, name, file_queue, self.result_dict, self.types)
+            thread =  ParsesThreads(threadID,name,file_queue,self.result_dict,self.types)
            thread.start()
            self.thread_list.append(thread)
    
-    def __print_control__(self, packagename, comp_list, file_identifier, permissions):
-        txt_result_path = cores.txt_result_path
-        xls_result_path = cores.xls_result_path
-        all_flag = cores.all_flag
-
-        if self.sniffer:
-            print(
-                "[*] ========= Sniffing the URL address of the search ===============")
-            NetTask(self.result_dict, self.app_history_list,
-                    self.domain_history_list, file_identifier, self.threads).start()
+    # 信息输出中心
+    def __print_control__(self,packagename,comp_list,file_identifier):                
+        if cores.net_sniffer_flag:
+            logging.info("[*] ========= Sniffing the URL address of the search ===============")
+            NetTask(self.result_dict,self.app_history_list,self.domain_history_list,file_identifier).start()
            
        if packagename: 
-            print("[*] ========= The package name of this APP is: ===============")
-            print(packagename)
+            logging.info("[*] =========  The package name of this APP is: ===============")
+            logging.info(packagename)

        if len(comp_list) != 0:
-            print("[*] ========= Component information is as follows: ===============")
+            logging.info("[*] ========= Component information is as follows :===============")
            for json in comp_list:
-                print(json)
-
-        if len(permissions) != 0:
-            print(
-                "[*] ========= Sensitive permission information is as follows: ===============")
-            for permission in permissions:
-                print(permission)
+                logging.info(json)
        
-        if all_flag:
+        if cores.all_flag:
            value_list = []
            with open(txt_result_path,"a+",encoding='utf-8',errors='ignore') as f:
                for key,value in self.result_dict.items():
@ -140,13 +172,12 @@ class BaseTask(object):
                        value_list.append(result)
                        f.write("\t"+result+"\r")
                f.close()
-            print("[*] For more information about the search, see TXT file result: %s" %
-                  (txt_result_path))
+            logging.info("[>] For more information about the search, see TXT file result: {}".format(cores.txt_result_path))

-        if self.sniffer:
-            print("[*] For more information about the search, see XLSX file result: %s" %
-                  (xls_result_path))
+        if cores.net_sniffer_flag:
+            logging.info("[>] For more information about the search, see XLS file result: {}".format(cores.xls_result_path))

+    # 获取历史记录
    def __history_handle__(self):
        domain_history_path =  cores.domain_history_path
        app_history_path = cores.app_history_path
@ -157,8 +188,7 @@ class BaseTask(object):
                lines = f.readlines()
                app_size = len(lines)
                for line in  lines:
-                    self.app_history_list.append(
-                        line.replace("\r", "").replace("\n", ""))
+                   self.app_history_list.append(line.replace("\r","").replace("\n",""))

                f.close()

@ -174,3 +204,14 @@ class BaseTask(object):
                    if domain_count >= cout:
                        config.filter_no.append(".*" + domain)
                f.close()
+    
+    # 扫描指定后缀文件
+    def __scanner_specified_file__(self, base_dir, file_suffix=['dex','ipa','apk']):
+        files = os.listdir(base_dir)
+        for file in files:
+            dir_or_file_path = os.path.join(base_dir,file) 
+            if os.path.isdir(dir_or_file_path):
+                self.__scanner_specified_file__(dir_or_file_path,file_suffix)
+            else: 
+                if dir_or_file_path.split(".")[-1] in file_suffix:
+                    self.download_file_queue.put(dir_or_file_path)
--- a/libs/task/download_task.py
+++ b/libs/task/download_task.py
@ -7,42 +7,72 @@ import re
 import time
 import config
 import hashlib
+import logging
 from queue import Queue
 import libs.core as cores
 from libs.core.download import DownloadThreads

-
 class DownloadTask(object):
+    def __init__(self):
+        self.download_file_queue = Queue()
+        self.thread_list = []

    def start(self, path, types):
+        self.__local_or_remote__(path, types)
+
+        for threadID in range(1, cores.threads_num): 
+            name = "Thread - " + str(int(threadID))
+            thread = DownloadThreads(threadID,name,self.download_file_queue)
+            thread.start()
+            thread.join()     
+
+    # 判断文件是本地加载还是远程加载
+    def __local_or_remote__(self,path,types):
+        # 添加文件后缀判断
+        self.__update_type__(path)
+        # 处理本地文件
+        if not(path.startswith("http://") or path.startswith("https://")):
+            if not os.path.isdir(path): # 不是目录
+                return {"path":path,"type":types}
+            else: # 目录处理
+                return {"path":path,"type":types}
+        else:
+           self.__net_header__(path,types)
+            # self.download_file_queue.put(path)
+
+    # 处理网络请求
+    def __net_header__(self, path, types):
        create_time = time.strftime("%Y%m%d%H%M%S", time.localtime())
-        if path.endswith("apk"):
+        if path.endswith("apk") or types == "Android":
            types = "Android"
            file_name = create_time+ ".apk"
-        elif path.endswith("ipa"):
+        elif path.endswith("ipa") or types == "iOS":
            types = "iOS"
            file_name = create_time + ".ipa"
        else:
-            if types == "Android":
+            types = "WEB"
+            file_name = create_time + ".html"
+
+        logging.info("[*] Detected that the task is not local, preparing to download file......")
+        cache_path = os.path.join(cores.download_dir, file_name)
+        self.download_file_queue.put({"path":path, "cache_path":cache_path, "types":types})        
+        # thread = DownloadThreads(path,file_name,cache_path,types)
+        # thread.start()
+        # thread.join()
+        return {"path":cache_path,"type":types}
+    
+    def __update_type__(self, path, types, file_name=None):
+        create_time = time.strftime("%Y%m%d%H%M%S", time.localtime())
+        if path.endswith("apk") or types == "Android":
            types = "Android"
+            if not file_name:
                file_name = create_time+ ".apk"
-            elif types == "iOS":
+        elif path.endswith("ipa") or types == "iOS":
            types = "iOS"
+            if not file_name:
                file_name = create_time + ".ipa"
        else:
            types = "WEB"
+            if not file_name:
                file_name = create_time + ".html"
-        if not(path.startswith("http://") or path.startswith("https://")):
-            if not os.path.isdir(path):  # 不是目录
-                return {"path": path, "type": types}
-            else:  # 目录处理
-                return {"path": path, "type": types}
-        else:
-            print(
-                "[*] Detected that the task is not local, preparing to download file......")
-            cache_path = os.path.join(cores.download_path, file_name)
-            thread = DownloadThreads(path, file_name, cache_path, types)
-            thread.start()
-            thread.join()
-            print()
-            return {"path": cache_path, "type": types}
+        return types,file_name
--- a/libs/task/ios_task.py
+++ b/libs/task/ios_task.py
@ -3,71 +3,50 @@
 # Author: kelvinBen
 # Github: https://github.com/kelvinBen/AppInfoScanner
 import os
-import re
-import shutil
 import zipfile
 import binascii
 import platform
 import libs.core as cores
 from queue import Queue

-
 class iOSTask(object):
    elf_file_name = ""
-
    def __init__(self,path):
        self.path = path
        self.file_queue = Queue()
        self.shell_flag = False
        self.file_identifier= []
-        self.permissions = []

    def start(self):
        file_path = self.path
        if file_path.split(".")[-1] == 'ipa':
            self.__decode_ipa__(cores.output_path)
-            self.__scanner_file_by_ipa__(cores.output_path)
        elif self.__get_file_header__(file_path): 
            self.file_queue.put(file_path)
        else:
-            raise Exception(
-                "Retrieval of this file type is not supported. Select IPA file or Mach-o file.")
-        return {"shell_flag": self.shell_flag, "file_queue": self.file_queue, "comp_list": [], "packagename": None, "file_identifier": self.file_identifier, "permissions": self.permissions}
+            raise Exception("Retrieval of this file type is not supported. Select IPA file or Mach-o file.")
+        return {"shell_flag":self.shell_flag,"file_queue":self.file_queue,"comp_list":[],"packagename":None,"file_identifier":self.file_identifier}
                    
    def __get_file_header__(self,file_path):
-        hex_hand = 0x0
+        crypt_load_command_hex = "2C000000"
        macho_name =  os.path.split(file_path)[-1]
        self.file_identifier.append(macho_name)
        with open(file_path,"rb") as macho_file:
-            macho_file.seek(hex_hand, 0)
+            macho_file.seek(0x0,0)
            magic = binascii.hexlify(macho_file.read(4)).decode().upper()
            macho_magics =  ["CFFAEDFE","CEFAEDFE","BEBAFECA","CAFEBABE"]
            if magic in macho_magics:
-                self.__shell_test__(macho_file, hex_hand)
+                hex_str = binascii.hexlify(macho_file.read()).decode().upper()
+                if crypt_load_command_hex in hex_str:
+                    macho_file.seek(int(hex_str.index("2C000000")/2)+20,0)
+                    cryptid = binascii.hexlify(macho_file.read(4)).decode()
+                    if cryptid == "01000000":
+                        self.shell_flag = True
                macho_file.close()
                return True
            macho_file.close()
            return False

-    def __shell_test__(self, macho_file, hex_hand):
-        while True:
-            magic = binascii.hexlify(macho_file.read(4)).decode().upper()
-            if magic == "2C000000":
-                macho_file.seek(hex_hand, 0)
-                encryption_info_command = binascii.hexlify(
-                    macho_file.read(24)).decode()
-                cryptid = encryption_info_command[-8:len(
-                    encryption_info_command)]
-                if cryptid == "01000000":
-                    self.shell_flag = True
-                break
-            hex_hand = hex_hand + 4
-
-    def __scanner_file_by_ipa__(self, output):
-        scanner_file_suffix = ["plist", "js", "xml", "html"]
-        scanner_dir = os.path.join(output, "Payload")
-        self.__get_scanner_file__(scanner_dir, scanner_file_suffix)
-
    def __get_scanner_file__(self,scanner_dir,file_suffix):
        dir_or_files = os.listdir(scanner_dir)
        for dir_file in dir_or_files:
@ -89,50 +68,24 @@ class iOSTask(object):
                            self.file_queue.put(dir_file_path)

    def __decode_ipa__(self,output_path):
+        scanner_file_suffix = ["plist","js","xml","html"]
+        scanner_dir =  os.path.join(output_path,"Payload")
+
        with zipfile.ZipFile(self.path,"r") as zip_files:
            zip_file_names = zip_files.namelist()
-            zip_files.extract(zip_file_names[0], output_path)
+            for zip_file_name in zip_file_names:
                try:
-                new_zip_file = zip_file_names[0].encode(
-                    'cp437').decode('utf-8')
-            except UnicodeEncodeError:
-                new_zip_file = zip_file_names[0].encode(
-                    'utf-8').decode('utf-8')
-
-                old_zip_dir = self.__get_parse_dir__(
-                    output_path, zip_file_names[0])
-                new_zip_dir = self.__get_parse_dir__(output_path, new_zip_file)
-                os.rename(old_zip_dir, new_zip_dir)
-
-            for zip_file in zip_file_names:
-                old_ext_path = zip_files.extract(zip_file, output_path)
-                if not "Payload" in old_ext_path:
-                    continue
-                start = str(old_ext_path).index("Payload")
-                dir_path = old_ext_path[start:len(old_ext_path)]
-                old_ext_path = os.path.join(output_path, dir_path)
-                try:
-                    new_zip_file = zip_file.encode('cp437').decode('utf-8')
-                except UnicodeEncodeError:
-                    new_zip_file = zip_file.encode('utf-8').decode('utf-8')
-
-                new_ext_path = os.path.join(output_path, new_zip_file)
-
                    if platform.system() == "Windows":
-                    new_ext_path = new_ext_path.replace("/", "\\")
+                        new_file_name = zip_file_name.encode('cp437').decode('GBK')
+                    else:
+                        new_file_name = zip_file_name.encode('cp437').decode('utf-8')
+                except UnicodeEncodeError:
+                    new_file_name = zip_file_name.encode('utf-8').decode('utf-8')

-                if not os.path.exists(new_ext_path):
-                    dir_path = os.path.dirname(new_ext_path)
-                    if not os.path.exists(dir_path):
-                        os.makedirs(dir_path)
-                shutil.move(old_ext_path, new_ext_path)
-                # 当旧目录与新目录不一致时，删除旧的目录
-                if not (old_ext_path == new_ext_path) and os.path.exists(old_ext_path) and (".app" in old_ext_path):
-                    try:
-                        # mac发生权限问题的时候做处理
-                        os.remove(old_ext_path)
-                    except Exception:
-                        shutil.rmtree(old_ext_path)
+                new_ext_file_path = os.path.join(output_path,new_file_name)
+                ext_file_path  = zip_files.extract(zip_file_name,output_path)
+                os.rename(ext_file_path,new_ext_file_path)
+        self.__get_scanner_file__(scanner_dir,scanner_file_suffix)

    def __get_parse_dir__(self,output_path,file_path):
        start = file_path.index("Payload/")
--- a/libs/task/net_task.py
+++ b/libs/task/net_task.py
@ -2,30 +2,29 @@
 # -*- coding: utf-8 -*-
 # Author: kelvinBen
 # Github: https://github.com/kelvinBen/AppInfoScanner
-
-import openpyxl
 import config
 from queue import Queue
 import libs.core as cores
+from openpyxl import Workbook
 from libs.core.net import NetThreads

-
 class NetTask(object):
    value_list = []
    domain_list=[]
    
-    def __init__(self, result_dict, app_history_list, domain_history_list, file_identifier, threads):
+    def __init__(self,result_dict,app_history_list,domain_history_list,file_identifier):
        self.result_dict = result_dict
        self.app_history_list = app_history_list
+        self.domain_history_list = domain_history_list
        self.file_identifier = file_identifier
+        
        self.domain_queue = Queue()
-        self.threads = int(threads)
        self.thread_list = []
-        self.domain_history_list = domain_history_list
+

    def start(self):
        xls_result_path = cores.xls_result_path
-        workbook = openpyxl.Workbook()
+        workbook = Workbook()
        worksheet = self.__creating_excel_header__(workbook)
        
        self.__write_result_to_txt__()
@ -39,18 +38,14 @@ class NetTask(object):

    def __creating_excel_header__(self,workbook):
        worksheet = workbook.create_sheet("Result",0)
-        worksheet.cell(row=1, column=1, value="Number")
-        worksheet.cell(row=1, column=2, value="IP/URL")
-        worksheet.cell(row=1, column=3, value="Domain")
-        worksheet.cell(row=1, column=4, value="Status")
-        worksheet.cell(row=1, column=5, value="IP")
-        worksheet.cell(row=1, column=6, value="Server")
-        worksheet.cell(row=1, column=7, value="Title")
-        worksheet.cell(row=1, column=8, value="CDN")
-        worksheet.cell(row=1, column=9, value="Finger")
+        excel_headers = ["Number","IP/URL","Domain","Status","IP","Server","Title","CDN","Finger"] 
+        for head_cell in excel_headers:
+            column = excel_headers.index(head_cell) + 1
+            worksheet.cell(row=1, column=column).value = head_cell
        return worksheet
        
    def __write_result_to_txt__(self):
+        txt_result_path = cores.txt_result_path
        append_file_flag = True
        
        for key,value in self.result_dict.items():
@ -60,11 +55,11 @@ class NetTask(object):
                self.value_list.append(result)

                if (("http://" in result) or ("https://" in result)) and ("." in result):
+                    domain = result.replace("https://","").replace("http://","")
+                        
                    if "{" in result or "}" in result or "[" in result or "]" in result or "\\" in result or "!" in result or "," in result:
                        continue

-                    domain = result.replace(
-                        "https://", "").replace("http://", "")
                    if "/" in domain:
                        domain = domain[:domain.index("/")]
                        
@ -76,29 +71,25 @@ class NetTask(object):
                        
                    url_suffix = result[result.rindex(".")+1:].lower()
                    if not(cores.resource_flag and url_suffix in config.sniffer_filter):
-                        self.domain_queue.put(
-                            {"domain": domain, "url_ip": result})
+                        self.domain_queue.put({"domain":domain,"url_ip":result})
                        
                    for identifier in self.file_identifier:
                        if identifier in self.app_history_list:
                            if not(domain in self.domain_history_list): 
                                self.domain_list.append(domain)
-                                self.__write_content_in_file__(
-                                    cores.domain_history_path, domain)
+                                self.__write_content_in_file__(cores.domain_history_path,domain)
                            continue

                        if not(domain in self.domain_list):
                            self.domain_list.append(domain)
-                            self.__write_content_in_file__(
-                                cores.domain_history_path, domain)
+                            self.__write_content_in_file__(cores.domain_history_path,domain)

                        if append_file_flag:
-                            self.__write_content_in_file__(
-                                cores.app_history_path, identifier)
+                            self.__write_content_in_file__(cores.app_history_path,identifier)
                            append_file_flag = False

    def __start_threads__(self,worksheet):
-        for threadID in range(0, self.threads):
+        for threadID in range(0, cores.threads_num): 
            name = "Thread - " + str(threadID)
            thread =  NetThreads(threadID,name,self.domain_queue,worksheet)
            thread.start()
@ -108,3 +99,4 @@ class NetTask(object):
        with open(file_path,"a+",encoding='utf-8',errors='ignore') as f:
            f.write(content+"\r")
            f.close()
+
--- a/libs/task/web_task.py
+++ b/libs/task/web_task.py
@ -7,7 +7,6 @@ import config
 import hashlib
 from queue import Queue

-
 class WebTask(object):
    thread_list =[]
    value_list = []
@ -17,7 +16,6 @@ class WebTask(object):
        self.path = path
        self.file_queue = Queue()
        self.file_identifier = []
-        self.permissions = []

    def start(self):
        if len(config.web_file_suffix) <=0:
@ -31,7 +29,7 @@ class WebTask(object):
                err_info = ("Retrieval of this file type is not supported. Select a file or directory with a suffix of %s" % ",".join(scanner_file_suffix))
                raise Exception(err_info)
            self.file_queue.put(self.path)
-        return {"comp_list": [], "shell_flag": False, "file_queue": self.file_queue, "packagename": None, "file_identifier": self.file_identifier, "permissions": self.permissions}
+        return {"comp_list":[],"shell_flag":False,"file_queue":self.file_queue,"packagename":None,"file_identifier":self.file_identifier}

    def __get_scanner_file__(self,scanner_dir,file_suffix):
        dir_or_files = os.listdir(scanner_dir)
--- a/requirements.txt
+++ b/requirements.txt
@ -1,5 +1,5 @@
 requests
 click
+xlwt
+pillow
 openpyxl
-frida-tools==11.0.0
-frida-dexdump
--- a/tools/apktool.jar
+++ b/tools/apktool.jar
--- a/tools/unpacker/aapt.exe
+++ b/tools/unpacker/aapt.exe
--- a/tools/unpacker/adb.exe
+++ b/tools/unpacker/adb.exe
--- a/tools/unpacker/hexl-server-arm32
+++ b/tools/unpacker/hexl-server-arm32
--- a/tools/unpacker/hexl-server-arm64
+++ b/tools/unpacker/hexl-server-arm64
--- a/update.md
+++ b/update.md
@ -1,14 +1,15 @@
 ### V1.0.9
- 更新apktool为最新版本
- 优化部分环节流程
- 修复excle文件导出时超时行数限制
- 修复脚本执行时卡顿的问题
- 修复Mac下Playload文件权限不足的问题
+- 新增IPA批量操作
+- 优化iOS壳检测速度
+- 优化iPA文件解压效率
+- 优化日志输出
+- 修复内容过长无法输出到excle
+

 ### V1.0.8
- 添加AK和SK的检测
- 添加检测规则提交入口
- 添加.gitignore文件
+- 新增AK和SK的检测
+- 新增检测规则提交入口
+- 新增.gitignore文件
 - 优化txt结果集输出方式
 - 修复目录中包含空格无法解析的问题
 - 修复WEB页面或者目录扫描的问题
Author	SHA1	Message	Date
kelvinBen	479abe2e3b	1. 添加下载任务线程 2. 修改任务记录	3 years ago
kelvinBen	756025d7fd	忽略文件列表中添加xlsx文件	3 years ago
kelvinBen	4b3db5aff7	- 新增通过网络批量下载文件 - 新增TXT文件批量进行文件下载或者批量对IPA、APK文件进行处理 - 修改通过网络文件下载逻辑 - 修改文件下载时的文件命名逻辑 - 删除libs/task/download_task.py文件	3 years ago
kelvinBen	acc01c3303	- 优化excle文件输出 - 更新项目处理流程 - 添加批量处理操作	3 years ago
kelvinBen	1f0fa65606	- 优化iOS壳检测速度 - 优化iPA文件解压效率 - 优化日志输出	3 years ago