diff --git a/OAT.xml b/OAT.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ee1a40d329fef4b3489f90dc7d600ae8e73ddd51
--- /dev/null
+++ b/OAT.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2021 Huawei Device Co., Ltd.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+     
+     Notes:
+     This is project config file for OpenHarmony OSS Audit Tool, if you have any questions or concerns, please email chenyaxun@huawei.com.   
+--> 
+<!-- OAT(OSS Audit Tool) configuration guide:
+basedir: Root dir, the basedir + project path is the real source file location.
+licensefile: 
+1.If the project don't have "LICENSE" in root dir, please define all the license files in this project in , OAT will check license files according to this rule.
+
+tasklist(only for batch mode):
+1. task: Define oat check thread, each task will start a new thread.
+2. task name: Only an name, no practical effect.
+3. task policy: Default policy for projects under this task, this field is required and the specified policy must defined in policylist.
+4. task filter: Default filefilter for projects under this task, this field is required and the specified filefilter must defined in filefilterlist.
+5. task project: Projects to be checked, the path field define the source root dir of the project.
+
+
+policyList:
+1. policy: All policyitems will be merged to default OAT.xml rules, the name of policy doesn't affect OAT check process.
+2. policyitem: The fields type, name, path, desc is required, and the fields rule, group, filefilter is optional,the default value is:
+<policyitem type="" name="" path="" desc="" rule="may" group="defaultGroup" filefilter="defaultPolicyFilter"/>
+3. policyitem type: 
+    "compatibility" is used to check license compatibility in the specified path; 
+    "license" is used to check source license header in the specified path;
+    "copyright" is used to check source copyright header in the specified path;
+    "import" is used to check source dependency in the specified path, such as import ... ,include ...
+    "filetype" is used to check file type in the specified path, supported file types: archive, binary
+    "filename" is used to check whether the specified file exists in the specified path(support projectroot in default OAT.xml), supported file names: LICENSE, README, README.OpenSource
+
+4. policyitem name: This field is used for define the license, copyright, "*" means match all, the "!" prefix means could not match this value. For example, "!GPL" means can not use GPL license. 
+5. policyitem path: This field is used for define the source file scope to apply this policyitem, the "!" prefix means exclude the files. For example, "!.*/lib/.*" means files in lib dir will be exclude while process this policyitem.
+6. policyitem rule and group: These two fields are used together to merge policy results. "may" policyitems in the same group means any one in this group passed, the result will be passed.
+7. policyitem filefilter: Used to bind filefilter which define filter rules.
+8. filefilter: Filter rules, the type filename is used to filter file name, the type filepath is used to filter file path.
+
+Note:If the text contains special characters, please escape them according to the following rules:
+" == &gt;
+& == &gt;
+' == &gt;
+< == &gt;
+> == &gt;
+-->
+<configuration>
+    <oatconfig> 
+        <filefilterlist>
+            <filefilter name="binaryFileTypePolicyFilter" desc="Filters for binary file policies" >
+                <filteritem type="filepath" name="jar/hmos_app_packing_tool.jar" desc="the png file for packing pre-installed hap, the file is self-developed"/>
+                <filteritem type="filepath" name="jar/hmos_app_unpacking_tool.jar" desc="the png file for unpacking hap, the file is self-developed"/>
+            </filefilter>
+        </filefilterlist>
+    </oatconfig>
+</configuration>
\ No newline at end of file
diff --git a/README_zh.md b/README_zh.md
index b91aea9a5f1b7103b766eaeaa425d5b1b3e2ce3c..80b37400986033a7678a6e3d51114f3392c23ba4 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -1,12 +1,146 @@
 # 打包工具组件<a name="ZH-CH_TOPIC_0000001126664311"></a>
 
--   [简介](#section11660541593)
+-   [简介](#section_introduction)
+-   [目录](#section_directory)
+-   [约束](#section_constraints)
+-   [使用说明](#section_usage_instruction)
+-   [相关仓](#section_related_repo)
 
-## 简介<a name="section11660541593"></a>
+## 简介<a name="section_introduction"></a>
 
 本组件包含打包、拆包和包解析三个功能模块：
 
 -   打包模块有将资源文件打包成hap包，和将多个hap包打包成app包两种模式。
 -   拆包模块有从app包中拆出所有hap包，和从hap包中拆出json文件两种模式。
 
--   包解析模块可以根据对应解析模式，解析出指定设备类型下的hap包列表、hap包信息、签名信息等。
\ No newline at end of file
+-   包解析模块可以根据对应解析模式，解析出指定设备类型下的hap包列表、hap包信息、签名信息等。
+
+## 目录<a name="section_directory"></a>
+```
+/developtools/packing_tool
+     ├── adapter
+     │      ├── bundles                    # packing_tool工具的版本信息
+     │      └── ohos                       # packing_tool工具实现的核心代码
+     └── META-INF
+            ├── collectingbininfo_tool     # bin文件转成hap文件的外部依赖配置文件
+            ├── packingbin_tool            # hap文件转成bin文件的外部依赖配置文件
+            └── unpacking_tool             # 解析hap文件的外部依赖配置文件
+```
+
+## 约束<a name="section_constraints"></a>
+1.当打包的app包依赖hap包时，需要hap包打包执行完毕后，再执行app包的打包命令。可根据命令执行的返回值来控制。
+
+2.如果命令中多次出现同一个命令，则取其最后一次出现的值，如--mode hap --mode app，即mode值为app。
+
+3.如果同一命令中跟多个参数，则取距离其最近的值。如--mode hap app，mode值为hap。
+
+4.传入的参数路径不能以“--”开头，避免与指令冲突。
+
+5.指令必须是小写的，如：--mode，文件后缀不区分大小写。
+
+6.建议命令中传入绝对路径。
+
+7.打包完成后，res/下的文件会放到assets/entry/resources目录下。
+assets/目录下的文件将被放入assets/目录下。
+lib/下的文件将被放入libs/目录下。
+maple-so/下的文件将被放入maple/目录下。
+resource.index的文件将被放入assets/entry/目录下。
+
+## 使用说明<a name="section_usage_instruction"></a>
+打包hap包命令示例：
+```
+java -jar hmos_app_packing_tool.jar --mode <option> --json-path <option> --maple-so-path [option] --profile-path [option] --maple-so-dir [option] --dex-path [option] --lib-path [option] --resources-path [option] --shell-apk-path [option] --index-path [option] --out-path <option> --force [option]
+```
+参数含义及规范:
+
+| 参数 | 是否必选 | 描述 |
+|  ----  | ----  | ---- |
+|--mode|是|打包类型（hap）|
+|--json-path|是|.json文件路径，文件名必须为config.json。|
+|--profile-path|否|CAPABILITY.profile文件路径|
+|--maple-so-dir|否|maple so目录输入路径|
+|--dex-path|否|1.dex文件路径，文件名必须以.dex为后缀。如果是多个dex需要用“,”分隔<br>2.dex文件路径也可以为目录|
+|--lib-path|否|lib库文件路径|
+|--resources-path|否|resources资源包路径|
+|--shell-apk-path|否|1.shell apk文件路径，文件名必须以.apk为后缀。如果是多个apk需要用“,”分隔<br>2.shell apk文件路径也可以为目录|
+|--index-path|否|.index文件路径，文件名必须为resources.index|
+|--out-path|是|目标文件路径，文件名必须以.hap为后缀|
+|--force|否|默认值为false，如果为true,表示当目标文件存在时，强制删除|
+|--file-path|否|可指定目标文件夹，将其打入hap包内|
+
+打包har包命令示例：
+```
+java -jar hmos_app_packing_tool.jar --mode <options> --json-path <option> --jar-path <option> --lib-path [option] --resources-path [option] --out-path <option> --force [option]
+```
+参数含义及规范:
+
+| 参数 | 是否必选 | 描述 |
+| ---- | ---- | ---- |
+|--mode|是|打包类型（har）|
+|--json-path|是|.json文件路径，文件名必须为config.json|
+|--jar-path|否|1.jar文件路径，文件名必须以.jar为后缀。如果是多个jar需要用“，”分隔<br>2.jar文件路径也可以为目录|
+|--lib-path|否|lib库文件路径|
+|--res-path|否|resource资源包路径|
+|--out-path|是|目标文件路径，文件名必须以.hap为后缀|
+|--force|否|默认值为false，如果为true,表示当目标文件存在时，强制删除|
+
+打包app包命令示例：
+```
+java -jar hmos_app_packing_tool.jar --mode <options> --hap-path <option> --out-path [option] --signature-path [option] --certificate-path [option] --pack-info-path <option> --force [option]
+```
+参数含义及规范:
+
+| 参数 | 是否必选 | 描述 |
+|  ----  | ----  | ---- |
+|--mode|是|打包类型（app）|
+|--hap-path|是|1.hap包文件路径，文件名必须以.hap为后缀。如果是多个hap包需要用“，”分隔<br>2.hap文件路径也可以是目录|
+|--pack-info-path|是|文件名必须为pack.info|
+|--out-path|是|目标文件路径，文件名必须以.app为后缀|
+|--signature-path|否|签名路径|
+|--certificate-path|否|证书路径|
+|--force|否|默认值为false，如果为true,表示当目标文件存在时，强制删除|
+
+拆hap包命令示例：
+```
+java -jar hmos_app_unpacking_tool.jar --mode <options> --hap-path <option> --out-path [option] --force [option] --unpackapk [option]
+```
+参数含义及规范:
+
+| 参数 | 是否必选 | 描述 |
+|  ----  | ----  | ---- |
+|--mode|是|拆包类型（hap）|
+|--hap-path|是|hap包路径|
+|--out-path|是|拆包目标文件路径|
+|--force|否|默认值为false，如果为true,表示当目标文件存在时，强制删除|
+|--unpackapk|否|默认值为false，如果为true,表示拆包时，将apk解压出来|
+
+拆har包命令示例：
+```
+java -jar hmos_app_unpacking_tool.jar --mode <options> --har-path <option> --out-path [option] --force [option]
+```
+参数含义及规范:
+
+| 参数 | 是否必选 | 描述 |
+|  ----  | ----  | ---- |
+|--mode|是|拆包类型（har）|
+|--har-path|是|har包路径|
+|--out-path|是|拆包目标文件路径|
+|--force|否|默认值为false，如果为true,表示当目标文件存在时，强制删除|
+
+拆app包命令示例：
+```
+java -jar hmos_app_unpacking_tool.jar --mode <options> --app-path <option> --out-path [option] --force [option] --unpackapk [option]
+```
+参数含义及规范:
+
+| 参数 | 是否必选 | 描述 |
+|  ----  | ----  | ---- |
+|--mode|是|拆包类型（app）|
+|--app-path|是|app包路径|
+|--out-path|是|拆包目标文件路径|
+|--force|否|默认值为false，如果为true,表示当目标文件存在时，强制删除|
+|--unpackapk|否|默认值为false，如果为true,表示拆包时，将apk解压出来|
+
+## 相关仓<a name="section_related_repo"></a>
+
+[用户程序框架子系统](https://gitee.com/openharmony/docs/blob/master/zh-cn/readme/%E7%94%A8%E6%88%B7%E7%A8%8B%E5%BA%8F%E6%A1%86%E6%9E%B6%E5%AD%90%E7%B3%BB%E7%BB%9F.md)
\ No newline at end of file
diff --git a/adapter/bundles/packing_tool/readme.md b/adapter/bundles/packing_tool/readme.md
deleted file mode 100644
index e5a27079ce42e53a7b64b60d024b37a55cddafd9..0000000000000000000000000000000000000000
--- a/adapter/bundles/packing_tool/readme.md
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (c) 2019-2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use commands for package hap or app.
-
-CONSTRAINT:
-1.When the app depends on a hap, you need to wait the hap has been packaged,
-  It can be controlled according to the return value of the command execution.
-2.If the same command appears many times in a command, take the last value that appears.
-  For example: --mode hap --mode app
-  the mode value is app.
-3.If there are several parameters in the same command, take the first value.
-  For example: --mode hap app
-  the mode value is hap.
-4.Path cannot start with '--', to avoid conflict with the instruction.
-5.Command must be lowercase(such as:--mode), and file's suffix is case insensitive,
-  but json's filename must be config.json and index's filename must be resources.index.
-6.Absolute paths is recommended.
-7.After package a hap, files under resources/ will put into assets/entry/resources/ directory,
-  files under lib/ will be putted into libs/ directory,
-  files under maple-so/ will be putted into maple/ directory,
-  file of resources.index will be putted into assets/entry/ directory.
-8.maple so input method have a tentative plan which can support two input methods.
-  If "maple-so-path" is valid, "maple-so-dir" will not be used.
-  The input method of "maple-so-path" will be discarded later.
-9.In app package mode, signature and certificate may be resource files later,
-  so parameters are reserved now.
-
-HAP USAGE:
-java -jar hmos_app_packing_tool.jar --mode <option> --json-path <option> --maple-so-path [option]
---profile-path [option] --maple-so-dir [option] --dex-path [option] --lib-path [option] --resources-path [option]
---shell-apk-path [option] --index-path [option] --out-path <option> --force [option]
-
-HAP MODE OPTIONS:
-  --mode               not null  must be hap.
-  --json-path          not null  config.json path.
-  --profile-path                 CAPABILITY.profile path.
-  --maple-so-path                maple-so/ path.
-  --maple-so-dir                 maple so path must end with .so, if has more than one so,
-                                 use comma(,) to separate.
-  --dex-path                     1.dex path must end with .dex, if has more than one dex,
-                                 use comma(,) to separate.
-                                 2.dex path also can be directory path.
-  --abc-path                     1.abc path must end with .abc, if has more than one abc,
-                                 use comma(,) to separate.
-                                 2.abc path also can be directory path.
-  --lib-path                     lib/ path.
-  --resources-path               resources/ path.
-  --shell-apk-path               1.shell apk path can end with .apk, if has more than one apk,
-                                 use comma(,) to separate.
-                                 2.shell apk path also can be directory path.
-  --index-path                   resources.index path.
-  --out-path           not null  target hap binary path,must end with .hap.
-  --force                        default false; if true, force delete destination
-                                 out file if exists.
-
-HAR USAGE:
-java -jar hmos_app_packing_tool.jar --mode <options> --json-path <option>
---jar-path <option> --lib-path [option] --resources-path [option]
---out-path <option> --force [option]
-OPTIONS:
-  --mode               not null  must be har.
-  --json-path          not null  config.json path.
-  --jar-path           not null  1.jar path must end with .jar,
-                                 if has more than one jar, use comma(,) to separate;
-                                 2.jar path also can be directory path.
-  --lib-path                     lib/ path.
-  --resources-path     not null  resources/ path.
-  --txt-path           not null  1.txt path must end with .txt,
-                                 if has more than one txt, use comma(,) to separate;
-                                 2.txt path also can be directory path.
-  --out-path           not null  target har binary path, must end with .har.
-  --force                        default false; if true, force delete destination
-                                 out file if exists.
-
-APP USAGE:
-java -jar hmos_app_packing_tool.jar --mode <option> --hap-path <option> --out-path <option>
---pack-info-path <option> --signature-path [option] --certificate-path [option] --force [option]
-
-APP MODE OPTIONS:
-  --mode               not null  must be app.
-  --hap-path           not null  1.hap path can end with .hap, if has more than one hap,
-                                 use comma(,) to separate.
-                                 2.hap path also can be directory path.
-  --pack-info-path     not null  pack.info path.
-  --out-path           not null  target app binary path,must end with .app.
-  --force                        default false; if true, force delete destination
-                                 out file if exists.
-  --signature-path               signature file path.
-  --certificate-path             certificate file path.
-
-RETURN VALUE:
-In both modes, if package success return 0, fail return 1.
-
-EXAMPLES:
-package module1.hap
- java -jar hmos_app_packing_tool.jar --mode hap --json-path example/config.json
- --index-path example/resources.index --maple-so-path example/maple-so
- --dex-path example/test1.dex,example/test2.dex --shell-apk-path example/test1.apk,example/test2.apk
- --resources-path example/resources/ --lib-path example/lib/ --out-path example/out/module1.hap --force true
-
- example/out/module1.hap
- |   config.json,test1.dex,test2.dex,test1.apk,test2.apk
- |----libs
- |   |   test1.xml
- |   |----lib
- |   |   |   test2.xml
- |----assets
- |   |----entry
- |   |   |   resources.index
- |   |   |----resources
- |   |   |   |   test3.xml
- |----maple
- |   |----arm64
- |   |   |   test1.so,test2.so
-
-package module2.hap
- java -jar hmos_app_packing_tool.jar --mode hap --json-path example/config.json
- --out-path example/out/module2.hap --force true
-
- example/out/module2.hap
- |   config.json
-
-package demo.app
- java -jar hmos_app_packing_tool.jar --mode app --hap-path example/out/module1.hap,example/out/module2.hap
- --signature-path example/signature --certificate-path example/certificate
- --pack-info-path example/pack.info --out-path example/out/demo.app --force true
-
- example/out/demo.app
- |   module1.hap
- |   module2.hap
- |   pack.info
- |   signature
- |   certificate
-
-
------------------------------------------------------------------------------------------------
-
-use commands for unpackage hap or app.
-
-CONSTRANIT:
-1.When the hap depends on a app, you need to wait the app has been unpackaged,
-  It can be controlled according to the return value of the command execution.
-2.If the same command appears many times in a command, take the last value that appears.
-  For example: --mode hap --mode app
-  the mode value is app.
-3.If there are several parameters in the same command, take the first value.
-  For example: --mode hap app
-  the mode value is hap.
-4.Path cannot start with '--', to avoid conflict with the instruction.
-5.Command must be lowercase(such as:--mode), and file's suffix is case insensitive.
-6.Absolute paths is recommended.
-7.Output path can be specified. The default output path is the path where the app or hap is located.
-8.After unpackage a hap, json file will be unzipped to the output path.
-  And after unpackage an app, all hap file will be unzipped to the output path.
-
-HAP USAGE:
-java -jar hmos_app_unpacking_tool.jar --mode <options> --hap-path <option>
---out-path [option] --force [option] --unpackapk [option]
-
-HAP MODE OPTIONS:
-  --mode               not null  must be hap.
-  --hap-path           not null  hap path.
-  --out-path                     target hap unpackage path.
-  --force                        default false; if true, force delete destination
-                                 out file if exists.
-  --unpack-cut_entry             default false; if true, unpack the cut_entry.apk
-HAR USAGE:
-java -jar hmos_app_unpacking_tool.jar --mode <options> --har-path <option>
---out-path [option] --force [option]
-OPTIONS:
-  --mode               not null  must be har.
-  --har-path           not null  har path.
-  --out-path           not null  target path of unzip.
-  --force                        default false; if true, force delete destination
-                                 out file if exists.
-
-APP USAGE:
-java -jar hmos_app_unpacking_tool.jar --mode <options> --app-path <option>
---out-path [option] --force [option] --unpackapk [option]
-
-APP MODE OPTIONS:
-  --mode               not null  must be app.
-  --app-path           not null  app path.
-  --out-path                     target app unpackage path.
-  --force                        default false; if true, force delete destination
-                                 out file if exists.
-  --unpackapk                    default false; if true, unpack apk files from hap
-                                 in the app.
-
-RETURN VALUE:
-In both modes, if unpackage successfully return 0, fail return 1.
-
-EXAMPLES:
-unpackage demo.app
- java -jar hmos_app_unpacking_tool.jar --mode app --app-path example/demo.app
- --out-path example/out/ --force true
-
-unpackage test1.hap
- java -jar hmos_app_unpacking_tool.jar --mode hap --hap-path example/out/module1.hap
- --out-path example/out/TEST --force true
-
-unpackage test2.hap
- java -jar hmos_app_unpacking_tool.jar --mode hap --hap-path example/out/module2.hap --force true
-
- example/out
- |   module1.hap
- |   module2.hap
- |----TEST
- |   |   config.json
- |----module2
- |   |   config.json
diff --git a/adapter/ohos/ResourcesParser.java b/adapter/ohos/ResourcesParser.java
index c6bc332a0811009ad7bf2d5d09aa97adbafe7443..899dc9cb171c0ff57a940d4e3be1b9caee9e3eed 100644
--- a/adapter/ohos/ResourcesParser.java
+++ b/adapter/ohos/ResourcesParser.java
@@ -283,11 +283,11 @@ public class ResourcesParser {
         item.size = buf.getInt();
         item.type = buf.getInt();
         item.id = buf.getInt();
-        int len = buf.get() | (buf.get() << BUF_MOVE_LENGTH);
+        int len = buf.getShort();
         byte[] value = new byte[len];
         buf.get(value);
         item.value = new String(value, StandardCharsets.UTF_8);
-        len = buf.get() | (buf.get() << BUF_MOVE_LENGTH);
+        len = buf.getShort();
         byte[] name = new byte[len];
         buf.get(name);
         item.name = new String(name, StandardCharsets.UTF_8);