You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by go...@apache.org on 2021/07/06 08:20:34 UTC
[incubator-inlong-website] branch master updated: [INLONG-652]
Refresh the docs based on the latest implementation (#74)
This is an automated email from the ASF dual-hosted git repository.
gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong-website.git
The following commit(s) were added to refs/heads/master by this push:
new 43e169e [INLONG-652] Refresh the docs based on the latest implementation (#74)
43e169e is described below
commit 43e169e8fab27592d33ab24fd1ccea2909aba81d
Author: gosonzhang <go...@apache.org>
AuthorDate: Tue Jul 6 16:20:18 2021 +0800
[INLONG-652] Refresh the docs based on the latest implementation (#74)
---
docs/en-us/console/develop.md | 39 +++++
docs/en-us/contact.md | 12 +-
.../en-us/development/how-to-become-a-committer.md | 24 +--
docs/en-us/development/how-to-commit.md | 46 +++---
docs/en-us/development/how-to-contribute.md | 28 ++--
docs/en-us/development/how-to-release.md | 158 +++++++++----------
docs/en-us/development/how-to-subscribe.md | 12 +-
docs/en-us/development/how-to-use-jira.md | 16 +-
docs/en-us/development/how-to-verify.md | 26 +--
.../development/how-to-vote-a-committer-ppmc.md | 24 +--
docs/en-us/download/download.md | 4 +-
docs/en-us/download/release-0.3.0.md | 94 +++++------
docs/en-us/download/release-0.5.0.md | 174 ++++++++++-----------
docs/en-us/download/release-0.6.0.md | 46 +++---
docs/en-us/download/release-0.7.0.md | 62 ++++----
docs/en-us/download/release-0.8.0.md | 150 +++++++++---------
docs/en-us/getting_started.md | 42 +++++
.../img/client_rpc/rpc_event_proto_status.png | Bin 58890 -> 0 bytes
docs/en-us/img/client_rpc/rpc_header_fill.png | Bin 105378 -> 0 bytes
docs/en-us/img/configure/conf_ini_pos.png | Bin 28135 -> 0 bytes
docs/en-us/img/configure/conf_velocity_pos.png | Bin 29291 -> 0 bytes
docs/en-us/img/store_file.png | Bin 12909 -> 0 bytes
docs/en-us/img/sysdeployment/sys_address_host.png | Bin 2680 -> 0 bytes
.../img/sysdeployment/sys_broker_configure.png | Bin 79006 -> 0 bytes
docs/en-us/img/sysdeployment/sys_broker_deploy.png | Bin 24795 -> 0 bytes
.../img/sysdeployment/sys_broker_finished.png | Bin 28322 -> 0 bytes
docs/en-us/img/sysdeployment/sys_broker_online.png | Bin 51242 -> 0 bytes
.../img/sysdeployment/sys_broker_online_2.png | Bin 70254 -> 0 bytes
.../img/sysdeployment/sys_broker_restart_1.png | Bin 57611 -> 0 bytes
.../img/sysdeployment/sys_broker_restart_2.png | Bin 39300 -> 0 bytes
docs/en-us/img/sysdeployment/sys_broker_start.png | Bin 42401 -> 0 bytes
.../img/sysdeployment/sys_broker_start_error.png | Bin 44803 -> 0 bytes
docs/en-us/img/sysdeployment/sys_compile.png | Bin 20769 -> 0 bytes
docs/en-us/img/sysdeployment/sys_configure_1.png | Bin 118517 -> 0 bytes
docs/en-us/img/sysdeployment/sys_configure_2.png | Bin 119196 -> 0 bytes
.../en-us/img/sysdeployment/sys_master_console.png | Bin 35650 -> 0 bytes
docs/en-us/img/sysdeployment/sys_master_start.png | Bin 14518 -> 0 bytes
.../img/sysdeployment/sys_master_startted.png | Bin 80150 -> 0 bytes
docs/en-us/img/sysdeployment/sys_node_log.png | Bin 14459 -> 0 bytes
docs/en-us/img/sysdeployment/sys_node_status.png | Bin 43265 -> 0 bytes
docs/en-us/img/sysdeployment/sys_node_status_2.png | Bin 66143 -> 0 bytes
docs/en-us/img/sysdeployment/sys_package.png | Bin 50859 -> 0 bytes
docs/en-us/img/sysdeployment/sys_package_list.png | Bin 19751 -> 0 bytes
docs/en-us/img/sysdeployment/sys_topic_create.png | Bin 36741 -> 0 bytes
docs/en-us/img/sysdeployment/sys_topic_deploy.png | Bin 42781 -> 0 bytes
docs/en-us/img/sysdeployment/sys_topic_error.png | Bin 35513 -> 0 bytes
.../en-us/img/sysdeployment/sys_topic_finished.png | Bin 49208 -> 0 bytes
docs/en-us/img/sysdeployment/sys_topic_select.png | Bin 26349 -> 0 bytes
docs/en-us/modules/agent/architecture.md | 42 +++++
docs/en-us/modules/agent/quick_start.md | 124 +++++++++++++++
docs/en-us/modules/console/quick_start.md | 41 +++++
docs/en-us/modules/dataproxy-sdk/architecture.md | 57 +++++++
docs/en-us/modules/dataproxy-sdk/quick_start.md | 9 ++
docs/en-us/modules/dataproxy/architecture.md | 11 ++
docs/en-us/modules/dataproxy/quick_start.md | 40 +++++
docs/en-us/modules/manager/architecture.md | 33 ++++
docs/en-us/modules/manager/img/datamodel.jpg | Bin 0 -> 88671 bytes
docs/en-us/modules/manager/img/inlong-manager.png | Bin 0 -> 73086 bytes
docs/en-us/modules/manager/img/interactive.jpg | Bin 0 -> 67852 bytes
docs/en-us/modules/manager/quick_start.md | 116 ++++++++++++++
docs/en-us/modules/sort/img.png | Bin 0 -> 10583 bytes
docs/en-us/modules/sort/introduction.md | 36 +++++
docs/en-us/modules/sort/protocol_introduction.md | 23 +++
docs/en-us/modules/sort/quick_start.md | 81 ++++++++++
.../http_access_api_definition_cn.xls | Bin 200704 -> 200704 bytes
docs/en-us/{ => modules/tubemq}/architecture.md | 11 +-
docs/en-us/{ => modules/tubemq}/client_rpc.md | 4 +-
docs/en-us/{ => modules/tubemq}/clients_java.md | 11 +-
.../{ => modules/tubemq}/configure_introduction.md | 7 +-
.../{ => modules/tubemq}/console_introduction.md | 2 +-
.../en-us/{ => modules/tubemq}/consumer_example.md | 12 +-
docs/en-us/{ => modules/tubemq}/deployment.md | 42 ++---
docs/en-us/{ => modules/tubemq}/error_code.md | 2 +-
docs/en-us/{ => modules/tubemq}/http_access_api.md | 2 +-
docs/en-us/{ => modules/tubemq}/img/.gitkeep | 0
.../tubemq}/img/client_rpc/rpc_broker_info.png | Bin
.../tubemq}/img/client_rpc/rpc_bytes_def.png | Bin
.../tubemq}/img/client_rpc/rpc_conn_detail.png | Bin
.../img/client_rpc/rpc_consumer_diagram.png | Bin
.../img/client_rpc/rpc_convert_topicinfo.png | Bin
.../tubemq}/img/client_rpc/rpc_event_proto.png | Bin
.../img/client_rpc/rpc_event_proto_optype.png | Bin
.../img/client_rpc/rpc_event_proto_status.png | Bin 0 -> 93691 bytes
.../tubemq/img/client_rpc/rpc_header_fill.png | Bin 0 -> 156495 bytes
.../tubemq}/img/client_rpc/rpc_inner_structure.png | Bin
.../img/client_rpc/rpc_master_authorizedinfo.png | Bin
.../tubemq}/img/client_rpc/rpc_message_data.png | Bin
.../tubemq}/img/client_rpc/rpc_pbmsg_structure.png | Bin
.../img/client_rpc/rpc_producer_close2M.png | Bin
.../img/client_rpc/rpc_producer_diagram.png | Bin
.../img/client_rpc/rpc_producer_heartbeat2M.png | Bin
.../img/client_rpc/rpc_producer_register2M.png | Bin
.../img/client_rpc/rpc_producer_sendmsg2B.png | Bin
.../tubemq}/img/client_rpc/rpc_proto_def.png | Bin
.../modules/tubemq/img/configure/conf_ini_pos.png | Bin 0 -> 26192 bytes
.../tubemq/img/configure/conf_velocity_pos.png | Bin 0 -> 21544 bytes
.../modules/tubemq}/img/console/1568169770714.png | Bin
.../modules/tubemq}/img/console/1568169796122.png | Bin
.../modules/tubemq}/img/console/1568169806810.png | Bin
.../modules/tubemq}/img/console/1568169823675.png | Bin
.../modules/tubemq}/img/console/1568169839931.png | Bin
.../modules/tubemq}/img/console/1568169851085.png | Bin
.../modules/tubemq}/img/console/1568169863402.png | Bin
.../modules/tubemq}/img/console/1568169879529.png | Bin
.../modules/tubemq}/img/console/1568169889594.png | Bin
.../modules/tubemq}/img/console/1568169900634.png | Bin
.../modules/tubemq}/img/console/1568169908522.png | Bin
.../modules/tubemq}/img/console/1568169916091.png | Bin
.../modules/tubemq}/img/console/1568169925657.png | Bin
.../modules/tubemq}/img/console/1568169946683.png | Bin
.../modules/tubemq}/img/console/1568169954746.png | Bin
.../img/development/create_pull_request.png | Bin
.../img/development/github_fork_repository.png | Bin
.../tubemq}/img/development/jira_create_issue.png | Bin
.../tubemq}/img/development/jira_filter.png | Bin
.../img/development/jira_resolve_issue_1.png | Bin
.../img/development/jira_resolve_issue_2.png | Bin
.../tubemq}/img/development/new_pull_request.png | Bin
.../modules/tubemq}/img/mqs_comare.png | Bin
.../modules/tubemq}/img/perf_appendix_1_bx1_1.png | Bin
.../modules/tubemq}/img/perf_appendix_1_bx1_2.png | Bin
.../modules/tubemq}/img/perf_appendix_1_bx1_3.png | Bin
.../modules/tubemq}/img/perf_appendix_1_bx1_4.png | Bin
.../modules/tubemq}/img/perf_appendix_1_cg1_1.png | Bin
.../modules/tubemq}/img/perf_appendix_1_cg1_2.png | Bin
.../modules/tubemq}/img/perf_appendix_1_cg1_3.png | Bin
.../modules/tubemq}/img/perf_appendix_1_cg1_4.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_1.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_2.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_3.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_4.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_5.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_6.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_7.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_8.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_9.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_1.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_2.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_3.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_4.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_5.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_6.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_7.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_8.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_9.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_1.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_2.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_3.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_4.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_5.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_6.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_7.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_8.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_9.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_1.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_2.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_3.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_4.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_5.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_6.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_7.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_8.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_9.png | Bin
.../modules/tubemq}/img/perf_scenario_1.png | Bin
.../modules/tubemq}/img/perf_scenario_1_index.png | Bin
.../modules/tubemq}/img/perf_scenario_2.png | Bin
.../modules/tubemq}/img/perf_scenario_2_index.png | Bin
.../modules/tubemq}/img/perf_scenario_3.png | Bin
.../modules/tubemq}/img/perf_scenario_3_index.png | Bin
.../modules/tubemq}/img/perf_scenario_4_index.png | Bin
.../modules/tubemq}/img/perf_scenario_6_index.png | Bin
.../modules/tubemq}/img/perf_scenario_7.png | Bin
.../modules/tubemq}/img/perf_scenario_8.png | Bin
.../modules/tubemq}/img/perf_scenario_8_index.png | Bin
.../modules/tubemq}/img/perf_scheme.png | Bin
docs/en-us/modules/tubemq/img/store_file.png | Bin 0 -> 23316 bytes
.../modules/tubemq}/img/store_mem.png | Bin
.../modules/tubemq}/img/sys_structure.png | Bin
.../tubemq/img/sysdeployment/sys_address_host.png | Bin 0 -> 3690 bytes
.../img/sysdeployment/sys_broker_configure.png | Bin 0 -> 59822 bytes
.../tubemq/img/sysdeployment/sys_broker_deploy.png | Bin 0 -> 46767 bytes
.../img/sysdeployment/sys_broker_finished.png | Bin 0 -> 46756 bytes
.../tubemq/img/sysdeployment/sys_broker_online.png | Bin 0 -> 44770 bytes
.../img/sysdeployment/sys_broker_online_2.png | Bin 0 -> 62302 bytes
.../img/sysdeployment/sys_broker_restart_1.png | Bin 0 -> 19355 bytes
.../img/sysdeployment/sys_broker_restart_2.png | Bin 0 -> 86408 bytes
.../tubemq/img/sysdeployment/sys_broker_start.png | Bin 0 -> 42862 bytes
.../img/sysdeployment/sys_broker_start_error.png | Bin 0 -> 56744 bytes
.../tubemq/img/sysdeployment/sys_compile.png | Bin 0 -> 23543 bytes
.../tubemq/img/sysdeployment/sys_configure_1.png | Bin 0 -> 188535 bytes
.../tubemq/img/sysdeployment/sys_configure_2.png | Bin 0 -> 193819 bytes
.../img/sysdeployment/sys_master_console.png | Bin 0 -> 35541 bytes
.../tubemq/img/sysdeployment/sys_master_start.png | Bin 0 -> 35457 bytes
.../img/sysdeployment/sys_master_startted.png | Bin 0 -> 99107 bytes
.../tubemq/img/sysdeployment/sys_node_log.png | Bin 0 -> 20891 bytes
.../tubemq/img/sysdeployment/sys_node_status.png | Bin 0 -> 71771 bytes
.../tubemq/img/sysdeployment/sys_node_status_2.png | Bin 0 -> 123306 bytes
.../tubemq/img/sysdeployment/sys_package.png | Bin 0 -> 69467 bytes
.../tubemq/img/sysdeployment/sys_package_list.png | Bin 0 -> 44553 bytes
.../tubemq/img/sysdeployment/sys_topic_create.png | Bin 0 -> 50660 bytes
.../tubemq/img/sysdeployment/sys_topic_deploy.png | Bin 0 -> 46372 bytes
.../tubemq/img/sysdeployment/sys_topic_error.png | Bin 0 -> 151646 bytes
.../img/sysdeployment/sys_topic_finished.png | Bin 0 -> 46354 bytes
.../tubemq/img/sysdeployment/sys_topic_select.png | Bin 0 -> 54280 bytes
.../tubemq/img/sysdeployment/test_sendmessage.png | Bin 0 -> 52958 bytes
.../img/sysdeployment/test_sendmessage_2.png | Bin 0 -> 98658 bytes
.../modules/tubemq}/img/test_scheme.png | Bin
.../modules/tubemq}/img/test_summary.png | Bin
.../modules/tubemq}/img/tubemq-add-broker-1.png | Bin
.../modules/tubemq}/img/tubemq-add-broker-2.png | Bin
.../modules/tubemq}/img/tubemq-add-broker-3.png | Bin
.../modules/tubemq}/img/tubemq-add-topic-1.png | Bin
.../modules/tubemq}/img/tubemq-add-topic-2.png | Bin
.../modules/tubemq}/img/tubemq-add-topic-3.png | Bin
.../modules/tubemq}/img/tubemq-add-topic-4.png | Bin
.../modules/tubemq}/img/tubemq-add-topic-5.png | Bin
.../modules/tubemq}/img/tubemq-add-topic-6.png | Bin
.../modules/tubemq}/img/tubemq-console-gui.png | Bin
.../modules/tubemq/img/tubemq-consume-message.png | Bin 0 -> 89770 bytes
.../modules/tubemq/img/tubemq-send-message.png | Bin 0 -> 69960 bytes
.../en-us/{ => modules/tubemq}/producer_example.md | 2 +-
docs/en-us/{ => modules/tubemq}/quick_start.md | 55 +++----
.../modules/tubemq/tubemq-manager/quick_start.md | 131 ++++++++++++++++
.../tubemq}/tubemq_perf_test_vs_Kafka_cn.md | 0
docs/zh-cn/contact.md | 9 +-
.../zh-cn/development/how-to-become-a-committer.md | 24 +--
docs/zh-cn/development/how-to-commit.md | 46 +++---
docs/zh-cn/development/how-to-contribute.md | 38 ++---
docs/zh-cn/development/how-to-release.md | 158 +++++++++----------
docs/zh-cn/development/how-to-subscribe.md | 14 +-
docs/zh-cn/development/how-to-use-jira.md | 16 +-
docs/zh-cn/development/how-to-verify.md | 26 +--
.../development/how-to-vote-a-committer-ppmc.md | 24 +--
docs/zh-cn/download/download.md | 7 +-
docs/zh-cn/download/release-0.3.0.md | 94 +++++------
docs/zh-cn/download/release-0.5.0.md | 174 ++++++++++-----------
docs/zh-cn/download/release-0.6.0.md | 44 +++---
docs/zh-cn/download/release-0.7.0.md | 63 ++++----
docs/zh-cn/download/release-0.8.0.md | 150 +++++++++---------
docs/zh-cn/getting_started.md | 43 +++++
.../img/client_rpc/rpc_event_proto_status.png | Bin 58890 -> 0 bytes
docs/zh-cn/img/client_rpc/rpc_header_fill.png | Bin 105378 -> 0 bytes
docs/zh-cn/img/configure/conf_ini_pos.png | Bin 28135 -> 0 bytes
docs/zh-cn/img/configure/conf_velocity_pos.png | Bin 29291 -> 0 bytes
docs/zh-cn/img/store_file.png | Bin 12909 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_address_host.png | Bin 2680 -> 0 bytes
.../img/sysdeployment/sys_broker_configure.png | Bin 79006 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_broker_deploy.png | Bin 24795 -> 0 bytes
.../img/sysdeployment/sys_broker_finished.png | Bin 28322 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_broker_online.png | Bin 51242 -> 0 bytes
.../img/sysdeployment/sys_broker_online_2.png | Bin 70254 -> 0 bytes
.../img/sysdeployment/sys_broker_restart_1.png | Bin 57611 -> 0 bytes
.../img/sysdeployment/sys_broker_restart_2.png | Bin 39300 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_broker_start.png | Bin 42401 -> 0 bytes
.../img/sysdeployment/sys_broker_start_error.png | Bin 44803 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_compile.png | Bin 20769 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_configure_1.png | Bin 118517 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_configure_2.png | Bin 119196 -> 0 bytes
.../zh-cn/img/sysdeployment/sys_master_console.png | Bin 35650 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_master_start.png | Bin 14518 -> 0 bytes
.../img/sysdeployment/sys_master_startted.png | Bin 80150 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_node_log.png | Bin 14459 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_node_status.png | Bin 43265 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_node_status_2.png | Bin 66143 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_package.png | Bin 50859 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_package_list.png | Bin 19751 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_topic_create.png | Bin 36741 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_topic_deploy.png | Bin 42781 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_topic_error.png | Bin 35513 -> 0 bytes
.../zh-cn/img/sysdeployment/sys_topic_finished.png | Bin 49208 -> 0 bytes
docs/zh-cn/img/sysdeployment/sys_topic_select.png | Bin 26349 -> 0 bytes
docs/zh-cn/modules/agent/architecture.md | 45 ++++++
docs/zh-cn/modules/agent/img/architecture.png | Bin 0 -> 43613 bytes
docs/zh-cn/modules/agent/quick_start.md | 129 +++++++++++++++
docs/zh-cn/modules/console/quick_start.md | 41 +++++
docs/zh-cn/modules/dataproxy-sdk/architecture.md | 62 ++++++++
docs/zh-cn/modules/dataproxy-sdk/quick_start.md | 9 ++
docs/zh-cn/modules/dataproxy/architecture.md | 11 ++
docs/zh-cn/modules/dataproxy/quick_start.md | 42 +++++
docs/zh-cn/modules/manager/architecture.md | 35 +++++
docs/zh-cn/modules/manager/img/datamodel.jpg | Bin 0 -> 88671 bytes
.../modules/manager/img/image-1624431177918.png | Bin 0 -> 123146 bytes
.../modules/manager/img/image-1624431271642.png | Bin 0 -> 79053 bytes
.../modules/manager/img/image-1624431306077.png | Bin 0 -> 19793 bytes
.../modules/manager/img/image-1624431333949.png | Bin 0 -> 18348 bytes
.../modules/manager/img/image-1624431416449.png | Bin 0 -> 123988 bytes
.../modules/manager/img/image-1624431435574.png | Bin 0 -> 32810 bytes
.../modules/manager/img/image-1624431594406.png | Bin 0 -> 13327 bytes
.../modules/manager/img/image-1624431617259.png | Bin 0 -> 22671 bytes
.../modules/manager/img/image-1624431713360.png | Bin 0 -> 22250 bytes
.../modules/manager/img/image-1624431787323.png | Bin 0 -> 32927 bytes
.../modules/manager/img/image-1624432002615.png | Bin 0 -> 417736 bytes
.../modules/manager/img/image-1624432022859.png | Bin 0 -> 261703 bytes
.../modules/manager/img/image-1624432076857.png | Bin 0 -> 82036 bytes
.../modules/manager/img/image-1624432092795.png | Bin 0 -> 24556 bytes
.../modules/manager/img/image-1624432114765.png | Bin 0 -> 65332 bytes
.../modules/manager/img/image-1624432235900.png | Bin 0 -> 137385 bytes
.../modules/manager/img/image-1624432254118.png | Bin 0 -> 35393 bytes
.../modules/manager/img/image-1624432286674.png | Bin 0 -> 28724 bytes
.../modules/manager/img/image-1624432445002.png | Bin 0 -> 158781 bytes
.../modules/manager/img/image-1624432458971.png | Bin 0 -> 155256 bytes
.../modules/manager/img/image-1624432474526.png | Bin 0 -> 129764 bytes
.../modules/manager/img/image-1624432496461.png | Bin 0 -> 168958 bytes
.../modules/manager/img/image-1624432515850.png | Bin 0 -> 130871 bytes
.../modules/manager/img/image-1624432535541.png | Bin 0 -> 121087 bytes
.../modules/manager/img/image-1624432652141.png | Bin 0 -> 88589 bytes
.../modules/manager/img/image-1624432668340.png | Bin 0 -> 81948 bytes
.../modules/manager/img/image-1624432740241.png | Bin 0 -> 43740 bytes
.../modules/manager/img/image-1624432759224.png | Bin 0 -> 36743 bytes
.../modules/manager/img/image-1624432778845.png | Bin 0 -> 49630 bytes
.../modules/manager/img/image-1624432797226.png | Bin 0 -> 41212 bytes
.../modules/manager/img/image-1624432829313.png | Bin 0 -> 38842 bytes
.../modules/manager/img/image-1624433272455.png | Bin 0 -> 29913 bytes
docs/zh-cn/modules/manager/img/inlong-manager.png | Bin 0 -> 73086 bytes
docs/zh-cn/modules/manager/img/interactive.jpg | Bin 0 -> 67852 bytes
docs/zh-cn/modules/manager/quick_start.md | 121 ++++++++++++++
docs/zh-cn/modules/manager/userManual.md | 164 +++++++++++++++++++
docs/zh-cn/modules/sort/img.png | Bin 0 -> 10583 bytes
docs/zh-cn/modules/sort/introduction.md | 41 +++++
docs/zh-cn/modules/sort/protocol_introduction.md | 23 +++
docs/zh-cn/modules/sort/quick_start.md | 78 +++++++++
.../http_access_api_definition_cn.xls | Bin 200704 -> 200704 bytes
docs/zh-cn/{ => modules/tubemq}/architecture.md | 18 +--
docs/zh-cn/{ => modules/tubemq}/client_rpc.md | 8 +-
docs/zh-cn/{ => modules/tubemq}/clients_java.md | 19 +--
.../{ => modules/tubemq}/configure_introduction.md | 4 +-
.../{ => modules/tubemq}/console_introduction.md | 2 +-
.../zh-cn/{ => modules/tubemq}/consumer_example.md | 12 +-
docs/zh-cn/{ => modules/tubemq}/deployment.md | 41 ++---
docs/zh-cn/{ => modules/tubemq}/error_code.md | 2 +-
docs/zh-cn/{ => modules/tubemq}/http_access_api.md | 2 +-
.../tubemq}/img/api_interface/http-api.png | Bin
.../tubemq}/img/client_rpc/rpc_broker_info.png | Bin
.../tubemq}/img/client_rpc/rpc_bytes_def.png | Bin
.../tubemq}/img/client_rpc/rpc_conn_detail.png | Bin
.../img/client_rpc/rpc_consumer_diagram.png | Bin
.../img/client_rpc/rpc_convert_topicinfo.png | Bin
.../tubemq}/img/client_rpc/rpc_event_proto.png | Bin
.../img/client_rpc/rpc_event_proto_optype.png | Bin
.../img/client_rpc/rpc_event_proto_status.png | Bin 0 -> 93691 bytes
.../tubemq/img/client_rpc/rpc_header_fill.png | Bin 0 -> 156495 bytes
.../tubemq}/img/client_rpc/rpc_inner_structure.png | Bin
.../img/client_rpc/rpc_master_authorizedinfo.png | Bin
.../tubemq}/img/client_rpc/rpc_message_data.png | Bin
.../tubemq}/img/client_rpc/rpc_pbmsg_structure.png | Bin
.../img/client_rpc/rpc_producer_close2M.png | Bin
.../img/client_rpc/rpc_producer_diagram.png | Bin
.../img/client_rpc/rpc_producer_heartbeat2M.png | Bin
.../img/client_rpc/rpc_producer_register2M.png | Bin
.../img/client_rpc/rpc_producer_sendmsg2B.png | Bin
.../tubemq}/img/client_rpc/rpc_proto_def.png | Bin
.../modules/tubemq/img/configure/conf_ini_pos.png | Bin 0 -> 26192 bytes
.../tubemq/img/configure/conf_velocity_pos.png | Bin 0 -> 21544 bytes
.../modules/tubemq}/img/console/1568169770714.png | Bin
.../modules/tubemq}/img/console/1568169796122.png | Bin
.../modules/tubemq}/img/console/1568169806810.png | Bin
.../modules/tubemq}/img/console/1568169823675.png | Bin
.../modules/tubemq}/img/console/1568169839931.png | Bin
.../modules/tubemq}/img/console/1568169851085.png | Bin
.../modules/tubemq}/img/console/1568169863402.png | Bin
.../modules/tubemq}/img/console/1568169879529.png | Bin
.../modules/tubemq}/img/console/1568169889594.png | Bin
.../modules/tubemq}/img/console/1568169900634.png | Bin
.../modules/tubemq}/img/console/1568169908522.png | Bin
.../modules/tubemq}/img/console/1568169916091.png | Bin
.../modules/tubemq}/img/console/1568169925657.png | Bin
.../modules/tubemq}/img/console/1568169946683.png | Bin
.../modules/tubemq}/img/console/1568169954746.png | Bin
.../img/development/create_pull_request.png | Bin
.../img/development/github_fork_repository.png | Bin
.../tubemq}/img/development/jira_create_issue.png | Bin
.../tubemq}/img/development/jira_filter.png | Bin
.../img/development/jira_resolve_issue_1.png | Bin
.../img/development/jira_resolve_issue_2.png | Bin
.../tubemq}/img/development/new_pull_request.png | Bin
.../modules/tubemq}/img/mqs_comare.png | Bin
.../modules/tubemq}/img/perf_appendix_1_bx1_1.png | Bin
.../modules/tubemq}/img/perf_appendix_1_bx1_2.png | Bin
.../modules/tubemq}/img/perf_appendix_1_bx1_3.png | Bin
.../modules/tubemq}/img/perf_appendix_1_bx1_4.png | Bin
.../modules/tubemq}/img/perf_appendix_1_cg1_1.png | Bin
.../modules/tubemq}/img/perf_appendix_1_cg1_2.png | Bin
.../modules/tubemq}/img/perf_appendix_1_cg1_3.png | Bin
.../modules/tubemq}/img/perf_appendix_1_cg1_4.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_1.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_2.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_3.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_4.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_5.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_6.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_7.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_8.png | Bin
.../tubemq}/img/perf_appendix_2_topic_1000_9.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_1.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_2.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_3.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_4.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_5.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_6.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_7.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_8.png | Bin
.../tubemq}/img/perf_appendix_2_topic_100_9.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_1.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_2.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_3.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_4.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_5.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_6.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_7.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_8.png | Bin
.../tubemq}/img/perf_appendix_2_topic_200_9.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_1.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_2.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_3.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_4.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_5.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_6.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_7.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_8.png | Bin
.../tubemq}/img/perf_appendix_2_topic_500_9.png | Bin
.../modules/tubemq}/img/perf_scenario_1.png | Bin
.../modules/tubemq}/img/perf_scenario_1_index.png | Bin
.../modules/tubemq}/img/perf_scenario_2.png | Bin
.../modules/tubemq}/img/perf_scenario_2_index.png | Bin
.../modules/tubemq}/img/perf_scenario_3.png | Bin
.../modules/tubemq}/img/perf_scenario_3_index.png | Bin
.../modules/tubemq}/img/perf_scenario_4_index.png | Bin
.../modules/tubemq}/img/perf_scenario_6_index.png | Bin
.../modules/tubemq}/img/perf_scenario_7.png | Bin
.../modules/tubemq}/img/perf_scenario_8.png | Bin
.../modules/tubemq}/img/perf_scenario_8_index.png | Bin
.../modules/tubemq}/img/perf_scheme.png | Bin
docs/zh-cn/modules/tubemq/img/store_file.png | Bin 0 -> 23316 bytes
.../modules/tubemq}/img/store_mem.png | Bin
.../modules/tubemq}/img/sys_structure.png | Bin
.../tubemq/img/sysdeployment/sys_address_host.png | Bin 0 -> 3690 bytes
.../img/sysdeployment/sys_broker_configure.png | Bin 0 -> 59822 bytes
.../tubemq/img/sysdeployment/sys_broker_deploy.png | Bin 0 -> 46767 bytes
.../img/sysdeployment/sys_broker_finished.png | Bin 0 -> 46756 bytes
.../tubemq/img/sysdeployment/sys_broker_online.png | Bin 0 -> 44770 bytes
.../img/sysdeployment/sys_broker_online_2.png | Bin 0 -> 62302 bytes
.../img/sysdeployment/sys_broker_restart_1.png | Bin 0 -> 19355 bytes
.../img/sysdeployment/sys_broker_restart_2.png | Bin 0 -> 86408 bytes
.../tubemq/img/sysdeployment/sys_broker_start.png | Bin 0 -> 42862 bytes
.../img/sysdeployment/sys_broker_start_error.png | Bin 0 -> 56744 bytes
.../tubemq/img/sysdeployment/sys_compile.png | Bin 0 -> 23543 bytes
.../tubemq/img/sysdeployment/sys_configure_1.png | Bin 0 -> 188535 bytes
.../tubemq/img/sysdeployment/sys_configure_2.png | Bin 0 -> 193819 bytes
.../img/sysdeployment/sys_master_console.png | Bin 0 -> 35541 bytes
.../tubemq/img/sysdeployment/sys_master_start.png | Bin 0 -> 35457 bytes
.../img/sysdeployment/sys_master_startted.png | Bin 0 -> 99107 bytes
.../tubemq/img/sysdeployment/sys_node_log.png | Bin 0 -> 20891 bytes
.../tubemq/img/sysdeployment/sys_node_status.png | Bin 0 -> 71771 bytes
.../tubemq/img/sysdeployment/sys_node_status_2.png | Bin 0 -> 123306 bytes
.../tubemq/img/sysdeployment/sys_package.png | Bin 0 -> 69467 bytes
.../tubemq/img/sysdeployment/sys_package_list.png | Bin 0 -> 44553 bytes
.../tubemq/img/sysdeployment/sys_topic_create.png | Bin 0 -> 50660 bytes
.../tubemq/img/sysdeployment/sys_topic_deploy.png | Bin 0 -> 46372 bytes
.../tubemq/img/sysdeployment/sys_topic_error.png | Bin 0 -> 151646 bytes
.../img/sysdeployment/sys_topic_finished.png | Bin 0 -> 46354 bytes
.../tubemq/img/sysdeployment/sys_topic_select.png | Bin 0 -> 54280 bytes
.../tubemq/img/sysdeployment/test_sendmessage.png | Bin 0 -> 52958 bytes
.../img/sysdeployment/test_sendmessage_2.png | Bin 0 -> 98658 bytes
.../modules/tubemq}/img/test_scheme.png | Bin
.../modules/tubemq}/img/test_summary.png | Bin
.../modules/tubemq}/img/tubemq-add-broker-1.png | Bin
.../modules/tubemq}/img/tubemq-add-broker-2.png | Bin
.../modules/tubemq}/img/tubemq-add-broker-3.png | Bin
.../modules/tubemq}/img/tubemq-add-topic-1.png | Bin
.../modules/tubemq}/img/tubemq-add-topic-2.png | Bin
.../modules/tubemq}/img/tubemq-add-topic-3.png | Bin
.../modules/tubemq}/img/tubemq-add-topic-4.png | Bin
.../modules/tubemq}/img/tubemq-add-topic-5.png | Bin
.../modules/tubemq}/img/tubemq-add-topic-6.png | Bin
.../modules/tubemq}/img/tubemq-console-gui.png | Bin
.../modules/tubemq/img/tubemq-consume-message.png | Bin 0 -> 89770 bytes
.../modules/tubemq/img/tubemq-send-message.png | Bin 0 -> 69960 bytes
.../zh-cn/{ => modules/tubemq}/producer_example.md | 24 +--
docs/zh-cn/{ => modules/tubemq}/quick_start.md | 56 +++----
.../modules/tubemq/tubemq-manager/quick_start.md | 134 ++++++++++++++++
.../tubemq}/tubemq_perf_test_vs_Kafka_cn.md | 0
site_config/docs.js | 28 +---
482 files changed, 2829 insertions(+), 1103 deletions(-)
diff --git a/docs/en-us/console/develop.md b/docs/en-us/console/develop.md
new file mode 100644
index 0000000..21de530
--- /dev/null
+++ b/docs/en-us/console/develop.md
@@ -0,0 +1,39 @@
+## Before use
+Should check the `nodejs >= 14.0` has been install.
+
+## Develop
+Inside the newly created project, you can run some built-in commands:
+
+if not install the `node_modules`, you should run `npm install` or `yarn install` at first.
+
+Runs the app in development mode with `npm run dev` or `yarn dev`.
+
+If server run success, Browser will Open [http://localhost:8080](http://localhost:8080) to view it in the browser.
+
+The page will reload if you make edits.
+You will also see any lint errors in the console.
+
+### Notice
+
+The start of the web server depends on the back-end server api interface.
+
+You should start the backend server first, and then set variable `target` in `/inlong-website/src/setupProxy.js` as api service address.
+
+## Test
+
+Run `npm test` or `yarn test`
+
+Launches the test runner in the interactive watch mode.
+See the section about [running tests](https://create-react-app.dev/docs/running-tests/) for more information.
+
+## Build and deployment
+
+Run `npm run build` or `yarn build`
+
+Builds the app for production to the build folder.
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.
+Your app is ready to be deployed!
+
+See the section about [deployment](https://create-react-app.dev/docs/deployment/) for more information.
diff --git a/docs/en-us/contact.md b/docs/en-us/contact.md
index 5a61b5f..7278e92 100644
--- a/docs/en-us/contact.md
+++ b/docs/en-us/contact.md
@@ -1,18 +1,18 @@
---
-title: Contact Us - Apache TubeMQ
+title: Contact Us - Apache InLong
---
Contact us
-------
-
-- Mailing lists
+- Ask questions on: [Apache InLong Slack](https://the-asf.slack.com/archives/C01QAG6U00L)
+- Mailing lists:
| Name | Scope | | | |
|:------------------------------------------------------------------------------|:--------------------------------|:----------------------------------------------------------------|:--------------------------------------------------------------------|:-----------------------------------------------------------------------------|
- | [dev@tubemq.apache.org](mailto:dev@inlong.apache.org) | Development-related discussions | [Subscribe](mailto:dev-subscribe@inlong.apache.org) | [Unsubscribe](mailto:dev-unsubscribe@inlong.apache.org) | [Archives](http://mail-archives.apache.org/mod_mbox/tubemq-dev/) |
-
+ | [dev@inlong.apache.org](mailto:dev@inlong.apache.org) | Development-related discussions | [Subscribe](mailto:dev-subscribe@inlong.apache.org) | [Unsubscribe](mailto:dev-unsubscribe@inlong.apache.org) | [Archives](http://mail-archives.apache.org/mod_mbox/inlong-dev/) |
+
- Home page: https://inlong.apache.org
-- Issues: https://issues.apache.org/jira/browse/INLONG
+- Issues: https://issues.apache.org/jira/browse/InLong
diff --git a/docs/en-us/development/how-to-become-a-committer.md b/docs/en-us/development/how-to-become-a-committer.md
index df8bc75..d31d671 100644
--- a/docs/en-us/development/how-to-become-a-committer.md
+++ b/docs/en-us/development/how-to-become-a-committer.md
@@ -1,37 +1,37 @@
---
-title: How to Become a Committer - Apache TubeMQ
+title: How to Become a Committer - Apache InLong
---
-# 如何成为Apache TubeMQ Committer 和 PPMC
+# 如何成为Apache InLong Committer 和 PPMC
<font color="#dd0000" size="4">TODO: This page needs to be translated into English. If you are interested, just do it.</font>
-> Apache TubeMQ是完全按照Apache的规则来构建社区的，Apache Committer是ASF（Apache软件基金会）中用来表示提交特定项目的人的术语，
-Apache TubeMQ Committer拥有TubeMQ代码库的写权限，可以合并PR，任何人只要为社区做出了足够的贡献并获取到足够的信任就可以成为Apache TubeMQ Committer。
+> Apache InLong是完全按照Apache的规则来构建社区的，Apache Committer是ASF（Apache软件基金会）中用来表示提交特定项目的人的术语，
+Apache InLong Committer拥有InLong代码库的写权限，可以合并PR，任何人只要为社区做出了足够的贡献并获取到足够的信任就可以成为Apache InLong Committer。
-任何人只要对TubeMQ项目做了贡献，那你就是官方承认的TubeMQ项目的Contributor了，从Contributor成长为Committer并没有一个确切的标准，
+任何人只要对InLong项目做了贡献，那你就是官方承认的InLong项目的Contributor了，从Contributor成长为Committer并没有一个确切的标准，
也没有任何预期的时间表，但是Committer的候选人一般都是长期活跃的贡献者，成为Committer并没有要求必须有巨大的架构改进贡献，
或者多少行的代码贡献，贡献代码、贡献文档、参与邮件列表的讨论、帮助回答问题等等都提升自己影响力的方式。
潜在贡献清单（无特定顺序）：
- 提交自己发现的Bug、特性、改进到issue
-- 更新官方文档使项目的文档是最近的、撰写TubeMQ的最佳实践、特性剖析的各种对用户有用的文档
-- 执行测试并报告测试结果，性能测试与其他MQ的性能对比测试等
+- 更新官方文档使项目的文档是最近的、撰写InLong的最佳实践、特性剖析的各种对用户有用的文档
+- 执行测试并报告测试结果，性能测试与其他Agent、MQ等模块的性能对比测试等
- 发布版本时，积极参与投票
- 参与邮件列表中的讨论，一般会有以[DISCUSS]开头的邮件
- 回答用户或开发人员在邮件列表中的提问
- 审查(Review)其他人的工作（包括代码和非代码）并发表你自己的建议
- 对JIRA上的issue进行审查，维护issue为最新状态，比如：关闭过时的issue、更改issue的错误信息等
- 指导新加入的贡献者，熟悉社区流程
-- 发表关于TubeMQ的演讲和博客，并将这些添加到TubeMQ的官方网站
-- 有利于TubeMQ社区发展的任何贡献
+- 发表关于InLong的演讲和博客，并将这些添加到InLong的官方网站
+- 有利于InLong社区发展的任何贡献
- ......
更多可以参考：[ASF官方文档](https://community.apache.org/contributors/)
并不是每个人都能完成这个清单上的所有（甚至任何）项目。如果你想用其他方式来做贡献，那就去做吧（并把它们添加到列表中）。
-愉快的举止和乐于奉献的精神是您对TubeMQ项目产生积极影响所需要的全部。
-邀请您成为Committer是您与社区长期稳定互动的结果，是TubeMQ社区对您的信任和认可。
+愉快的举止和乐于奉献的精神是您对InLong项目产生积极影响所需要的全部。
+邀请您成为Committer是您与社区长期稳定互动的结果，是InLong社区对您的信任和认可。
Committer有义务审查(Review)和合并(merge)其他人提交的PR，版本发布时测试和投票候选版本，参与特性设计方案的讨论以及其他类型的项目贡献。
-当你足够活跃且对社区的贡献比较大后，就可以晋升为TubeMQ项目的PPMC成员。
\ No newline at end of file
+当你足够活跃且对社区的贡献比较大后，就可以晋升为InLong项目的PPMC成员。
\ No newline at end of file
diff --git a/docs/en-us/development/how-to-commit.md b/docs/en-us/development/how-to-commit.md
index 89022d4..3e92e2a 100644
--- a/docs/en-us/development/how-to-commit.md
+++ b/docs/en-us/development/how-to-commit.md
@@ -1,5 +1,5 @@
---
-title: How to Commit - Apache TubeMQ
+title: How to Commit - Apache InLong
---
# 如何提交代码
@@ -7,15 +7,15 @@ title: How to Commit - Apache TubeMQ
<font color="#dd0000" size="4">TODO: This page needs to be translated into English. If you are interested, just do it.</font>
## 0. 前言
-Apache TubeMQ使用Github的Pull Request (PR)来接收贡献的代码，本文将详细介绍提交代码的详细流程。
+Apache InLong使用Github的Pull Request (PR)来接收贡献的代码，本文将详细介绍提交代码的详细流程。
-- TubeMQ代码库：https://github.com/apache/incubator-tubemq
+- InLong代码库：https://github.com/apache/incubator-inlong
-- TubeMQ官网库：https://github.com/apache/incubator-tubemq-website
+- InLong官网库：https://github.com/apache/incubator-inlong-website
## 1. Fork仓库
-进入 [apache/incubator-tubemq](https://github.com/apache/incubator-tubemq) 的Github页面 ，点击右上角按钮 `Fork` 进行 Fork。如下图所示：
+进入 [apache/incubator-inlong](https://github.com/apache/incubator-inlong) 的Github页面 ，点击右上角按钮 `Fork` 进行 Fork。如下图所示：
@@ -23,22 +23,22 @@ Apache TubeMQ使用Github的Pull Request (PR)来接收贡献的代码，本文
### 2.1 将代码克隆到本地
```shell
-git clone https://github.com/<your_github_name>/incubator-tubemq.git
+git clone https://github.com/<your_github_name>/incubator-inlong.git
```
clone完成后，origin会默认指向github上的远程fork地址。
-### 2.2 将 apache/incubator-tubemq 添加为本地仓库的远程分支upstream
+### 2.2 将 apache/incubator-inlong 添加为本地仓库的远程分支upstream
```shell
-cd incubator-tubemq
-git remote add upstream https://github.com/apache/incubator-tubemq.git
+cd incubator-inlong
+git remote add upstream https://github.com/apache/incubator-inlong.git
```
### 2.3 检查远程仓库设置
```shell
git remote -v
-origin https://github.com/<your_github_name>/incubator-tubemq.git (fetch)
-origin https://github.com/<your_github_name>/incubator-tubemq.git(push)
-upstream https://github.com/apache/incubator-tubemq.git (fetch)
-upstream https://github.com/apache/incubator-tubemq.git (push)
+origin https://github.com/<your_github_name>/incubator-inlong.git (fetch)
+origin https://github.com/<your_github_name>/incubator-inlong.git(push)
+upstream https://github.com/apache/incubator-inlong.git (fetch)
+upstream https://github.com/apache/incubator-inlong.git (push)
```
此时会有两个仓库：origin(自己的仓库)和upstream（官方的仓库）
@@ -48,25 +48,25 @@ git fetch upstream
git pull upstream master
```
### 2.5 新建分支
-> 一般以issue id作为分支名，如：TUBEMQ-123
+> 一般以issue id作为分支名，如：INLONG-123
```shell
-git checkout -b TUBEMQ-123
+git checkout -b INLONG-123
```
-**确保分支`TUBEMQ-123`是基于官方master分支的最新代码**
+**确保分支`INLONG-123`是基于官方master分支的最新代码**
分支创建完成后即可进行代码更改。
### 2.6 提交代码到远程分支
-> commit 信息的格式必须与Issue标题保持一致且以`[issue id]`开头，即：`[TUBEMQ-123] xxx`
+> commit 信息的格式必须与Issue标题保持一致且以`[issue id]`开头，即：`[INLONG-123] xxx`
```shell
-git commit -a -m "[TUBEMQ-123] xxx"
-git push origin TUBEMQ-123
+git commit -a -m "[INLONG-123] xxx"
+git push origin INLONG-123
```
## 3. 创建PR
### 3.1 打开自己的github仓库页面
- `https://github.com/<your_github_name>/incubator-tubemq`
+ `https://github.com/<your_github_name>/incubator-inlong`
### 3.2. 切换分支
- 切换到提交的分支 `TUBEMQ-123`
+ 切换到提交的分支 `INLONG-123`
### 3.3. 创建新PR
点击 `New pull request`或者`Compare & pull request`
@@ -74,7 +74,7 @@ git push origin TUBEMQ-123
需要注意以下几点：
1. PR的标题必须以issue id开头，最好与commit信息保持一致
2. 可以填写部分描述信息也可以不填
- 3. 如果点击`Create pull request`后提示代码冲突，则请将`TUBEMQ-123`分支的代码
+ 3. 如果点击`Create pull request`后提示代码冲突，则请将`INLONG-123`分支的代码
与master分支同步一致后在进行提交
@@ -83,4 +83,4 @@ git push origin TUBEMQ-123
创建完PR后，所有的人都可以Review代码，可能会与您讨论一些实现的细节，可能还需要你进一步修改。
**一般该PR必须有2位以上的社区PPMC/Committer +1后，才可能正式合入官方代码库。**
-最后，恭喜您已经成为了TubeMQ的官方贡献者了！
+最后，恭喜您已经成为了InLong的官方贡献者了！
diff --git a/docs/en-us/development/how-to-contribute.md b/docs/en-us/development/how-to-contribute.md
index 559efd6..e798bc1 100644
--- a/docs/en-us/development/how-to-contribute.md
+++ b/docs/en-us/development/how-to-contribute.md
@@ -1,23 +1,23 @@
---
-title: How to Contribute - Apache TubeMQ
+title: How to Contribute - Apache InLong
---
# How to Contribute
-The Apache TubeMQ(incubating) community welcomes contributions from anyone with a passion for distributed systems! TubeMQ has many different opportunities for contributions -- write new examples/tutorials, add new user-facing libraries or participate on the documentation effort.
+The Apache InLong(incubating) community welcomes contributions from anyone with a passion for distributed systems! InLong has many different opportunities for contributions -- write new examples/tutorials, add new user-facing libraries or participate on the documentation effort.
-We use a review-then-commit workflow in TubeMQ for all contributions.
+We use a review-then-commit workflow in InLong for all contributions.
**For larger contributions or those that affect multiple components:**
-1. **Engage**: We encourage you to work with the TubeMQ community on the [JIRA](https://jira.apache.org/jira/browse/TUBEMQ) and [developer’s mailing list](../contact.html) to identify good areas for contribution.
+1. **Engage**: We encourage you to work with the InLong community on the [JIRA](https://jira.apache.org/jira/browse/INLONG) and [developer’s mailing list](../contact.html) to identify good areas for contribution.
2. **Design:** More complicated contributions will likely benefit from some early discussion in order to scope and design them well.
**For all contributions:**
1. **Code:** The you-know-what part.
-2. **Review:** Submit a pull request with your contribution to our [GitHub Repo](https://github.com/apache/incubator-tubemq). Work with a committer to review and iterate on the code, if needed.
-3. **Commit:** Once at least 1 TubeMQ committer has approved the pull request, a TubeMQ committer will merge it into the master branch (and potentially backport to stable branches in case of bug fixes).
+2. **Review:** Submit a pull request with your contribution to our [GitHub Repo](https://github.com/apache/incubator-inlong). Work with a committer to review and iterate on the code, if needed.
+3. **Commit:** Once at least 1 InLong committer has approved the pull request, a InLong committer will merge it into the master branch (and potentially backport to stable branches in case of bug fixes).
We look forward to working with you!
@@ -25,16 +25,16 @@ We look forward to working with you!
### Mailing list(s)
-We discuss design and implementation issues on the [dev@tubemq.apache.org](mailto:dev@tubemq.apache.org) mailing list, which is archived [here](https://lists.apache.org/list.html?dev@tubemq.apache.org). Join by emailing [`dev-subscribe@tubemq.apache.org`](mailto:dev-subscribe@tubemq.apache.org).
+We discuss design and implementation issues on the [dev@inlong.apache.org](mailto:dev@inlong.apache.org) mailing list, which is archived [here](https://lists.apache.org/list.html?dev@inlong.apache.org). Join by emailing [`dev-subscribe@inlong.apache.org`](mailto:dev-subscribe@inlong.apache.org).
### JIRA
-We are using [JIRA](https://jira.apache.org/jira/browse/TUBEMQ) as the issue tracking
-and project management tool, as well as a way to communicate among a very diverse and distributed set of contributors. To be able to gather feedback, avoid frustration, and avoid duplicated efforts all TubeMQ related work are being tracked there.
+We are using [JIRA](https://jira.apache.org/jira/browse/INLONG) as the issue tracking
+and project management tool, as well as a way to communicate among a very diverse and distributed set of contributors. To be able to gather feedback, avoid frustration, and avoid duplicated efforts all InLong related work are being tracked there.
If you do not already have an JIRA account, sign up [here](https://jira.apache.org/jira/secure/Signup!default.jspa).
-If a quick [search](https://jira.apache.org/jira/projects/TUBEMQ/issues) doesn’t turn up an existing JIRA issue for the work you want to contribute, create it. Please discuss your idea with a committer in JIRA or, alternatively, on the developer mailing list.
+If a quick [search](https://jira.apache.org/jira/projects/INLONG/issues) doesn’t turn up an existing JIRA issue for the work you want to contribute, create it. Please discuss your idea with a committer in JIRA or, alternatively, on the developer mailing list.
If there’s an existing JIRA issue for your intended contribution, please comment about your intended work. Once the work is understood, a committer will assign the issue to you. If an issue is currently assigned, please check with the current assignee before reassigning.
@@ -42,9 +42,9 @@ For moderate or large contributions, you should not start coding or writing a de
## Design
-To avoid potential frustration during the code review cycle, we encourage you to clearly scope and design non-trivial contributions with the TubeMQ community before you start coding.
+To avoid potential frustration during the code review cycle, we encourage you to clearly scope and design non-trivial contributions with the InLong community before you start coding.
-We are using "TubeMQ Improvement Proposals" for managing major changes to TubeMQ. The list of all proposals is maintained in the TubeMQ wiki at [this page](https://cwiki.apache.org/confluence/display/TUBEMQ/TubeMQ+Improvement+Proposals).
+We are using "InLong Improvement Proposals" for managing major changes to InLong. The list of all proposals is maintained in the InLong wiki at [this page](https://cwiki.apache.org/confluence/display/INLONG/INLONG+Improvement+Proposals).
## Commit (committers only)
@@ -52,10 +52,10 @@ Once the code has been peer reviewed by a committer, the next step is for the co
Pull requests should not be merged before the review has approved from at least 1 committer.
-For more about merging pull request, please refer to [this page](https://cwiki.apache.org/confluence/display/TUBEMQ/Merging+Pull+Requests)
+For more about merging pull request, please refer to [this page](https://cwiki.apache.org/confluence/display/INLONG/Merging+Pull+Requests)
## Website Contributor List
-We are very pleased to announce some contributors here. They have made a lot of contributions in the translation of TubeMQ. Thanks again to the following participants.
+We are very pleased to announce some contributors here. They have made a lot of contributions in the translation of InLong. Thanks again to the following participants.
- deepEvolution
- missy
- min.yang
diff --git a/docs/en-us/development/how-to-release.md b/docs/en-us/development/how-to-release.md
index a1b7a70..39fd548 100644
--- a/docs/en-us/development/how-to-release.md
+++ b/docs/en-us/development/how-to-release.md
@@ -1,5 +1,5 @@
---
-title: How to Release - Apache TubeMQ
+title: How to Release - Apache InLong
---
# 如何发布版本
@@ -10,7 +10,7 @@ title: How to Release - Apache TubeMQ
## 0. 前言
Source Release是Apache关注的重点，也是发布的必须内容；
-Binary Release是可选项，TubeMQ可以选择是否发布二进制包到Apache仓库或者发布到Maven中央仓库。
+Binary Release是可选项，InLong可以选择是否发布二进制包到Apache仓库或者发布到Maven中央仓库。
请参考以下链接，找到更多关于ASF的发布指南:
@@ -125,29 +125,29 @@ http://keys.gnupg.net
> 这个步骤需要使用SVN
-DEV分支的svn库是 https://dist.apache.org/repos/dist/dev/incubator/tubemq
+DEV分支的svn库是 https://dist.apache.org/repos/dist/dev/incubator/inlong
-Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/tubemq
+Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/inlong
#### 1.5.1 在dev分支中添加公钥到KEYS，用于发布RC版本
```shell
-➜ ~ svn co https://dist.apache.org/repos/dist/dev/incubator/tubemq /tmp/tubemq-dist-dev
+➜ ~ svn co https://dist.apache.org/repos/dist/dev/incubator/inlong /tmp/inlong-dist-dev
# 这个步骤比较慢，会把所有版本都拷贝下来，如果网断了，用svn cleanup删掉锁，重新执行一下，会断点续传
-➜ ~ cd tubemq-dist-dev
-➜ tubemq-dist-dev ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
-➜ tubemq-dist-dev ~ svn add . # 如果之前存在KEYS文件，则不需要
-➜ tubemq-dist-dev ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
+➜ ~ cd inlong-dist-dev
+➜ inlong-dist-dev ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
+➜ inlong-dist-dev ~ svn add . # 如果之前存在KEYS文件，则不需要
+➜ inlong-dist-dev ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
```
#### 1.5.2 在release分支中添加公钥到KEYS，用于发布正式版本
```shell
-➜ ~ svn co https://dist.apache.org/repos/dist/release/incubator/tubemq /tmp/tubemq-dist-release
-➜ ~ cd tubemq-dist-release
-➜ tubemq-dist-release ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
-➜ tubemq-dist-release ~ svn add . # 如果之前存在KEYS文件，则不需要
-➜ tubemq-dist-release ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
+➜ ~ svn co https://dist.apache.org/repos/dist/release/incubator/inlong /tmp/inlong-dist-release
+➜ ~ cd inlong-dist-release
+➜ inlong-dist-release ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
+➜ inlong-dist-release ~ svn add . # 如果之前存在KEYS文件，则不需要
+➜ inlong-dist-release ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
```
### 1.6 上传GPG公钥到Github账户
@@ -222,20 +222,20 @@ $ git config user.signingkey ${KEY_ID}
> tag创建成功后，我需要将tag源码打包成一个tar包
```shell
-mkdir /tmp/apache-tubemq-${release_version}-${rc_version}
-git archive --format=tar.gz --output="/tmp/apache-tubemq-${release_version}-${rc_version}/apache-tubemq-${release_version}-src.tar.gz" --prefix="apache-tubemq-${release_version}/" $git_tag
+mkdir /tmp/apache-inlong-${release_version}-${rc_version}
+git archive --format=tar.gz --output="/tmp/apache-inlong-${release_version}-${rc_version}/apache-inlong-${release_version}-src.tar.gz" --prefix="apache-inlong-${release_version}/" $git_tag
```
### 3.4 打包二进制包
> 编译上一步打包的源码
```shell
-cd /tmp/apache-tubemq-${release_version}-${rc_version} # 进入源码包目录
-tar xzvf apache-tubemq-${release_version}-src.tar.gz #解压源码包
-cd apache-tubemq-${release_version} # 进入源码目录
+cd /tmp/apache-inlong-${release_version}-${rc_version} # 进入源码包目录
+tar xzvf apache-inlong-${release_version}-src.tar.gz #解压源码包
+cd apache-inlong-${release_version} # 进入源码目录
mvn compile clean install package -DskipTests # 编译
-cp ./tubemq-client/target/apache-tubemq-client-${release_version}-bin.tar.gz /tmp/apache-tubemq-${release_version}-${rc_version}/ # 拷贝client包到源码包目录下，方面下一步对包进行签名
-cp ./tubemq-server/target/apache-tubemq-server-${release_version}-bin.tar.gz /tmp/apache-tubemq-${release_version}-${rc_version}/ # 拷贝server包到源码包目录下，方面下一步对包进行签名
+cp ./inlong-client/target/apache-inlong-client-${release_version}-bin.tar.gz /tmp/apache-inlong-${release_version}-${rc_version}/ # 拷贝client包到源码包目录下，方面下一步对包进行签名
+cp ./inlong-server/target/apache-inlong-server-${release_version}-bin.tar.gz /tmp/apache-inlong-${release_version}-${rc_version}/ # 拷贝server包到源码包目录下，方面下一步对包进行签名
```
### 3.5 对源码包/二进制包进行签名/sha512
@@ -253,9 +253,9 @@ for i in *.tar.gz; do echo $i; gpg --verify $i.asc $i ; done
## 4. 准备Apache发布
### 4.1 发布jar包到Apache Nexus仓库
```shell
-cd /tmp/apache-tubemq-${release_version}-${rc_version} # 进入源码包目录
-tar xzvf apache-tubemq-${release_version}-src.tar.gz #解压源码包
-cd apache-tubemq-${release_version}
+cd /tmp/apache-inlong-${release_version}-${rc_version} # 进入源码包目录
+tar xzvf apache-inlong-${release_version}-src.tar.gz #解压源码包
+cd apache-inlong-${release_version}
mvn -DskipTests deploy -Papache-release -Dmaven.javadoc.skip=true # 开始上传
```
@@ -266,20 +266,20 @@ git push origin ${release_version}-${rc_version}
```
### 4.3 上传编译好的文件到dist
-> 这个步骤需要使用SVN, DEV分支的svn库是 https://dist.apache.org/repos/dist/dev/incubator/tubemq
+> 这个步骤需要使用SVN, DEV分支的svn库是 https://dist.apache.org/repos/dist/dev/incubator/inlong
-### 4.3.1 将TubeMQ checkout到本地目录
+### 4.3.1 将InLong checkout到本地目录
```shell
# 这个步骤可能会比较慢，会把所有版本都考下来，如果网断了，用svn cleanup删掉锁，重新执行一下，会断点续传
-svn co https://dist.apache.org/repos/dist/dev/incubator/tubemq /tmp/tubemq-dist-dev
+svn co https://dist.apache.org/repos/dist/dev/incubator/inlong /tmp/inlong-dist-dev
```
### 4.3.2 添加public key到KEYS文件并提交到SVN仓库
```shell
-cd /tmp/tubemq-dist-dev
+cd /tmp/inlong-dist-dev
mkdir ${release_version}-${rc_version} #创建版本目录
# 将源码包和签名包拷贝到此处
-cp /tmp/apache-tubemq-${release_version}-${rc_version}/*tar.gz* ${release_version}-${rc_version}/
+cp /tmp/apache-inlong-${release_version}-${rc_version}/*tar.gz* ${release_version}-${rc_version}/
svn status # 检查svn状态
svn add ${release_version}-${rc_version} # 添加到svn版本
svn status # 检查svn状态
@@ -289,62 +289,62 @@ svn commit -m 'prepare for ${release_version} ${rc_version}'# 提交至svn远程
> 请确保所有的artifact都是ok的
1. **先登录**http://repository.apache.org , 使用Apache账号登录
2. 点击左侧的Staging repositories，
-3. 搜索TubeMQ关键字，选择你最近上传的仓库
+3. 搜索InLong关键字，选择你最近上传的仓库
4. 点击上方的Close按钮，这个过程会进行一系列检查
5. 检查通过以后, 在下方的Summary标签页上出现一个连接，请保存好这个链接，需要放在接下来的投票邮件当中。
-链接应该是类似这样的: `https://repository.apache.org/content/repositories/orgapachetubemq-xxxx`
+链接应该是类似这样的: `https://repository.apache.org/content/repositories/orgapacheinlong-xxxx`
WARN: 请注意点击Close可能会出现失败，请检查失败原因并处理
## 5. 进入投票
-> TubeMQ仍旧在孵化中，需要进行两次投票，
-- TubeMQ社区投票，发邮件至：`dev@tubemq.apache.org`
+> InLong仍旧在孵化中，需要进行两次投票，
+- InLong社区投票，发邮件至：`dev@inlong.apache.org`
- incubator社区投票，发邮件至：`general@incubator.apache.org`
-TubeMQ毕业之后，只需要在TubeMQ社区投票
+InLong毕业之后，只需要在InLong社区投票
-### 5.1 TubeMQ社区投票
+### 5.1 InLong社区投票
#### 5.1.1 投票模板
```html
-标题：[VOTE] Release Apache TubeMQ ${release_version} ${rc_version}
+标题：[VOTE] Release Apache InLong ${release_version} ${rc_version}
内容：
-Hello Apache TubeMQ PPMC and Community,
+Hello Apache InLong PPMC and Community,
- This is a call for vote to release Apache TubeMQ version ${release_version}-${rc_version}.
+ This is a call for vote to release Apache InLong version ${release_version}-${rc_version}.
The tag to be voted on is ${release_version}-${rc_version}:
- https://github.com/apache/incubator-tubemq/tree/${release_version}-${rc_version}
+ https://github.com/apache/incubator-inlong/tree/${release_version}-${rc_version}
The release tarball, signature, and checksums can be found at:
- https://dist.apache.org/repos/dist/dev/incubator/tubemq/${release_version}-${rc_version}/
+ https://dist.apache.org/repos/dist/dev/incubator/inlong/${release_version}-${rc_version}/
Maven artifacts are available in a staging repository at:
- https://repository.apache.org/content/repositories/orgapachetubemq-{staging-id}
+ https://repository.apache.org/content/repositories/orgapacheinlong-{staging-id}
Artifacts were signed with the {YOUR_PUB_KEY} key which can be found in:
- https://dist.apache.org/repos/dist/dev/incubator/tubemq/KEYS
+ https://dist.apache.org/repos/dist/dev/incubator/inlong/KEYS
${release_version} includes ~ ${issue_count} bug and improvement fixes done since last versions which can be found at:
- https://github.com/apache/incubator-tubemq/blob/${release_version}-${rc_version}/CHANGES.md
+ https://github.com/apache/incubator-inlong/blob/${release_version}-${rc_version}/CHANGES.md
Please download, verify, and test.
The VOTE will remain open for at least 72 hours.
- [ ] +1 Release this package as Apache TubeMQ ${release_version}
+ [ ] +1 Release this package as Apache InLong ${release_version}
[ ] +0
[ ] -1 Do not release this package because...
- To learn more about apache tubemq, please see
- http://tubemq.apache.org/
+ To learn more about apache inlong, please see
+ http://inlong.apache.org/
Checklist for reference:
@@ -360,16 +360,16 @@ Hello Apache TubeMQ PPMC and Community,
https://cwiki.apache.org/confluence/display/INCUBATOR/Incubator+Release+Checklist
Thanks,
-Your TubeMQ Release Manager
+Your InLong Release Manager
```
#### 5.1.2 宣布投票结果模板
```html
-标题：[RESULT][VOTE] Release Apache TubeMQ ${release_version} ${rc_version}
+标题：[RESULT][VOTE] Release Apache InLong ${release_version} ${rc_version}
内容：
-Hello Apache TubeMQ PPMC and Community,
+Hello Apache InLong PPMC and Community,
The vote closes now as 72hr have passed. The vote PASSES with
xx (+1 non-binding) votes from the PPMC,
@@ -383,7 +383,7 @@ Hello Apache TubeMQ PPMC and Community,
If this vote passes also, the release is accepted and will be published.
Thank you for your support.
-Your TubeMQ Release Manager
+Your InLong Release Manager
```
### 5.2 incubator社区投票
@@ -391,38 +391,38 @@ Your TubeMQ Release Manager
#### 5.2.1 投票模板
```html
-标题：[VOTE] Release Apache TubeMQ (Incubating) ${release_version} ${rc_version}
+标题：[VOTE] Release Apache InLong (Incubating) ${release_version} ${rc_version}
内容：
Hello Incubator Community,
- This is a call for a vote to release Apache TubeMQ (Incubating) version
+ This is a call for a vote to release Apache InLong (Incubating) version
${release_version} ${rc_version}
- The Apache TubeMQ community has voted on and approved a proposal to release
- Apache TubeMQ (Incubating) version ${release_version} ${rc_version}
+ The Apache InLong community has voted on and approved a proposal to release
+ Apache InLong (Incubating) version ${release_version} ${rc_version}
We now kindly request the Incubator PMC members review and vote on this
incubator release.
- TubeMQ community vote thread:
+ InLong community vote thread:
• [投票链接]
Vote result thread:
• [投票结果链接]
The release candidate:
- • https://dist.apache.org/repos/dist/dev/incubator/tubemq/${release_version}-${rc_version}/
+ • https://dist.apache.org/repos/dist/dev/incubator/inlong/${release_version}-${rc_version}/
Git tag for the release:
- • https://github.com/apache/incubator-tubemq/tree/${release_version}-${rc_version}
+ • https://github.com/apache/incubator-inlong/tree/${release_version}-${rc_version}
Release notes:
- • https://github.com/apache/incubator-tubemq/releases/tag/${release_version}-${rc_version}
+ • https://github.com/apache/incubator-inlong/releases/tag/${release_version}-${rc_version}
The artifacts signed with PGP key [填写你个人的KEY], corresponding to [填写你个人的邮箱], that can be found in keys file:
- • https://dist.apache.org/repos/dist/dev/incubator/tubemq/KEYS
+ • https://dist.apache.org/repos/dist/dev/incubator/inlong/KEYS
The vote will be open for at least 72 hours or until necessary number of votes are reached.
@@ -433,18 +433,18 @@ Hello Incubator Community,
[ ] -1 disapprove with the reason
Thanks,
-On behalf of Apache TubeMQ (Incubating) community
+On behalf of Apache InLong (Incubating) community
```
#### 5.2.2 宣布投票结果模板
```html
-标题：[RESULT][VOTE] Release Apache TubeMQ ${release_version} {rc_version}
+标题：[RESULT][VOTE] Release Apache InLong ${release_version} {rc_version}
内容：
Hi all
-Thanks for reviewing and voting for Apache TubeMQ (Incubating) ${release_version} {rc_version}
+Thanks for reviewing and voting for Apache InLong (Incubating) ${release_version} {rc_version}
release, I am happy to announce the release voting has passed with [投票结果数]
binding votes, no +0 or -1 votes. Binding votes are from IPMC
@@ -456,11 +456,11 @@ The voting thread is:
[投票链接]
Many thanks for all our mentors helping us with the release procedure, and
-all IPMC helped us to review and vote for Apache TubeMQ (Incubating) release. I will
+all IPMC helped us to review and vote for Apache InLong (Incubating) release. I will
be working on publishing the artifacts soon.
Thanks
-On behalf of Apache TubeMQ (Incubating) community
+On behalf of Apache InLong (Incubating) community
```
## 6. 正式发布
@@ -468,51 +468,51 @@ On behalf of Apache TubeMQ (Incubating) community
### 6.1 合并release-${release_version}分支的改动到master分支
### 6.2 将源码和二进制包从svn的dev目录移动到release目录
```shell
-svn mv https://dist.apache.org/repos/dist/dev/incubator/tubemq/${release_version}-${rc_version} https://dist.apache.org/repos/dist/release/incubator/tubemq/${release_version} -m "Release ${release_version}"
+svn mv https://dist.apache.org/repos/dist/dev/incubator/inlong/${release_version}-${rc_version} https://dist.apache.org/repos/dist/release/incubator/inlong/${release_version} -m "Release ${release_version}"
```
### 6.3 确认dev和release下的包是否正确
-1. 确认[dev](https://dist.apache.org/repos/dist/dev/incubator/tubemq/)下的`${release_version}-${rc_version}`已被删除
-2. 删除[release](https://dist.apache.org/repos/dist/release/incubator/tubemq/)目录下上一个版本的发布包，这些包会被自动保存在[这里](https://archive.apache.org/dist/incubator/tubemq/)
+1. 确认[dev](https://dist.apache.org/repos/dist/dev/incubator/inlong/)下的`${release_version}-${rc_version}`已被删除
+2. 删除[release](https://dist.apache.org/repos/dist/release/incubator/inlong/)目录下上一个版本的发布包，这些包会被自动保存在[这里](https://archive.apache.org/dist/incubator/inlong/)
```shell
-svn delete https://dist.apache.org/repos/dist/release/incubator/tubemq/${last_release_version} -m "Delete ${last_release_version}"
+svn delete https://dist.apache.org/repos/dist/release/incubator/inlong/${last_release_version} -m "Delete ${last_release_version}"
```
### 6.4 在Apache Staging仓库发布版本
> 请确保所有的artifact都是ok的
1. 登录http://repository.apache.org , 使用Apache账号登录
2. 点击左侧的Staging repositories，
-3. 搜索TubeMQ关键字，选择你最近上传的仓库，投票邮件中指定的仓库
+3. 搜索InLong关键字，选择你最近上传的仓库，投票邮件中指定的仓库
4. 点击上方的`Release`按钮，这个过程会进行一系列检查
**等仓库同步到其他数据源，一般需要24小时**
### 6.5 更新官网链接
-### 6.6. 发邮件到 `dev@tubemq.apache.org` 和 `general@incubator.apache.org`
+### 6.6. 发邮件到 `dev@inlong.apache.org` 和 `general@incubator.apache.org`
**请确保6.4中的仓库已发布成功，一般是在6.4后的24小时后发布邮件**
宣布release邮件模板：
```html
-标题： [ANNOUNCE] Release Apache TubeMQ(incubating) ${release_version}
+标题： [ANNOUNCE] Release Apache InLong(incubating) ${release_version}
内容：
Hi all,
-The Apache TubeMQ(incubating) community is pleased to announce
-that Apache TubeMQ (incubating) ${release_version} has been released!
+The Apache InLong(incubating) community is pleased to announce
+that Apache InLong (incubating) ${release_version} has been released!
-Apache TubeMQ is a trillion-records-scale distributed messaging queue (MQ) system,
+Apache InLong is a trillion-records-scale distributed messaging queue (MQ) system,
focuses on data transmission and storage under massive data.
Download Links: xxx
Release Notes: xxx
-Website: https://tubemq.apache.org/
+Website: https://inlong.apache.org/
-TubeMQ Resources:
-- Issue: https://issues.apache.org/jira/projects/TUBEMQ/issues
-- Mailing list: dev@tubemq.apache.org
+InLong Resources:
+- Issue: https://issues.apache.org/jira/projects/INLONG/issues
+- Mailing list: dev@inlong.apache.org
Thanks
-On behalf of Apache TubeMQ (Incubating) community
+On behalf of Apache InLong (Incubating) community
```
diff --git a/docs/en-us/development/how-to-subscribe.md b/docs/en-us/development/how-to-subscribe.md
index 9bf88e3..e304b9d 100644
--- a/docs/en-us/development/how-to-subscribe.md
+++ b/docs/en-us/development/how-to-subscribe.md
@@ -1,5 +1,5 @@
---
-title: Subscribe Mailing list - Apache TubeMQ
+title: Subscribe Mailing list - Apache InLong
---
# 订阅邮件列表
@@ -8,19 +8,19 @@ title: Subscribe Mailing list - Apache TubeMQ
## 1. 前言
邮件列表是Apache社区用来沟通交流的一种形式，通常来说，Apache社区的许多事情都是由邮件列表来承载，比如：项目的提问与解答、技术讨论、事务决策、版本发布投票等等，
-订阅邮件后，你可以第一时间获取TubeMQ社区的动态，可以与社区保持同步。
+订阅邮件后，你可以第一时间获取InLong社区的动态，可以与社区保持同步。
-#### TubeMQ项目邮件列表
+#### InLong项目邮件列表
|名称|描述|订阅邮件|退订邮件|邮件归档|
|:-----|:--------|:------|:-------|:-----|
-| [dev@inlong.apache.org](mailto:dev@tubemq.apache.org) | 社区活动信息 | [订阅](mailto:dev-subscribe@inlong.apache.org) | [退订](mailto:dev-unsubscribe@inlong.apache.org) | [归档](http://mail-archives.apache.org/mod_mbox/tubemq-dev) |
-| [commits@tubemq.apache.org](mailto:commits@inlong.apache.org) | 代码库更新信息 | [订阅](mailto:commits-subscribe@inlong.apache.org) | [退订](mailto:commits-unsubscribe@inlong.apache.org) | [归档](http://mail-archives.apache.org/mod_mbox/tubemq-commits) |
+| [dev@inlong.apache.org](mailto:dev@inlong.apache.org) | 社区活动信息 | [订阅](mailto:dev-subscribe@inlong.apache.org) | [退订](mailto:dev-unsubscribe@inlong.apache.org) | [归档](http://mail-archives.apache.org/mod_mbox/inlong-dev) |
+| [commits@inlong.apache.org](mailto:commits@inlong.apache.org) | 代码库更新信息 | [订阅](mailto:commits-subscribe@inlong.apache.org) | [退订](mailto:commits-unsubscribe@inlong.apache.org) | [归档](http://mail-archives.apache.org/mod_mbox/inlong-commits) |
## 2. 订阅邮件列表
-**以订阅dev@tubemq.apache.org邮件列表为例**
+**以订阅dev@inlong.apache.org邮件列表为例**
具体步骤如下：
1. 发送一封不包含任何内容或主题的邮件到: `dev-subscribe@inlong.apache.org`
diff --git a/docs/en-us/development/how-to-use-jira.md b/docs/en-us/development/how-to-use-jira.md
index bd09898..877cd0e 100644
--- a/docs/en-us/development/how-to-use-jira.md
+++ b/docs/en-us/development/how-to-use-jira.md
@@ -1,5 +1,5 @@
---
-title: How to Use JIRA - Apache TubeMQ
+title: How to Use JIRA - Apache InLong
---
# JIRA使用指南
@@ -8,17 +8,17 @@ title: How to Use JIRA - Apache TubeMQ
## 0. 前言
JIRA是Apache官方推荐的任务管理平台，被Apache下的大部分项目用于缺陷跟踪、需求收集、任务跟踪，其丰富的功能更加便于
-项目的管理，基于此TubeMQ项目同样使用JIRA来进行管理项目。本文将简单介绍在TubeMQ的开发过程中如何使用JIRA。
+项目的管理，基于此InLong项目同样使用JIRA来进行管理项目。本文将简单介绍在InLong的开发过程中如何使用JIRA。
## 1. 注册并登陆到JIRA
对于新用户而言，使用JIRA前需要注册一个个人账号。步骤如下：
1. 登录[注册](https://issues.apache.org/jira/secure/Signup!default.jspa)页面
2. 填入个人邮箱，姓名等注册信息后即可注册。
-3. 注册成功后登录并进入TubeMQ项目。
+3. 注册成功后登录并进入InLong项目。
## 2. 查看issues
-1. 打开[TubeMQ](https://issues.apache.org/jira/projects/TUBEMQ/issues)项目页面
-2. 可以看到TubeMQ项目的所有issue
+1. 打开[InLong](https://issues.apache.org/jira/projects/INLONG/issues)项目页面
+2. 可以看到InLong项目的所有issue
3. 点击右上角`View all issues and filters`即可进行过滤issue，默认过滤规则包括任务类型、任务状态、负责人及输入关键字等搜索，
也点击右侧的`More`按钮，进行更多字段的过滤筛选。
@@ -29,7 +29,7 @@ JIRA是Apache官方推荐的任务管理平台，被Apache下的大部分项目
- 必填项
- - Project: Apache TubeMQ
+ - Project: Apache InLong
- Issue Type: 选择issue类型，包含：Task, Bug, Feature, Improvement等
- Summary: issue标题，一句话描述该issue所要表达的问题
- Reporter: issue的提交者，即本人
@@ -43,10 +43,10 @@ JIRA是Apache官方推荐的任务管理平台，被Apache下的大部分项目
创建好issue后可以将issue指定给自己或者其他人或者为空。如果指定给自己，此时你就可以准备开发代码解决该问题了。
-**如果你是第一次提交issue，可能该issue无法Assign给自己，此时你可以发邮件至：dev@tubemq.apache.org或联系TubeMQ的PPMC申请加入TubeMQ的contributor列表，加入后即可Assign其他issue给自己**
+**如果你是第一次提交issue，可能该issue无法Assign给自己，此时你可以发邮件至：dev@inlong.apache.org或联系InLong的PPMC申请加入InLong的contributor列表，加入后即可Assign其他issue给自己**
## 4. 关闭issues
-当该issue被解决后，可以关闭该issue，**一般由TubeMQ的PPMC和Committer来关闭issue**。
+当该issue被解决后，可以关闭该issue，**一般由InLong的PPMC和Committer来关闭issue**。
### 4.1. 点击`Resolve Issue`按钮，一般不要点击`Close Issue`,如下图所示：
diff --git a/docs/en-us/development/how-to-verify.md b/docs/en-us/development/how-to-verify.md
index e8dae4d..9db8a60 100644
--- a/docs/en-us/development/how-to-verify.md
+++ b/docs/en-us/development/how-to-verify.md
@@ -1,5 +1,5 @@
---
-title: How to Verify - Apache TubeMQ
+title: How to Verify - Apache InLong
---
# 验证候选版本
@@ -10,7 +10,7 @@ title: How to Verify - Apache TubeMQ
## 1. 下载要发布的候选版本到本地环境
```shell
-svn co https://dist.apache.org/repos/dist/dev/incubator/tubemq/${release_version}-${rc_version}/
+svn co https://dist.apache.org/repos/dist/dev/incubator/inlong/${release_version}-${rc_version}/
```
## 2. 验证上传的版本是否合规
> 开始验证环节，验证包含但不局限于以下内容和形式
@@ -26,7 +26,7 @@ svn co https://dist.apache.org/repos/dist/dev/incubator/tubemq/${release_version
### 2.2 检查gpg签名
- 导入公钥
```shell
- curl https://dist.apache.org/repos/dist/dev/incubator/tubemq/KEYS > KEYS # 下载KEYS
+ curl https://dist.apache.org/repos/dist/dev/incubator/inlong/KEYS > KEYS # 下载KEYS
gpg --import KEYS # 导入KEYS到本地
```
- 信任公钥
@@ -87,15 +87,15 @@ svn co https://dist.apache.org/repos/dist/dev/incubator/tubemq/${release_version
```shell
for i in *.tar.gz; do echo $i; gpg --verify $i.asc $i ; done
#或者
- gpg --verify apache-tubemq-${release_version}-src.tar.gz.asc apache-tubemq-${release_version}-src.tar.gz
+ gpg --verify apache-inlong-${release_version}-src.tar.gz.asc apache-inlong-${release_version}-src.tar.gz
# 如果上传二进制包，则同样需要检查二进制包的签名是否正确
- gpg --verify apache-tubemq-server-${release_version}-bin.tar.gz.asc apache-tubemq-server-${release_version}-bin.tar.gz
- gpg --verify apache-tubemq-client-${release_version}-bin.tar.gz.asc apache-tubemq-client-${release_version}-bin.tar.gz
+ gpg --verify apache-inlong-server-${release_version}-bin.tar.gz.asc apache-inlong-server-${release_version}-bin.tar.gz
+ gpg --verify apache-inlong-client-${release_version}-bin.tar.gz.asc apache-inlong-client-${release_version}-bin.tar.gz
```
- 检查结果
> 出现类似以下内容则说明签名正确，关键字：**`Good signature`**
```shell
-apache-tubemq-0.3.0-incubating-src.tar.gz
+apache-inlong-0.3.0-incubating-src.tar.gz
gpg: Signature made Sat May 30 11:45:01 2020 CST
gpg: using RSA key 9B12C2228BDFF4F4CFE849445EF3A66D57EC647A
gpg: Good signature from "Guangxu Cheng <gx...@apache.org>" [ultimate]gular2
@@ -106,17 +106,17 @@ gpg: Good signature from "Guangxu Cheng <gx...@apache.org>" [ultimate]gular2
```shell
for i in *.tar.gz; do echo $i; gpg --print-md SHA512 $i; done
#或者
-gpg --print-md SHA512 apache-tubemq-${release_version}-src.tar.gz
+gpg --print-md SHA512 apache-inlong-${release_version}-src.tar.gz
# 如果上传二进制包，则同样需要检查二进制包的sha512哈希
-gpg --print-md SHA512 apache-tubemq-server-${release_version}-bin.tar.gz
-gpg --print-md SHA512 apache-tubemq-client-${release_version}-bin.tar.gz
+gpg --print-md SHA512 apache-inlong-server-${release_version}-bin.tar.gz
+gpg --print-md SHA512 apache-inlong-client-${release_version}-bin.tar.gz
# 或者
for i in *.tar.gz.sha512; do echo $i; sha512sum -c $i; done
```
### 2.4. 检查源码包的文件内容
- 解压缩`apache-tubemq-${release_version}-src.tar.gz`，进行如下检查:
+ 解压缩`apache-inlong-${release_version}-src.tar.gz`，进行如下检查:
- DISCLAIMER文件是否存在及内容是否正确
- LICENSE and NOTICE文件是否存在及内容是否正确
@@ -126,8 +126,8 @@ for i in *.tar.gz.sha512; do echo $i; sha512sum -c $i; done
- ....
### 2.5 检查二进制包(如果上传了二进制包)
- 解压缩`apache-tubemq-client-${release_version}-src.tar.gz`和`
- apache-tubemq-server-${release_version}-src.tar.gz`，进行如下检查:
+ 解压缩`apache-inlong-client-${release_version}-src.tar.gz`和`
+ apache-inlong-server-${release_version}-src.tar.gz`，进行如下检查:
- DISCLAIMER文件是否存在及内容是否正确
- LICENSE and NOTICE文件是否存在及内容是否正确
- 能否正常部署成功
diff --git a/docs/en-us/development/how-to-vote-a-committer-ppmc.md b/docs/en-us/development/how-to-vote-a-committer-ppmc.md
index 84f1c4e..4047269 100644
--- a/docs/en-us/development/how-to-vote-a-committer-ppmc.md
+++ b/docs/en-us/development/how-to-vote-a-committer-ppmc.md
@@ -1,46 +1,46 @@
---
-title: How to vote a Committer or PPMC - Apache TubeMQ
+title: How to vote a Committer or PPMC - Apache InLong
---
-# 成为TubeMQ Committer 或 PPMC 的投票过程
+# 成为InLong Committer 或 PPMC 的投票过程
<font color="#dd0000" size="4">TODO: This page needs to be translated into English. If you are interested, just do it.</font>
-1. TubeMQ的PPMC成员发现社区贡献者任何有价值的贡献并取得候选人本人同意后，在TubeMQ的private邮件列表发起讨论；
- > [DISCUSS] YYYYY as a TubeMQ XXXXXX
+1. InLong的PPMC成员发现社区贡献者任何有价值的贡献并取得候选人本人同意后，在InLong的private邮件列表发起讨论；
+ > [DISCUSS] YYYYY as a InLong XXXXXX
邮件里要把对方的贡献，可以查看的出处说清楚，便于大家讨论分析；讨论邮件将持续至少72个小时，项目组成员，包括mentor们会针对提议邮件充分发表自己的看法；
-2. 不管有没有分歧，在讨论邮件过后，投票发起者需要在在TubeMQ的private邮件列表发起Committer或PPMC的选举投票；
- > [VOTE] YYYYY as a TubeMQ XXXXXX
+2. 不管有没有分歧，在讨论邮件过后，投票发起者需要在在InLong的private邮件列表发起Committer或PPMC的选举投票；
+ > [VOTE] YYYYY as a InLong XXXXXX
投票邮件至少持续72小时，至少要3票+1通过，如果0票或者有1票-1票则投票失败；如果-1，需要把问题说清楚，便于大家理解和知晓
3. 投票邮件结束后，由投票发起者在投票线上总结并提醒投票结束，并发投票总结邮件；
- > [RESULTS][VOTE] YYYYY as a TubeMQ XXXXXX
+ > [RESULTS][VOTE] YYYYY as a InLong XXXXXX
4. 投票总结邮件发出后，投票发起者要给候选人发起邀请邮件，该邀请邮件需要候选人通过指定的邮箱回复接受或者拒绝；
- > [Invitation] Invitation to join Apache TubeMQ as a XXXXXX
+ > [Invitation] Invitation to join Apache InLong as a XXXXXX
- 邮件主送邀请人，抄送private@tubemq.apache.org
+ 邮件主送邀请人，抄送private@inlong.apache.org
5. 候选人接受邀请后，如果候选人没有apache邮箱帐号，投票发起者需要协助候选人按照指引创建apache帐号；
6. 如果选举的是PPMC，在候选人的Apache帐号创建完成后，投票发起者还需要向IPMC的private邮件组发送知会邮件，并等待至少72小时;
- > [NOTICE] XXXXXX for TubeMQ PPMC
+ > [NOTICE] XXXXXX for InLong PPMC
- 邮件主送private@incubator.apache.org，抄送private@tubemq.apache.org，IPMC们会分析合规性，直到没有疑义。
+ 邮件主送private@incubator.apache.org，抄送private@inlong.apache.org，IPMC们会分析合规性，直到没有疑义。
7. 如果以上内容都以完成，投票发起者还需要做如下2件事情：
7.1 向项目负责人申请添加项目组成员，开通jira及apache项目的权限帐号。
- 7.2 向dev@tubemq.apache.org邮件组发通知邮件：
+ 7.2 向dev@inlong.apache.org邮件组发通知邮件：
> [ANNOUNCE] New XXXXXX: YYYYY
diff --git a/docs/en-us/download/download.md b/docs/en-us/download/download.md
index bb31430..7cd7e68 100644
--- a/docs/en-us/download/download.md
+++ b/docs/en-us/download/download.md
@@ -1,9 +1,9 @@
---
-title: Download - Apache TubeMQ
+title: Download - Apache InLong
---
## Download links
- Use the links below to download the Apache TubeMQ Releases, the latest release is 0.8.0.
+ Use the links below to download the Apache InLong Releases, the latest release is 0.8.0.
## 0.8.0 release
diff --git a/docs/en-us/download/release-0.3.0.md b/docs/en-us/download/release-0.3.0.md
index 9184528..82af8f2 100644
--- a/docs/en-us/download/release-0.3.0.md
+++ b/docs/en-us/download/release-0.3.0.md
@@ -1,65 +1,65 @@
---
-title: Download - Apache TubeMQ
+title: Download - Apache InLong
---
-# Download the TubeMQ releases
+# Download the InLong releases
-Use the links below to download the Apache TubeMQ from one of our mirrors.
+Use the links below to download the Apache InLong from one of our mirrors.
-## TubeMQ
+## InLong
| Date | Version| Comment | Downloads |
|:---:|:--:|:--:|:--:|
-| June. 6th, 2020 | 0.3.0 | Source | [[SRC](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.3.0-incubating/apache-tubemq-0.3.0-incubating-src.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.3.0-incubating/apache-tubemq-0.3.0-incubating-src.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.3.0-incubating/apache-tubemq-0.3.0-incubating-src.tar.gz.sha512)] |
-| | | Client | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.3.0-incubating/apache-tubemq-client-0.3.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.3.0-incubating/apache-tubemq-client-0.3.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.3.0-incubating/apache-tubemq-client-0.3.0-incubating-bin.tar.gz.sha512)] |
-| | | Server | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.3.0-incubating/apache-tubemq-server-0.3.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.3.0-incubating/apache-tubemq-server-0.3.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.3.0-incubating/apache-tubemq-server-0.3.0-incubating-bin.tar.gz.sha512)] |
+| June. 6th, 2020 | 0.3.0 | Source | [[SRC](https://archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-0.3.0-incubating-src.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-0.3.0-incubating-src.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-0.3.0-incubating-src.tar.gz.sha512)] |
+| | | Client | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-client-0.3.0-incubating-bin.tar.gz)] [[PGP](archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-client-0.3.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-client-0.3.0-incubating-bin.tar.gz.sha512)] |
+| | | Server | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-server-0.3.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-server-0.3.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-server-0.3.0-incubating-bin.tar.gz.sha512)] |
## Release Notes
### New Features
- - [[TUBEMQ-42](https://issues.apache.org/jira/browse/TUBEMQ-42)] Add peer information about message received Major New Feature
+ - [[INLONG-42](https://issues.apache.org/jira/browse/INLONG-42)] Add peer information about message received Major New Feature
### Improvements
- - [[TUBEMQ-7](https://issues.apache.org/jira/browse/TUBEMQ-7)] Using StringBuilder instead of StringBuffer in BaseResult
- - [[TUBEMQ-9](https://issues.apache.org/jira/browse/TUBEMQ-9)] Remove some unnecessary code
- - [[TUBEMQ-16](https://issues.apache.org/jira/browse/TUBEMQ-16)] Correct BdbStoreService#isPrimaryNodeActived to BdbStoreService#isPrimaryNodeActive
- - [[TUBEMQ-18](https://issues.apache.org/jira/browse/TUBEMQ-18)] Correct TMaster#idGenerater to TMaster#idGenerator
- - [[TUBEMQ-19](https://issues.apache.org/jira/browse/TUBEMQ-19)] Correct parameter names to fit in camel case
- - [[TUBEMQ-20](https://issues.apache.org/jira/browse/TUBEMQ-20)] Correct DefaultLoadBalancer#balance parameter
- - [[TUBEMQ-21](https://issues.apache.org/jira/browse/TUBEMQ-21)] Change version number from x.y-SNAPSHOT to x.y.z-incubating-SNAPSHOT
- - [[TUBEMQ-22](https://issues.apache.org/jira/browse/TUBEMQ-22)] Correct ClientSubInfo#getTopicProcesser -> ClientSubInfo#getTopicProcessor
- - [[TUBEMQ-23](https://issues.apache.org/jira/browse/TUBEMQ-23)] Improve project README content introduction
- - [[TUBEMQ-24](https://issues.apache.org/jira/browse/TUBEMQ-24)] Add NOTICE and adjust LICENSE
- - [[TUBEMQ-26](https://issues.apache.org/jira/browse/TUBEMQ-26)] correct spelling (difftime-> diffTime)
- - [[TUBEMQ-27](https://issues.apache.org/jira/browse/TUBEMQ-27)] replace StringBuffer with StringBuilder
- - [[TUBEMQ-28](https://issues.apache.org/jira/browse/TUBEMQ-28)] ignore path error
- - [[TUBEMQ-29](https://issues.apache.org/jira/browse/TUBEMQ-29)] Change the package name to org.apache.tubemq.""
- - [[TUBEMQ-33](https://issues.apache.org/jira/browse/TUBEMQ-33)] refactor enum implement from annoymouse inner class
- - [[TUBEMQ-38](https://issues.apache.org/jira/browse/TUBEMQ-38)] Correct DefaultLoadBalancer#balance parameter
- - [[TUBEMQ-39](https://issues.apache.org/jira/browse/TUBEMQ-39)] Optimize the loadMessageStores() logic
- - [[TUBEMQ-40](https://issues.apache.org/jira/browse/TUBEMQ-40)] Optimize message disk store classes's logic
- - [[TUBEMQ-43](https://issues.apache.org/jira/browse/TUBEMQ-43)] Add DeletePolicy's value check
- - [[TUBEMQ-44](https://issues.apache.org/jira/browse/TUBEMQ-44)] Remove unnecessary synchronized definition of shutdown () function
- - [[TUBEMQ-49](https://issues.apache.org/jira/browse/TUBEMQ-49)] setTimeoutTime change to updTimeoutTime
- - [[TUBEMQ-50](https://issues.apache.org/jira/browse/TUBEMQ-50)] Replace fastjson to gson
+ - [[INLONG-7](https://issues.apache.org/jira/browse/INLONG-7)] Using StringBuilder instead of StringBuffer in BaseResult
+ - [[INLONG-9](https://issues.apache.org/jira/browse/INLONG-9)] Remove some unnecessary code
+ - [[INLONG-16](https://issues.apache.org/jira/browse/INLONG-16)] Correct BdbStoreService#isPrimaryNodeActived to BdbStoreService#isPrimaryNodeActive
+ - [[INLONG-18](https://issues.apache.org/jira/browse/INLONG-18)] Correct TMaster#idGenerater to TMaster#idGenerator
+ - [[INLONG-19](https://issues.apache.org/jira/browse/INLONG-19)] Correct parameter names to fit in camel case
+ - [[INLONG-20](https://issues.apache.org/jira/browse/INLONG-20)] Correct DefaultLoadBalancer#balance parameter
+ - [[INLONG-21](https://issues.apache.org/jira/browse/INLONG-21)] Change version number from x.y-SNAPSHOT to x.y.z-incubating-SNAPSHOT
+ - [[INLONG-22](https://issues.apache.org/jira/browse/INLONG-22)] Correct ClientSubInfo#getTopicProcesser -> ClientSubInfo#getTopicProcessor
+ - [[INLONG-23](https://issues.apache.org/jira/browse/INLONG-23)] Improve project README content introduction
+ - [[INLONG-24](https://issues.apache.org/jira/browse/INLONG-24)] Add NOTICE and adjust LICENSE
+ - [[INLONG-26](https://issues.apache.org/jira/browse/INLONG-26)] correct spelling (difftime-> diffTime)
+ - [[INLONG-27](https://issues.apache.org/jira/browse/INLONG-27)] replace StringBuffer with StringBuilder
+ - [[INLONG-28](https://issues.apache.org/jira/browse/INLONG-28)] ignore path error
+ - [[INLONG-29](https://issues.apache.org/jira/browse/INLONG-29)] Change the package name to org.apache.tubemq.""
+ - [[INLONG-33](https://issues.apache.org/jira/browse/INLONG-33)] refactor enum implement from annoymouse inner class
+ - [[INLONG-38](https://issues.apache.org/jira/browse/INLONG-38)] Correct DefaultLoadBalancer#balance parameter
+ - [[INLONG-39](https://issues.apache.org/jira/browse/INLONG-39)] Optimize the loadMessageStores() logic
+ - [[INLONG-40](https://issues.apache.org/jira/browse/INLONG-40)] Optimize message disk store classes's logic
+ - [[INLONG-43](https://issues.apache.org/jira/browse/INLONG-43)] Add DeletePolicy's value check
+ - [[INLONG-44](https://issues.apache.org/jira/browse/INLONG-44)] Remove unnecessary synchronized definition of shutdown () function
+ - [[INLONG-49](https://issues.apache.org/jira/browse/INLONG-49)] setTimeoutTime change to updTimeoutTime
+ - [[INLONG-50](https://issues.apache.org/jira/browse/INLONG-50)] Replace fastjson to gson
### Bug Fixes
- - [[TUBEMQ-10](https://issues.apache.org/jira/browse/TUBEMQ-10)] Fix Javadoc error
- - [[TUBEMQ-14](https://issues.apache.org/jira/browse/TUBEMQ-14)] Some compilation errors
- - [[TUBEMQ-15](https://issues.apache.org/jira/browse/TUBEMQ-15)] Correct typo in http_access_API_definition.md
- - [[TUBEMQ-32](https://issues.apache.org/jira/browse/TUBEMQ-32)] File path not match with package name in tubemq-client module
- - [[TUBEMQ-35](https://issues.apache.org/jira/browse/TUBEMQ-35)] check illegal package's field value
- - [[TUBEMQ-36](https://issues.apache.org/jira/browse/TUBEMQ-36)] Remove unnecessary removefirst() function printing
- - [[TUBEMQ-37](https://issues.apache.org/jira/browse/TUBEMQ-37)] Offset is set to 0 when Broker goes offline
- - [[TUBEMQ-45](https://issues.apache.org/jira/browse/TUBEMQ-45)] Check groupName with checkHostName function
- - [[TUBEMQ-48](https://issues.apache.org/jira/browse/TUBEMQ-48)] No timeout when setting consumer timeout
- - [[TUBEMQ-59](https://issues.apache.org/jira/browse/TUBEMQ-59)] Null pointer exception is thrown while constructing ConsumerConfig with MasterInfo
- - [[TUBEMQ-62](https://issues.apache.org/jira/browse/TUBEMQ-62)] consumed and set consumerConfig.setConsumeModel (0) for the first time
- - [[TUBEMQ-66](https://issues.apache.org/jira/browse/TUBEMQ-66)] TubeSingleSessionFactory shutdown bug
- - [[TUBEMQ-85](https://issues.apache.org/jira/browse/TUBEMQ-85)] There is NPE when creating PullConsumer with TubeSingleSessionFactory
- - [[TUBEMQ-88](https://issues.apache.org/jira/browse/TUBEMQ-88)] Broker does not take effect after the deletePolicy value is changed
- - [[TUBEMQ-149](https://issues.apache.org/jira/browse/TUBEMQ-149)] Some of the consumers stop consuming their corresponding partitions and never release the partition to others
- - [[TUBEMQ-153](https://issues.apache.org/jira/browse/TUBEMQ-153)] Some of the consumers stop consuming their corresponding partitions and never release the partition to others
- - [[TUBEMQ-165](https://issues.apache.org/jira/browse/TUBEMQ-165)] Remove unnecessary fiiles
+ - [[INLONG-10](https://issues.apache.org/jira/browse/INLONG-10)] Fix Javadoc error
+ - [[INLONG-14](https://issues.apache.org/jira/browse/INLONG-14)] Some compilation errors
+ - [[INLONG-15](https://issues.apache.org/jira/browse/INLONG-15)] Correct typo in http_access_API_definition.md
+ - [[INLONG-32](https://issues.apache.org/jira/browse/INLONG-32)] File path not match with package name in tubemq-client module
+ - [[INLONG-35](https://issues.apache.org/jira/browse/INLONG-35)] check illegal package's field value
+ - [[INLONG-36](https://issues.apache.org/jira/browse/INLONG-36)] Remove unnecessary removefirst() function printing
+ - [[INLONG-37](https://issues.apache.org/jira/browse/INLONG-37)] Offset is set to 0 when Broker goes offline
+ - [[INLONG-45](https://issues.apache.org/jira/browse/INLONG-45)] Check groupName with checkHostName function
+ - [[INLONG-48](https://issues.apache.org/jira/browse/INLONG-48)] No timeout when setting consumer timeout
+ - [[INLONG-59](https://issues.apache.org/jira/browse/INLONG-59)] Null pointer exception is thrown while constructing ConsumerConfig with MasterInfo
+ - [[INLONG-62](https://issues.apache.org/jira/browse/INLONG-62)] consumed and set consumerConfig.setConsumeModel (0) for the first time
+ - [[INLONG-66](https://issues.apache.org/jira/browse/INLONG-66)] TubeSingleSessionFactory shutdown bug
+ - [[INLONG-85](https://issues.apache.org/jira/browse/INLONG-85)] There is NPE when creating PullConsumer with TubeSingleSessionFactory
+ - [[INLONG-88](https://issues.apache.org/jira/browse/INLONG-88)] Broker does not take effect after the deletePolicy value is changed
+ - [[INLONG-149](https://issues.apache.org/jira/browse/INLONG-149)] Some of the consumers stop consuming their corresponding partitions and never release the partition to others
+ - [[INLONG-153](https://issues.apache.org/jira/browse/INLONG-153)] Some of the consumers stop consuming their corresponding partitions and never release the partition to others
+ - [[INLONG-165](https://issues.apache.org/jira/browse/INLONG-165)] Remove unnecessary fiiles
diff --git a/docs/en-us/download/release-0.5.0.md b/docs/en-us/download/release-0.5.0.md
index e6c4ef1..af5487a 100644
--- a/docs/en-us/download/release-0.5.0.md
+++ b/docs/en-us/download/release-0.5.0.md
@@ -1,104 +1,104 @@
---
-title: Download - Apache TubeMQ
+title: Download - Apache InLong
---
-# Download the TubeMQ releases
+# Download the InLong releases
-Use the links below to download the Apache TubeMQ from one of our mirrors.
+Use the links below to download the Apache InLong from one of our mirrors.
-## TubeMQ
+## InLong
| Date | Version| Comment | Downloads |
|:---:|:--:|:--:|:--:|
-| August. 4th, 2020 | 0.5.0 | Source | [[SRC](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.5.0-incubating/apache-tubemq-0.5.0-incubating-src.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.5.0-incubating/apache-tubemq-0.5.0-incubating-src.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.5.0-incubating/apache-tubemq-0.5.0-incubating-src.tar.gz.sha512)] |
-| | | Client | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.5.0-incubating/apache-tubemq-client-0.5.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.5.0-incubating/apache-tubemq-client-0.5.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.5.0-incubating/apache-tubemq-client-0.5.0-incubating-bin.tar.gz.sha512)] |
-| | | Server | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.5.0-incubating/apache-tubemq-server-0.5.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.5.0-incubating/apache-tubemq-server-0.5.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.5.0-incubating/apache-tubemq-server-0.5.0-incubating-bin.tar.gz.sha512)] |
+| August. 4th, 2020 | 0.5.0 | Source | [[SRC](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-0.5.0-incubating-src.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-0.5.0-incubating-src.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-0.5.0-incubating-src.tar.gz.sha512)] |
+| | | Client | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-client-0.5.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-client-0.5.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-client-0.5.0-incubating-bin.tar.gz.sha512)] |
+| | | Server | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-server-0.5.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-server-0.5.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-server-0.5.0-incubating-bin.tar.gz.sha512)] |
## Release Notes
### New Features
- - [[TUBEMQ-122](https://issues.apache.org/jira/browse/TUBEMQ-122)] Increase JAVA version collection of SDK environment
- - [[TUBEMQ-163](https://issues.apache.org/jira/browse/TUBEMQ-163)] Flume sink for TubeMQ
- - [[TUBEMQ-197](https://issues.apache.org/jira/browse/TUBEMQ-197)] Support TubeMQ connector for Apache Flink
- - [[TUBEMQ-238](https://issues.apache.org/jira/browse/TUBEMQ-238)] Support TubeMQ connector for Apache Spark Streaming
- - [[TUBEMQ-239](https://issues.apache.org/jira/browse/TUBEMQ-239)] support deployment on kubernetes
+ - [[INLONG-122](https://issues.apache.org/jira/browse/INLONG-122)] Increase JAVA version collection of SDK environment
+ - [[INLONG-163](https://issues.apache.org/jira/browse/INLONG-163)] Flume sink for TubeMQ
+ - [[INLONG-197](https://issues.apache.org/jira/browse/INLONG-197)] Support TubeMQ connector for Apache Flink
+ - [[INLONG-238](https://issues.apache.org/jira/browse/INLONG-238)] Support TubeMQ connector for Apache Spark Streaming
+ - [[INLONG-239](https://issues.apache.org/jira/browse/INLONG-239)] support deployment on kubernetes
### IMPROVEMENTS:
- - [[TUBEMQ-46](https://issues.apache.org/jira/browse/TUBEMQ-46)] Correct some spelling issues
- - [[TUBEMQ-53](https://issues.apache.org/jira/browse/TUBEMQ-53)] fix some typos
- - [[TUBEMQ-55](https://issues.apache.org/jira/browse/TUBEMQ-55)] fix some typos
- - [[TUBEMQ-57](https://issues.apache.org/jira/browse/TUBEMQ-57)] fix some typos
- - [[TUBEMQ-58](https://issues.apache.org/jira/browse/TUBEMQ-58)] fix some typos
- - [[TUBEMQ-60](https://issues.apache.org/jira/browse/TUBEMQ-60)] Remove unnecessary synchronized & using IllegalArgumentException instead of IllegalStateException
- - [[TUBEMQ-61](https://issues.apache.org/jira/browse/TUBEMQ-61)] minor update & fix some typos
- - [[TUBEMQ-64](https://issues.apache.org/jira/browse/TUBEMQ-64)] minor update & fix some typos
- - [[TUBEMQ-67](https://issues.apache.org/jira/browse/TUBEMQ-67)] remove synchronized & fix some typos
- - [[TUBEMQ-71](https://issues.apache.org/jira/browse/TUBEMQ-71)] using IllegalArgumentException & fix some typos
- - [[TUBEMQ-73](https://issues.apache.org/jira/browse/TUBEMQ-73)] remove duplicate codes & some minor updates
- - [[TUBEMQ-74](https://issues.apache.org/jira/browse/TUBEMQ-74)] minor updates for DefaultBdbStoreService
- - [[TUBEMQ-75](https://issues.apache.org/jira/browse/TUBEMQ-75)] remove unused Logger
- - [[TUBEMQ-76](https://issues.apache.org/jira/browse/TUBEMQ-76)] rename the classes
- - [[TUBEMQ-77](https://issues.apache.org/jira/browse/TUBEMQ-77)] fix typo
- - [[TUBEMQ-79](https://issues.apache.org/jira/browse/TUBEMQ-79)] fix typo
- - [[TUBEMQ-80](https://issues.apache.org/jira/browse/TUBEMQ-80)] Fix some typos
- - [[TUBEMQ-82](https://issues.apache.org/jira/browse/TUBEMQ-82)] Fix some typos & update comments
- - [[TUBEMQ-83](https://issues.apache.org/jira/browse/TUBEMQ-83)] Fix some typos
- - [[TUBEMQ-87](https://issues.apache.org/jira/browse/TUBEMQ-87)] Minor updates
- - [[TUBEMQ-89](https://issues.apache.org/jira/browse/TUBEMQ-89)] Minor updates
- - [[TUBEMQ-90](https://issues.apache.org/jira/browse/TUBEMQ-90)] Remove unused codes in TubeBroker
- - [[TUBEMQ-91](https://issues.apache.org/jira/browse/TUBEMQ-91)] replace explicit type with <>
- - [[TUBEMQ-93](https://issues.apache.org/jira/browse/TUBEMQ-93)] Substitute the parameterized type for client module & missed server module
- - [[TUBEMQ-94](https://issues.apache.org/jira/browse/TUBEMQ-94)] Substitute the parameterized type for core module
- - [[TUBEMQ-95](https://issues.apache.org/jira/browse/TUBEMQ-95)] Substitute the parameterized type for server module
- - [[TUBEMQ-96](https://issues.apache.org/jira/browse/TUBEMQ-96)] Fix typo & use IllegalArgumentException
- - [[TUBEMQ-98](https://issues.apache.org/jira/browse/TUBEMQ-98)] Fix typo & Simplify 'instanceof' judgment
- - [[TUBEMQ-100](https://issues.apache.org/jira/browse/TUBEMQ-100)] Fix typos & remove unused codes
- - [[TUBEMQ-101](https://issues.apache.org/jira/browse/TUBEMQ-101)] Optimize code & Fix type
- - [[TUBEMQ-103](https://issues.apache.org/jira/browse/TUBEMQ-103)] Substitute Chinese comments with English
- - [[TUBEMQ-108](https://issues.apache.org/jira/browse/TUBEMQ-108)] About maven jdk version configuration problem
- - [[TUBEMQ-127](https://issues.apache.org/jira/browse/TUBEMQ-127)] Fixed a bug & minor changes
- - [[TUBEMQ-128](https://issues.apache.org/jira/browse/TUBEMQ-128)] Shorten the log clearup check cycle
- - [[TUBEMQ-138](https://issues.apache.org/jira/browse/TUBEMQ-138)] Optimize core module test case code
- - [[TUBEMQ-141](https://issues.apache.org/jira/browse/TUBEMQ-141)] Remove the requirement to provide localHostIP
- - [[TUBEMQ-152](https://issues.apache.org/jira/browse/TUBEMQ-152)] Modify the master.ini file's annotations
- - [[TUBEMQ-154](https://issues.apache.org/jira/browse/TUBEMQ-154)] Modify the wrong comment & Minor changes for example module
- - [[TUBEMQ-155](https://issues.apache.org/jira/browse/TUBEMQ-155)] Use enum class for consume position
- - [[TUBEMQ-156](https://issues.apache.org/jira/browse/TUBEMQ-156)] Update for README.md
- - [[TUBEMQ-166](https://issues.apache.org/jira/browse/TUBEMQ-166)] Hide `bdbStore` configs in master.ini
- - [[TUBEMQ-167](https://issues.apache.org/jira/browse/TUBEMQ-167)] Change to relative paths in default configs
- - [[TUBEMQ-168](https://issues.apache.org/jira/browse/TUBEMQ-168)] Example module: remove localhost IP configuration parameters
- - [[TUBEMQ-170](https://issues.apache.org/jira/browse/TUBEMQ-170)] improve build/deployment/configuration for quick start
- - [[TUBEMQ-196](https://issues.apache.org/jira/browse/TUBEMQ-196)] use log to print exception
- - [[TUBEMQ-201](https://issues.apache.org/jira/browse/TUBEMQ-201)] [Website] Adjust user guide & fix demo example
- - [[TUBEMQ-202](https://issues.apache.org/jira/browse/TUBEMQ-202)] Add protobuf protocol syntax declaration
- - [[TUBEMQ-213](https://issues.apache.org/jira/browse/TUBEMQ-213)] Optimize code & Minor changes
- - [[TUBEMQ-216](https://issues.apache.org/jira/browse/TUBEMQ-216)] use ThreadUtil.sleep replace Thread.sleep
- - [[TUBEMQ-222](https://issues.apache.org/jira/browse/TUBEMQ-222)] Optimize code: Unnecessary boxing/unboxing conversion
- - [[TUBEMQ-224](https://issues.apache.org/jira/browse/TUBEMQ-224)] Fixed: Unnecessary conversion to string inspection for server module
- - [[TUBEMQ-226](https://issues.apache.org/jira/browse/TUBEMQ-226)] Add Windows startup scripts
- - [[TUBEMQ-227](https://issues.apache.org/jira/browse/TUBEMQ-227)] remove build guide in docker-build readme
- - [[TUBEMQ-232](https://issues.apache.org/jira/browse/TUBEMQ-232)] TubeBroker#register2Master, reconnect and wait
- - [[TUBEMQ-234](https://issues.apache.org/jira/browse/TUBEMQ-234)] Add .asf.yaml to change notifications
- - [[TUBEMQ-235](https://issues.apache.org/jira/browse/TUBEMQ-235)] Add code coverage supporting for pull request created.
- - [[TUBEMQ-237](https://issues.apache.org/jira/browse/TUBEMQ-237)] add maven module build for docker image
+ - [[INLONG-46](https://issues.apache.org/jira/browse/INLONG-46)] Correct some spelling issues
+ - [[INLONG-53](https://issues.apache.org/jira/browse/INLONG-53)] fix some typos
+ - [[INLONG-55](https://issues.apache.org/jira/browse/INLONG-55)] fix some typos
+ - [[INLONG-57](https://issues.apache.org/jira/browse/INLONG-57)] fix some typos
+ - [[INLONG-58](https://issues.apache.org/jira/browse/INLONG-58)] fix some typos
+ - [[INLONG-60](https://issues.apache.org/jira/browse/INLONG-60)] Remove unnecessary synchronized & using IllegalArgumentException instead of IllegalStateException
+ - [[INLONG-61](https://issues.apache.org/jira/browse/INLONG-61)] minor update & fix some typos
+ - [[INLONG-64](https://issues.apache.org/jira/browse/INLONG-64)] minor update & fix some typos
+ - [[INLONG-67](https://issues.apache.org/jira/browse/INLONG-67)] remove synchronized & fix some typos
+ - [[INLONG-71](https://issues.apache.org/jira/browse/INLONG-71)] using IllegalArgumentException & fix some typos
+ - [[INLONG-73](https://issues.apache.org/jira/browse/INLONG-73)] remove duplicate codes & some minor updates
+ - [[INLONG-74](https://issues.apache.org/jira/browse/INLONG-74)] minor updates for DefaultBdbStoreService
+ - [[INLONG-75](https://issues.apache.org/jira/browse/INLONG-75)] remove unused Logger
+ - [[INLONG-76](https://issues.apache.org/jira/browse/INLONG-76)] rename the classes
+ - [[INLONG-77](https://issues.apache.org/jira/browse/INLONG-77)] fix typo
+ - [[INLONG-79](https://issues.apache.org/jira/browse/INLONG-79)] fix typo
+ - [[INLONG-80](https://issues.apache.org/jira/browse/INLONG-80)] Fix some typos
+ - [[INLONG-82](https://issues.apache.org/jira/browse/INLONG-82)] Fix some typos & update comments
+ - [[INLONG-83](https://issues.apache.org/jira/browse/INLONG-83)] Fix some typos
+ - [[INLONG-87](https://issues.apache.org/jira/browse/INLONG-87)] Minor updates
+ - [[INLONG-89](https://issues.apache.org/jira/browse/INLONG-89)] Minor updates
+ - [[INLONG-90](https://issues.apache.org/jira/browse/INLONG-90)] Remove unused codes in TubeBroker
+ - [[INLONG-91](https://issues.apache.org/jira/browse/INLONG-91)] replace explicit type with <>
+ - [[INLONG-93](https://issues.apache.org/jira/browse/INLONG-93)] Substitute the parameterized type for client module & missed server module
+ - [[INLONG-94](https://issues.apache.org/jira/browse/INLONG-94)] Substitute the parameterized type for core module
+ - [[INLONG-95](https://issues.apache.org/jira/browse/INLONG-95)] Substitute the parameterized type for server module
+ - [[INLONG-96](https://issues.apache.org/jira/browse/INLONG-96)] Fix typo & use IllegalArgumentException
+ - [[INLONG-98](https://issues.apache.org/jira/browse/INLONG-98)] Fix typo & Simplify 'instanceof' judgment
+ - [[INLONG-100](https://issues.apache.org/jira/browse/INLONG-100)] Fix typos & remove unused codes
+ - [[INLONG-101](https://issues.apache.org/jira/browse/INLONG-101)] Optimize code & Fix type
+ - [[INLONG-103](https://issues.apache.org/jira/browse/INLONG-103)] Substitute Chinese comments with English
+ - [[INLONG-108](https://issues.apache.org/jira/browse/INLONG-108)] About maven jdk version configuration problem
+ - [[INLONG-127](https://issues.apache.org/jira/browse/INLONG-127)] Fixed a bug & minor changes
+ - [[INLONG-128](https://issues.apache.org/jira/browse/INLONG-128)] Shorten the log clearup check cycle
+ - [[INLONG-138](https://issues.apache.org/jira/browse/INLONG-138)] Optimize core module test case code
+ - [[INLONG-141](https://issues.apache.org/jira/browse/INLONG-141)] Remove the requirement to provide localHostIP
+ - [[INLONG-152](https://issues.apache.org/jira/browse/INLONG-152)] Modify the master.ini file's annotations
+ - [[INLONG-154](https://issues.apache.org/jira/browse/INLONG-154)] Modify the wrong comment & Minor changes for example module
+ - [[INLONG-155](https://issues.apache.org/jira/browse/INLONG-155)] Use enum class for consume position
+ - [[INLONG-156](https://issues.apache.org/jira/browse/INLONG-156)] Update for README.md
+ - [[INLONG-166](https://issues.apache.org/jira/browse/INLONG-166)] Hide `bdbStore` configs in master.ini
+ - [[INLONG-167](https://issues.apache.org/jira/browse/INLONG-167)] Change to relative paths in default configs
+ - [[INLONG-168](https://issues.apache.org/jira/browse/INLONG-168)] Example module: remove localhost IP configuration parameters
+ - [[INLONG-170](https://issues.apache.org/jira/browse/INLONG-170)] improve build/deployment/configuration for quick start
+ - [[INLONG-196](https://issues.apache.org/jira/browse/INLONG-196)] use log to print exception
+ - [[INLONG-201](https://issues.apache.org/jira/browse/INLONG-201)] [Website] Adjust user guide & fix demo example
+ - [[INLONG-202](https://issues.apache.org/jira/browse/INLONG-202)] Add protobuf protocol syntax declaration
+ - [[INLONG-213](https://issues.apache.org/jira/browse/INLONG-213)] Optimize code & Minor changes
+ - [[INLONG-216](https://issues.apache.org/jira/browse/INLONG-216)] use ThreadUtil.sleep replace Thread.sleep
+ - [[INLONG-222](https://issues.apache.org/jira/browse/INLONG-222)] Optimize code: Unnecessary boxing/unboxing conversion
+ - [[INLONG-224](https://issues.apache.org/jira/browse/INLONG-224)] Fixed: Unnecessary conversion to string inspection for server module
+ - [[INLONG-226](https://issues.apache.org/jira/browse/INLONG-226)] Add Windows startup scripts
+ - [[INLONG-227](https://issues.apache.org/jira/browse/INLONG-227)] remove build guide in docker-build readme
+ - [[INLONG-232](https://issues.apache.org/jira/browse/INLONG-232)] TubeBroker#register2Master, reconnect and wait
+ - [[INLONG-234](https://issues.apache.org/jira/browse/INLONG-234)] Add .asf.yaml to change notifications
+ - [[INLONG-235](https://issues.apache.org/jira/browse/INLONG-235)] Add code coverage supporting for pull request created.
+ - [[INLONG-237](https://issues.apache.org/jira/browse/INLONG-237)] add maven module build for docker image
### BUG FIXES:
- - [[TUBEMQ-47](https://issues.apache.org/jira/browse/TUBEMQ-47)] Fix some typos
- - [[TUBEMQ-102](https://issues.apache.org/jira/browse/TUBEMQ-102)] Fix question [TUBEMQ-101] [Optimize code]
- - [[TUBEMQ-121](https://issues.apache.org/jira/browse/TUBEMQ-121)] Fix compilation alarm
- - [[TUBEMQ-139](https://issues.apache.org/jira/browse/TUBEMQ-139)] a bug in the equals method of the TubeClientConfig class
- - [[TUBEMQ-157](https://issues.apache.org/jira/browse/TUBEMQ-157)] Optimize Broker disk anomaly check
- - [[TUBEMQ-158](https://issues.apache.org/jira/browse/TUBEMQ-158)] nextWithAuthInfo2B status should be managed independently according to Broker
- - [[TUBEMQ-159](https://issues.apache.org/jira/browse/TUBEMQ-159)] Fix some typos
- - [[TUBEMQ-165](https://issues.apache.org/jira/browse/TUBEMQ-165)] Remove unnecessary fiiles
- - [[TUBEMQ-205](https://issues.apache.org/jira/browse/TUBEMQ-205)] Duplicate dependency of jetty in tuber-server pom file
- - [[TUBEMQ-206](https://issues.apache.org/jira/browse/TUBEMQ-206)] There are some residual files after executed unit tests
- - [[TUBEMQ-210](https://issues.apache.org/jira/browse/TUBEMQ-210)] Add log4j properties file for unit tests
- - [[TUBEMQ-217](https://issues.apache.org/jira/browse/TUBEMQ-217)] UPdate the je download path
- - [[TUBEMQ-218](https://issues.apache.org/jira/browse/TUBEMQ-218)] build failed: Too many files with unapproved license
- - [[TUBEMQ-230](https://issues.apache.org/jira/browse/TUBEMQ-230)] TubeMQ run mvn test failed with openjdk version 13.0.2
- - [[TUBEMQ-236](https://issues.apache.org/jira/browse/TUBEMQ-236)] Can't get dependencies from the maven repository
- - [[TUBEMQ-253](https://issues.apache.org/jira/browse/TUBEMQ-253)] tube-consumer fetch-worker cpu used too high
- - [[TUBEMQ-254](https://issues.apache.org/jira/browse/TUBEMQ-254)] support using different mapping port for standalone mode
- - [[TUBEMQ-265](https://issues.apache.org/jira/browse/TUBEMQ-265)] Unexpected broker disappearance in broker list after updating default broker metadata
+ - [[INLONG-47](https://issues.apache.org/jira/browse/INLONG-47)] Fix some typos
+ - [[INLONG-102](https://issues.apache.org/jira/browse/INLONG-102)] Fix question [INLONG-101] [Optimize code]
+ - [[INLONG-121](https://issues.apache.org/jira/browse/INLONG-121)] Fix compilation alarm
+ - [[INLONG-139](https://issues.apache.org/jira/browse/INLONG-139)] a bug in the equals method of the TubeClientConfig class
+ - [[INLONG-157](https://issues.apache.org/jira/browse/INLONG-157)] Optimize Broker disk anomaly check
+ - [[INLONG-158](https://issues.apache.org/jira/browse/INLONG-158)] nextWithAuthInfo2B status should be managed independently according to Broker
+ - [[INLONG-159](https://issues.apache.org/jira/browse/INLONG-159)] Fix some typos
+ - [[INLONG-165](https://issues.apache.org/jira/browse/INLONG-165)] Remove unnecessary fiiles
+ - [[INLONG-205](https://issues.apache.org/jira/browse/INLONG-205)] Duplicate dependency of jetty in tuber-server pom file
+ - [[INLONG-206](https://issues.apache.org/jira/browse/INLONG-206)] There are some residual files after executed unit tests
+ - [[INLONG-210](https://issues.apache.org/jira/browse/INLONG-210)] Add log4j properties file for unit tests
+ - [[INLONG-217](https://issues.apache.org/jira/browse/INLONG-217)] UPdate the je download path
+ - [[INLONG-218](https://issues.apache.org/jira/browse/INLONG-218)] build failed: Too many files with unapproved license
+ - [[INLONG-230](https://issues.apache.org/jira/browse/INLONG-230)] TubeMQ run mvn test failed with openjdk version 13.0.2
+ - [[INLONG-236](https://issues.apache.org/jira/browse/INLONG-236)] Can't get dependencies from the maven repository
+ - [[INLONG-253](https://issues.apache.org/jira/browse/INLONG-253)] tube-consumer fetch-worker cpu used too high
+ - [[INLONG-254](https://issues.apache.org/jira/browse/INLONG-254)] support using different mapping port for standalone mode
+ - [[INLONG-265](https://issues.apache.org/jira/browse/INLONG-265)] Unexpected broker disappearance in broker list after updating default broker metadata
\ No newline at end of file
diff --git a/docs/en-us/download/release-0.6.0.md b/docs/en-us/download/release-0.6.0.md
index e171aa7..638fbf0 100644
--- a/docs/en-us/download/release-0.6.0.md
+++ b/docs/en-us/download/release-0.6.0.md
@@ -1,39 +1,39 @@
---
-title: Download - Apache TubeMQ
+title: Download - Apache InLong
---
-# Download the TubeMQ releases
+# Download the InLong releases
-Use the links below to download the Apache TubeMQ from one of our mirrors.
+Use the links below to download the Apache InLong from one of our mirrors.
-## TubeMQ
+## InLong
| Date | Version| Comment | Downloads |
|:---:|:--:|:--:|:--:|
-| October. 21th, 2020 | 0.6.0 | Source | [[SRC](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.6.0-incubating/apache-tubemq-0.6.0-incubating-src.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.6.0-incubating/apache-tubemq-0.6.0-incubating-src.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.6.0-incubating/apache-tubemq-0.6.0-incubating-src.tar.gz.sha512)] |
-| | | Client | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.6.0-incubating/apache-tubemq-client-0.6.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.6.0-incubating/apache-tubemq-client-0.6.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.6.0-incubating/apache-tubemq-client-0.6.0-incubating-bin.tar.gz.sha512)] |
-| | | Server | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.6.0-incubating/apache-tubemq-server-0.6.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.6.0-incubating/apache-tubemq-server-0.6.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.6.0-incubating/apache-tubemq-server-0.6.0-incubating-bin.tar.gz.sha512)] |
+| October. 21th, 2020 | 0.6.0 | Source | [[SRC](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-0.6.0-incubating-src.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-0.6.0-incubating-src.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-0.6.0-incubating-src.tar.gz.sha512)] |
+| | | Client | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-client-0.6.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-client-0.6.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-client-0.6.0-incubating-bin.tar.gz.sha512)] |
+| | | Server | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-server-0.6.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-server-0.6.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-server-0.6.0-incubating-bin.tar.gz.sha512)] |
## Release Notes
### New Features
-- [[TUBEMQ-319](https://issues.apache.org/jira/browse/TUBEMQ-319)] In the pull mode, consumers support the suspension of consumption for a certain partition
-- [[TUBEMQ-3](https://issues.apache.org/jira/browse/TUBEMQ-3)] C++ SDK support in TubeMQ
+- [[INLONG-319](https://issues.apache.org/jira/browse/INLONG-319)] In the pull mode, consumers support the suspension of consumption for a certain partition
+- [[INLONG-3](https://issues.apache.org/jira/browse/INLONG-3)] C++ SDK support in TubeMQ
### IMPROVEMENTS
-- [[TUBEMQ-311](https://issues.apache.org/jira/browse/TUBEMQ-311)] Feedback more production information
-- [[TUBEMQ-312](https://issues.apache.org/jira/browse/TUBEMQ-312)] Feedback more consumption information
-- [[TUBEMQ-325](https://issues.apache.org/jira/browse/TUBEMQ-325)] Add 406 ~ 408 error code to pullSelect call
-- [[TUBEMQ-345](https://issues.apache.org/jira/browse/TUBEMQ-345)] Optimize the call logic of getMessage() in Pull mode
-- [[TUBEMQ-352](https://issues.apache.org/jira/browse/TUBEMQ-352)] Set the parameters of the example at startup
-- [[TUBEMQ-353](https://issues.apache.org/jira/browse/TUBEMQ-353)] Update LICENSE about C/C++ SDK's code reference
-- [[TUBEMQ-356](https://issues.apache.org/jira/browse/TUBEMQ-356)] C++ SDK Codec decode add requestid
-- [[TUBEMQ-327](https://issues.apache.org/jira/browse/TUBEMQ-327)] Fix the concurrency problem in the example
+- [[INLONG-311](https://issues.apache.org/jira/browse/INLONG-311)] Feedback more production information
+- [[INLONG-312](https://issues.apache.org/jira/browse/INLONG-312)] Feedback more consumption information
+- [[INLONG-325](https://issues.apache.org/jira/browse/INLONG-325)] Add 406 ~ 408 error code to pullSelect call
+- [[INLONG-345](https://issues.apache.org/jira/browse/INLONG-345)] Optimize the call logic of getMessage() in Pull mode
+- [[INLONG-352](https://issues.apache.org/jira/browse/INLONG-352)] Set the parameters of the example at startup
+- [[INLONG-353](https://issues.apache.org/jira/browse/INLONG-353)] Update LICENSE about C/C++ SDK's code reference
+- [[INLONG-356](https://issues.apache.org/jira/browse/INLONG-356)] C++ SDK Codec decode add requestid
+- [[INLONG-327](https://issues.apache.org/jira/browse/INLONG-327)] Fix the concurrency problem in the example
### BUG FIXES
-- [[TUBEMQ-316](https://issues.apache.org/jira/browse/TUBEMQ-316)] Where the port the port is aleady used, the process throw the exception, but not exit
-- [[TUBEMQ-317](https://issues.apache.org/jira/browse/TUBEMQ-317)] The Store Manager throws java.lang.NullPointerException
-- [[TUBEMQ-320](https://issues.apache.org/jira/browse/TUBEMQ-320)] Request for static web contents would get responses with no content
-- [[TUBEMQ-354](https://issues.apache.org/jira/browse/TUBEMQ-354)] Found a dns translate bug in C/C++ sdk
-- [[TUBEMQ-306](https://issues.apache.org/jira/browse/TUBEMQ-306)] Raise Nullpointer Exception when create tubemq instance
-- [[TUBEMQ-359](https://issues.apache.org/jira/browse/TUBEMQ-359)] TubeMQ consume speed dropped to 0 in some partitions, it is a very serious bug Blocker
+- [[INLONG-316](https://issues.apache.org/jira/browse/INLONG-316)] Where the port the port is aleady used, the process throw the exception, but not exit
+- [[INLONG-317](https://issues.apache.org/jira/browse/INLONG-317)] The Store Manager throws java.lang.NullPointerException
+- [[INLONG-320](https://issues.apache.org/jira/browse/INLONG-320)] Request for static web contents would get responses with no content
+- [[INLONG-354](https://issues.apache.org/jira/browse/INLONG-354)] Found a dns translate bug in C/C++ sdk
+- [[INLONG-306](https://issues.apache.org/jira/browse/INLONG-306)] Raise Nullpointer Exception when create tubemq instance
+- [[INLONG-359](https://issues.apache.org/jira/browse/INLONG-359)] TubeMQ consume speed dropped to 0 in some partitions, it is a very serious bug Blocker
diff --git a/docs/en-us/download/release-0.7.0.md b/docs/en-us/download/release-0.7.0.md
index 06d8c66..20bd947 100644
--- a/docs/en-us/download/release-0.7.0.md
+++ b/docs/en-us/download/release-0.7.0.md
@@ -1,17 +1,17 @@
---
-title: Download - Apache TubeMQ
+title: Download - Apache InLong
---
-# Download the TubeMQ releases
+# Download the InLong releases
-Use the links below to download the Apache TubeMQ from one of our mirrors.
+Use the links below to download the Apache InLong from one of our mirrors.
-## TubeMQ
+## InLong
| Date | Version| Comment | Downloads |
|:---:|:--:|:--:|:--:|
-| December. 4th, 2020 | 0.7.0 | Source | [[SRC](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.7.0-incubating/apache-tubemq-0.7.0-incubating-src.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.7.0-incubating/apache-tubemq-0.7.0-incubating-src.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.7.0-incubating/apache-tubemq-0.7.0-incubating-src.tar.gz.sha512)] |
-| | | Client | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.7.0-incubating/apache-tubemq-client-0.7.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.7.0-incubating/apache-tubemq-client-0.7.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.7.0-incubating/apache-tubemq-client-0.7.0-incubating-bin.tar.gz.sha512)] |
-| | | Server | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.7.0-incubating/apache-tubemq-server-0.7.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.7.0-incubating/apache-tubemq-server-0.7.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.7.0-incubating/apache-tubemq-server-0.7.0-incubating-bin.tar.gz.sha512)] |
+| December. 4th, 2020 | 0.7.0 | Source | [[SRC](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-0.7.0-incubating-src.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-0.7.0-incubating-src.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-0.7.0-incubating-src.tar.gz.sha512)] |
+| | | Client | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-client-0.7.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-client-0.7.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-client-0.7.0-incubating-bin.tar.gz.sha512)] |
+| | | Server | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-server-0.7.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-server-0.7.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-server-0.7.0-incubating-bin.tar.gz.sha512)] |
## Release Notes
@@ -20,37 +20,37 @@ Use the links below to download the Apache TubeMQ from one of our mirrors.
| JIRA | Summary | Priority |
| :---- | :------- | :------- |
-| [TUBEMQ-162](https://issues.apache.org/jira/browse/TUBEMQ-162) | Python SDK support in TubeMQ | High |
-| [TUBEMQ-336](https://issues.apache.org/jira/browse/TUBEMQ-336) | Propose web portal to manage tube cluster Phase-I | Major |
-| [TUBEMQ-390](https://issues.apache.org/jira/browse/TUBEMQ-390) | support build C++ SDK with docker image | Normal |
+| [INLONG-162](https://issues.apache.org/jira/browse/INLONG-162) | Python SDK support in TubeMQ | High |
+| [INLONG-336](https://issues.apache.org/jira/browse/INLONG-336) | Propose web portal to manage tube cluster Phase-I | Major |
+| [INLONG-390](https://issues.apache.org/jira/browse/INLONG-390) | support build C++ SDK with docker image | Normal |
### IMPROVEMENTS:
| JIRA | Summary | Priority |
| :---- | :------- | :------- |
-| [TUBEMQ-369](https://issues.apache.org/jira/browse/TUBEMQ-369) | hope to add an option in the compilation script (like `make lib` etc...) | Major |
-| [TUBEMQ-373](https://issues.apache.org/jira/browse/TUBEMQ-373) | Reduce the redundant code of Utils::Split functions | Major |
-| [TUBEMQ-374](https://issues.apache.org/jira/browse/TUBEMQ-374) | Adjust some coding style issues | Major |
-| [TUBEMQ-375](https://issues.apache.org/jira/browse/TUBEMQ-375) | Add a section to the README file about how to compile the project| Major |
-| [TUBEMQ-385](https://issues.apache.org/jira/browse/TUBEMQ-385) | update docker images | Major |
-| [TUBEMQ-393](https://issues.apache.org/jira/browse/TUBEMQ-393) | Optimize the mapping code of WEB API | Major |
-| [TUBEMQ-406](https://issues.apache.org/jira/browse/TUBEMQ-406) | test_consumer.py works for both Python 2 and 3 | Minor |
-| [TUBEMQ-410](https://issues.apache.org/jira/browse/TUBEMQ-410) | install python package and simplify test_consumer.py | Major |
-| [TUBEMQ-416](https://issues.apache.org/jira/browse/TUBEMQ-416) | support consume from specified position | Major |
-| [TUBEMQ-417](https://issues.apache.org/jira/browse/TUBEMQ-417) | C++ Client support parse message from binary data for Python SDK | Major |
-| [TUBEMQ-419](https://issues.apache.org/jira/browse/TUBEMQ-419) | SetMaxPartCheckPeriodMs() negative number, getMessage() still | Major |
+| [INLONG-369](https://issues.apache.org/jira/browse/INLONG-369) | hope to add an option in the compilation script (like `make lib` etc...) | Major |
+| [INLONG-373](https://issues.apache.org/jira/browse/INLONG-373) | Reduce the redundant code of Utils::Split functions | Major |
+| [INLONG-374](https://issues.apache.org/jira/browse/INLONG-374) | Adjust some coding style issues | Major |
+| [INLONG-375](https://issues.apache.org/jira/browse/INLONG-375) | Add a section to the README file about how to compile the project| Major |
+| [INLONG-385](https://issues.apache.org/jira/browse/INLONG-385) | update docker images | Major |
+| [INLONG-393](https://issues.apache.org/jira/browse/INLONG-393) | Optimize the mapping code of WEB API | Major |
+| [INLONG-406](https://issues.apache.org/jira/browse/INLONG-406) | test_consumer.py works for both Python 2 and 3 | Minor |
+| [INLONG-410](https://issues.apache.org/jira/browse/INLONG-410) | install python package and simplify test_consumer.py | Major |
+| [INLONG-416](https://issues.apache.org/jira/browse/INLONG-416) | support consume from specified position | Major |
+| [INLONG-417](https://issues.apache.org/jira/browse/INLONG-417) | C++ Client support parse message from binary data for Python SDK | Major |
+| [INLONG-419](https://issues.apache.org/jira/browse/INLONG-419) | SetMaxPartCheckPeriodMs() negative number, getMessage() still | Major |
### BUG FIXES:
| JIRA | Summary | Priority |
| :----------------------------------------------------------- | :----------------------------------------------------------- | :------- |
-| [TUBEMQ-365](https://issues.apache.org/jira/browse/TUBEMQ-365) | Whether the consumption setting is wrong after the processRequest exception | Major |
-| [TUBEMQ-370](https://issues.apache.org/jira/browse/TUBEMQ-370) | Calling GetCurConsumedInfo API always returns failure | Major |
-| [TUBEMQ-376](https://issues.apache.org/jira/browse/TUBEMQ-376) | Move pullrequests_status notifications commits mail list | Major |
-| [TUBEMQ-366](https://issues.apache.org/jira/browse/TUBEMQ-366) | Found a nullpointerexception bug in broker | Normal |
-| [TUBEMQ-379](https://issues.apache.org/jira/browse/TUBEMQ-379) | Modify the memory cache size default to 3M | Normal |
-| [TUBEMQ-380](https://issues.apache.org/jira/browse/TUBEMQ-380) | Cpp client link error when gcc optimization is disabled | Major |
-| [TUBEMQ-405](https://issues.apache.org/jira/browse/TUBEMQ-405) | python sdk install files lack of the whole cpp configuration | Major |
-| [TUBEMQ-401](https://issues.apache.org/jira/browse/TUBEMQ-401) | python sdk readme bug | Minor |
-| [TUBEMQ-407](https://issues.apache.org/jira/browse/TUBEMQ-407) | Fix some content in README.md | Trivial |
-| [TUBEMQ-418](https://issues.apache.org/jira/browse/TUBEMQ-418) | C++ SDK function SetMaxPartCheckPeriodMs() can't work | Major |
\ No newline at end of file
+| [INLONG-365](https://issues.apache.org/jira/browse/INLONG-365) | Whether the consumption setting is wrong after the processRequest exception | Major |
+| [INLONG-370](https://issues.apache.org/jira/browse/INLONG-370) | Calling GetCurConsumedInfo API always returns failure | Major |
+| [INLONG-376](https://issues.apache.org/jira/browse/INLONG-376) | Move pullrequests_status notifications commits mail list | Major |
+| [INLONG-366](https://issues.apache.org/jira/browse/INLONG-366) | Found a nullpointerexception bug in broker | Normal |
+| [INLONG-379](https://issues.apache.org/jira/browse/INLONG-379) | Modify the memory cache size default to 3M | Normal |
+| [INLONG-380](https://issues.apache.org/jira/browse/INLONG-380) | Cpp client link error when gcc optimization is disabled | Major |
+| [INLONG-405](https://issues.apache.org/jira/browse/INLONG-405) | python sdk install files lack of the whole cpp configuration | Major |
+| [INLONG-401](https://issues.apache.org/jira/browse/INLONG-401) | python sdk readme bug | Minor |
+| [INLONG-407](https://issues.apache.org/jira/browse/INLONG-407) | Fix some content in README.md | Trivial |
+| [INLONG-418](https://issues.apache.org/jira/browse/INLONG-418) | C++ SDK function SetMaxPartCheckPeriodMs() can't work | Major |
\ No newline at end of file
diff --git a/docs/en-us/download/release-0.8.0.md b/docs/en-us/download/release-0.8.0.md
index 1773fed..4bdbc53 100644
--- a/docs/en-us/download/release-0.8.0.md
+++ b/docs/en-us/download/release-0.8.0.md
@@ -1,17 +1,17 @@
---
-title: Download - Apache TubeMQ
+title: Download - Apache InLong
---
-# Download the TubeMQ releases
+# Download the InLong releases
-Use the links below to download the Apache TubeMQ from one of our mirrors.
+Use the links below to download the Apache InLong from one of our mirrors.
-## TubeMQ
+## InLong
| Date | Version| Comment | Downloads |
|:---:|:--:|:--:|:--:|
-| March. 4th, 2021 | 0.8.0 | Source | [[SRC](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.8.0-incubating/apache-tubemq-0.8.0-incubating-src.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.8.0-incubating/apache-tubemq-0.8.0-incubating-src.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.8.0-incubating/apache-tubemq-0.8.0-incubating-src.tar.gz.sha512)] |
-| | | Client | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.8.0-incubating/apache-tubemq-client-0.8.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.8.0-incubating/apache-tubemq-client-0.8.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.8.0-incubating/apache-tubemq-client-0.8.0-incubating-bin.tar.gz.sha512)] |
-| | | Server | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.8.0-incubating/apache-tubemq-server-0.8.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.8.0-incubating/apache-tubemq-server-0.8.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.8.0-incubating/apache-tubemq-server-0.8.0-incubating-bin.tar.gz.sha512)] |
+| March. 4th, 2021 | 0.8.0 | Source | [[SRC](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-0.8.0-incubating-src.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-0.8.0-incubating-src.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-0.8.0-incubating-src.tar.gz.sha512)] |
+| | | Client | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-client-0.8.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-client-0.8.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-client-0.8.0-incubating-bin.tar.gz.sha512)] |
+| | | Server | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-server-0.8.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-server-0.8.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-server-0.8.0-incubating-bin.tar.gz.sha512)] |
## Release Notes
@@ -19,84 +19,84 @@ Use the links below to download the Apache TubeMQ from one of our mirrors.
### IMPROVEMENTS:
| JIRA | Summary | Priority |
| :---- | :------- | :------- |
-| [TUBEMQ-430](https://issues.apache.org/jira/browse/TUBEMQ-430) | Optimizing the implementation of HTTP API for broke | Major |
-| [TUBEMQ-445](https://issues.apache.org/jira/browse/TUBEMQ-445) | Adjust the status check default sleep interval of pullConsumeReadyChkSliceMs | Major |
-| [TUBEMQ-448](https://issues.apache.org/jira/browse/TUBEMQ-448) | Add Committer and PPMC operation process | Major |
-| [TUBEMQ-449](https://issues.apache.org/jira/browse/TUBEMQ-449) | Adjust Example implementation | Major |
-| [TUBEMQ-452](https://issues.apache.org/jira/browse/TUBEMQ-452) | Optimize rebalance performance | Major |
-| [TUBEMQ-467](https://issues.apache.org/jira/browse/TUBEMQ-467) | Add WEB APIs of Master and Broker | Major |
-| [TUBEMQ-489](https://issues.apache.org/jira/browse/TUBEMQ-489) | Add the maximum message length parameter setting | Major |
-| [TUBEMQ-495](https://issues.apache.org/jira/browse/TUBEMQ-495) | Code implementation adjustment based on SpotBugs check | Major |
-| [TUBEMQ-511](https://issues.apache.org/jira/browse/TUBEMQ-511) | Replace the conditional operator (?:) with mid() | Major |
-| [TUBEMQ-512](https://issues.apache.org/jira/browse/TUBEMQ-512) | Add package length control based on Topic | Major |
-| [TUBEMQ-515](https://issues.apache.org/jira/browse/TUBEMQ-515) | Add cluster Topic view web api | Major |
+| [INLONG-430](https://issues.apache.org/jira/browse/INLONG-430) | Optimizing the implementation of HTTP API for broke | Major |
+| [INLONG-445](https://issues.apache.org/jira/browse/INLONG-445) | Adjust the status check default sleep interval of pullConsumeReadyChkSliceMs | Major |
+| [INLONG-448](https://issues.apache.org/jira/browse/INLONG-448) | Add Committer and PPMC operation process | Major |
+| [INLONG-449](https://issues.apache.org/jira/browse/INLONG-449) | Adjust Example implementation | Major |
+| [INLONG-452](https://issues.apache.org/jira/browse/INLONG-452) | Optimize rebalance performance | Major |
+| [INLONG-467](https://issues.apache.org/jira/browse/INLONG-467) | Add WEB APIs of Master and Broker | Major |
+| [INLONG-489](https://issues.apache.org/jira/browse/INLONG-489) | Add the maximum message length parameter setting | Major |
+| [INLONG-495](https://issues.apache.org/jira/browse/INLONG-495) | Code implementation adjustment based on SpotBugs check | Major |
+| [INLONG-511](https://issues.apache.org/jira/browse/INLONG-511) | Replace the conditional operator (?:) with mid() | Major |
+| [INLONG-512](https://issues.apache.org/jira/browse/INLONG-512) | Add package length control based on Topic | Major |
+| [INLONG-515](https://issues.apache.org/jira/browse/INLONG-515) | Add cluster Topic view web api | Major |
### BUG FIXES:
| JIRA | Summary | Priority |
| :---- | :------- | :------- |
-| [TUBEMQ-437](https://issues.apache.org/jira/browse/TUBEMQ-437) | Fix tubemq table source sink factory instance creating problem | Major |
-| [TUBEMQ-441](https://issues.apache.org/jira/browse/TUBEMQ-441) | An error occurred when using the Tubemq class to create a sink table | Major |
-| [TUBEMQ-442](https://issues.apache.org/jira/browse/TUBEMQ-442) | Modifying the jvm parameters when the broker starts does not take effect | Major |
-| [TUBEMQ-443](https://issues.apache.org/jira/browse/TUBEMQ-443) | TubemqSourceFunction class prints too many logs problem | Major |
-| [TUBEMQ-446](https://issues.apache.org/jira/browse/TUBEMQ-446) | Small bugs fix that do not affect the main logics | Major |
-| [TUBEMQ-450](https://issues.apache.org/jira/browse/TUBEMQ-450) | TubeClientException: Generate producer id failed | Major |
-| [TUBEMQ-453](https://issues.apache.org/jira/browse/TUBEMQ-453) | TubemqSourceFunction class prints too many logs problem | Major |
-| [TUBEMQ-506](https://issues.apache.org/jira/browse/TUBEMQ-506) | cmakelist error | Major |
-| [TUBEMQ-510](https://issues.apache.org/jira/browse/TUBEMQ-510) | Found a bug in MessageProducerExample class | Major |
-| [TUBEMQ-518](https://issues.apache.org/jira/browse/TUBEMQ-518) | fix parameter pass error | Major |
-| [TUBEMQ-526](https://issues.apache.org/jira/browse/TUBEMQ-526) | Adjust the packaging script and version check list, remove the "-WIP" tag | Major |
-| [TUBEMQ-555](https://issues.apache.org/jira/browse/TUBEMQ-555) | short session data can only be written to a specific partition | Major |
-| [TUBEMQ-556](https://issues.apache.org/jira/browse/TUBEMQ-556) | Index value is bigger than the actual number of records | Low |
+| [INLONG-437](https://issues.apache.org/jira/browse/INLONG-437) | Fix tubemq table source sink factory instance creating problem | Major |
+| [INLONG-441](https://issues.apache.org/jira/browse/INLONG-441) | An error occurred when using the Tubemq class to create a sink table | Major |
+| [INLONG-442](https://issues.apache.org/jira/browse/INLONG-442) | Modifying the jvm parameters when the broker starts does not take effect | Major |
+| [INLONG-443](https://issues.apache.org/jira/browse/INLONG-443) | TubemqSourceFunction class prints too many logs problem | Major |
+| [INLONG-446](https://issues.apache.org/jira/browse/INLONG-446) | Small bugs fix that do not affect the main logics | Major |
+| [INLONG-450](https://issues.apache.org/jira/browse/INLONG-450) | TubeClientException: Generate producer id failed | Major |
+| [INLONG-453](https://issues.apache.org/jira/browse/INLONG-453) | TubemqSourceFunction class prints too many logs problem | Major |
+| [INLONG-506](https://issues.apache.org/jira/browse/INLONG-506) | cmakelist error | Major |
+| [INLONG-510](https://issues.apache.org/jira/browse/INLONG-510) | Found a bug in MessageProducerExample class | Major |
+| [INLONG-518](https://issues.apache.org/jira/browse/INLONG-518) | fix parameter pass error | Major |
+| [INLONG-526](https://issues.apache.org/jira/browse/INLONG-526) | Adjust the packaging script and version check list, remove the "-WIP" tag | Major |
+| [INLONG-555](https://issues.apache.org/jira/browse/INLONG-555) | short session data can only be written to a specific partition | Major |
+| [INLONG-556](https://issues.apache.org/jira/browse/INLONG-556) | Index value is bigger than the actual number of records | Low |
### TASK:
| JIRA | Summary | Priority |
|:---- |:---- | :--- |
-| [TUBEMQ-505](https://issues.apache.org/jira/browse/TUBEMQ-505) | Remove the "WIP" label of the DISCLAIMER file | Major |
-| [TUBEMQ-543](https://issues.apache.org/jira/browse/TUBEMQ-543) | Modify the LICENSE statement of multiple files and others | Major |
-| [TUBEMQ-557](https://issues.apache.org/jira/browse/TUBEMQ-557) | Handle the issues mentioned in the 0.8.0-RC2 review | Major |
-| [TUBEMQ-562](https://issues.apache.org/jira/browse/TUBEMQ-562) | Update project contents according to the 0.8.0-RC3 review | Major |
+| [INLONG-505](https://issues.apache.org/jira/browse/INLONG-505) | Remove the "WIP" label of the DISCLAIMER file | Major |
+| [INLONG-543](https://issues.apache.org/jira/browse/INLONG-543) | Modify the LICENSE statement of multiple files and others | Major |
+| [INLONG-557](https://issues.apache.org/jira/browse/INLONG-557) | Handle the issues mentioned in the 0.8.0-RC2 review | Major |
+| [INLONG-562](https://issues.apache.org/jira/browse/INLONG-562) | Update project contents according to the 0.8.0-RC3 review | Major |
### SUB-TASK:
| JIRA | Summary | Priority |
| :---- | :------- | :------- |
-| [TUBEMQ-428](https://issues.apache.org/jira/browse/TUBEMQ-433) | Bumped version to 0.8.0-SNAPSHOT | Major |
-| [TUBEMQ-433](https://issues.apache.org/jira/browse/TUBEMQ-433) | add tubemq perf-consumer/producer scripts | Major |
-| [TUBEMQ-434](https://issues.apache.org/jira/browse/TUBEMQ-434) | Adjust Broker API mapping | Major |
-| [TUBEMQ-435](https://issues.apache.org/jira/browse/TUBEMQ-435) | Create Web field Mapping | Major |
-| [TUBEMQ-436](https://issues.apache.org/jira/browse/TUBEMQ-436) | Adjust Broker's HTTP API implementation | Major |
-| [TUBEMQ-439](https://issues.apache.org/jira/browse/TUBEMQ-439) | Add Cli field Scheme definition | Major |
-| [TUBEMQ-440](https://issues.apache.org/jira/browse/TUBEMQ-440) | Add feature package tube-manager to zip | Major |
-| [TUBEMQ-444](https://issues.apache.org/jira/browse/TUBEMQ-444) | Add consume and produce Cli commands | Major |
-| [TUBEMQ-447](https://issues.apache.org/jira/browse/TUBEMQ-447) | Add Broker-Admin Cli | Major |
-| [TUBEMQ-451](https://issues.apache.org/jira/browse/TUBEMQ-451) | Replace ConsumeTupleInfo with Tuple2 | Major |
-| [TUBEMQ-457](https://issues.apache.org/jira/browse/TUBEMQ-457) | There is no need to return StringBuilder in Master.java | Major |
-| [TUBEMQ-463](https://issues.apache.org/jira/browse/TUBEMQ-463) | Adjust Master rebalance process implementation | Major |
-| [TUBEMQ-464](https://issues.apache.org/jira/browse/TUBEMQ-464) | Add parameter rebalanceParallel in master.ini | Major |
-| [TUBEMQ-470](https://issues.apache.org/jira/browse/TUBEMQ-470) | Add query API of TopicName and BrokerId collection | Major |
-| [TUBEMQ-471](https://issues.apache.org/jira/browse/TUBEMQ-471) | Add query API Introduction of TopicName and BrokerId collection | Major |
-| [TUBEMQ-472](https://issues.apache.org/jira/browse/TUBEMQ-472) | Adjust Broker's AbstractWebHandler class implementation | Major |
-| [TUBEMQ-475](https://issues.apache.org/jira/browse/TUBEMQ-475) | add the offset clone api of the consume group | Major |
-| [TUBEMQ-482](https://issues.apache.org/jira/browse/TUBEMQ-482) | Add offset query api | Major |
-| [TUBEMQ-484](https://issues.apache.org/jira/browse/TUBEMQ-484) | Add query API for topic publication information | Major |
-| [TUBEMQ-485](https://issues.apache.org/jira/browse/TUBEMQ-485) | Add the batch setting API of consume group offset | Major |
-| [TUBEMQ-486](https://issues.apache.org/jira/browse/TUBEMQ-486) | Add the delete API of consumer group offset | Major |
-| [TUBEMQ-494](https://issues.apache.org/jira/browse/TUBEMQ-494) | Update API interface instruction document | Major |
-| [TUBEMQ-499](https://issues.apache.org/jira/browse/TUBEMQ-499) | Add configure store | Major |
-| [TUBEMQ-500](https://issues.apache.org/jira/browse/TUBEMQ-500) | Add setting operate API | Major |
-| [TUBEMQ-501](https://issues.apache.org/jira/browse/TUBEMQ-501) | Adjust max message size check logic | Major |
-| [TUBEMQ-502](https://issues.apache.org/jira/browse/TUBEMQ-502) | Add setting API interface document | Major |
-| [TUBEMQ-504](https://issues.apache.org/jira/browse/TUBEMQ-504) | Adjust the WebMethodMapper class interfaces | Major |
-| [TUBEMQ-508](https://issues.apache.org/jira/browse/TUBEMQ-508) | Optimize Broker's PB parameter check processing logic | Major |
-| [TUBEMQ-509](https://issues.apache.org/jira/browse/TUBEMQ-509) | Adjust the packet length check when data is loaded | Major |
-| [TUBEMQ-522](https://issues.apache.org/jira/browse/TUBEMQ-522) | Add admin_query_cluster_topic_view API document | Major |
-| [TUBEMQ-544](https://issues.apache.org/jira/browse/TUBEMQ-544) | Adjust the LICENSE statement in the client.conf files of Python and C/C++ SDK | Major |
-| [TUBEMQ-546](https://issues.apache.org/jira/browse/TUBEMQ-546) | Restore the original license header of the referenced external source files | Major |
-| [TUBEMQ-547](https://issues.apache.org/jira/browse/TUBEMQ-547) | Recode the implementation of the *Startup.java classes in the Tool package | Major |
-| [TUBEMQ-548](https://issues.apache.org/jira/browse/TUBEMQ-548) | Handle the LICENSE authorization of font files in the resources | Major |
-| [TUBEMQ-549](https://issues.apache.org/jira/browse/TUBEMQ-549) | Handling the problem of compilation failure | Major |
-| [TUBEMQ-550](https://issues.apache.org/jira/browse/TUBEMQ-550) | Adjust LICENSE file content | Major |
-| [TUBEMQ-551](https://issues.apache.org/jira/browse/TUBEMQ-551) | Adjust NOTICE file content | Major |
-| [TUBEMQ-558](https://issues.apache.org/jira/browse/TUBEMQ-558) | Adjust the LICENSE of the file header | Major |
-| [TUBEMQ-559](https://issues.apache.org/jira/browse/TUBEMQ-559) | Update the LICENSE file according to the 0.8.0-RC2 review | Major |
-| [TUBEMQ-560](https://issues.apache.org/jira/browse/TUBEMQ-560) | Remove unprepared modules | Major |
+| [INLONG-428](https://issues.apache.org/jira/browse/INLONG-433) | Bumped version to 0.8.0-SNAPSHOT | Major |
+| [INLONG-433](https://issues.apache.org/jira/browse/INLONG-433) | add tubemq perf-consumer/producer scripts | Major |
+| [INLONG-434](https://issues.apache.org/jira/browse/INLONG-434) | Adjust Broker API mapping | Major |
+| [INLONG-435](https://issues.apache.org/jira/browse/INLONG-435) | Create Web field Mapping | Major |
+| [INLONG-436](https://issues.apache.org/jira/browse/INLONG-436) | Adjust Broker's HTTP API implementation | Major |
+| [INLONG-439](https://issues.apache.org/jira/browse/INLONG-439) | Add Cli field Scheme definition | Major |
+| [INLONG-440](https://issues.apache.org/jira/browse/INLONG-440) | Add feature package tube-manager to zip | Major |
+| [INLONG-444](https://issues.apache.org/jira/browse/INLONG-444) | Add consume and produce Cli commands | Major |
+| [INLONG-447](https://issues.apache.org/jira/browse/INLONG-447) | Add Broker-Admin Cli | Major |
+| [INLONG-451](https://issues.apache.org/jira/browse/INLONG-451) | Replace ConsumeTupleInfo with Tuple2 | Major |
+| [INLONG-457](https://issues.apache.org/jira/browse/INLONG-457) | There is no need to return StringBuilder in Master.java | Major |
+| [INLONG-463](https://issues.apache.org/jira/browse/INLONG-463) | Adjust Master rebalance process implementation | Major |
+| [INLONG-464](https://issues.apache.org/jira/browse/INLONG-464) | Add parameter rebalanceParallel in master.ini | Major |
+| [INLONG-470](https://issues.apache.org/jira/browse/INLONG-470) | Add query API of TopicName and BrokerId collection | Major |
+| [INLONG-471](https://issues.apache.org/jira/browse/INLONG-471) | Add query API Introduction of TopicName and BrokerId collection | Major |
+| [INLONG-472](https://issues.apache.org/jira/browse/INLONG-472) | Adjust Broker's AbstractWebHandler class implementation | Major |
+| [INLONG-475](https://issues.apache.org/jira/browse/INLONG-475) | add the offset clone api of the consume group | Major |
+| [INLONG-482](https://issues.apache.org/jira/browse/INLONG-482) | Add offset query api | Major |
+| [INLONG-484](https://issues.apache.org/jira/browse/INLONG-484) | Add query API for topic publication information | Major |
+| [INLONG-485](https://issues.apache.org/jira/browse/INLONG-485) | Add the batch setting API of consume group offset | Major |
+| [INLONG-486](https://issues.apache.org/jira/browse/INLONG-486) | Add the delete API of consumer group offset | Major |
+| [INLONG-494](https://issues.apache.org/jira/browse/INLONG-494) | Update API interface instruction document | Major |
+| [INLONG-499](https://issues.apache.org/jira/browse/INLONG-499) | Add configure store | Major |
+| [INLONG-500](https://issues.apache.org/jira/browse/INLONG-500) | Add setting operate API | Major |
+| [INLONG-501](https://issues.apache.org/jira/browse/INLONG-501) | Adjust max message size check logic | Major |
+| [INLONG-502](https://issues.apache.org/jira/browse/INLONG-502) | Add setting API interface document | Major |
+| [INLONG-504](https://issues.apache.org/jira/browse/INLONG-504) | Adjust the WebMethodMapper class interfaces | Major |
+| [INLONG-508](https://issues.apache.org/jira/browse/INLONG-508) | Optimize Broker's PB parameter check processing logic | Major |
+| [INLONG-509](https://issues.apache.org/jira/browse/INLONG-509) | Adjust the packet length check when data is loaded | Major |
+| [INLONG-522](https://issues.apache.org/jira/browse/INLONG-522) | Add admin_query_cluster_topic_view API document | Major |
+| [INLONG-544](https://issues.apache.org/jira/browse/INLONG-544) | Adjust the LICENSE statement in the client.conf files of Python and C/C++ SDK | Major |
+| [INLONG-546](https://issues.apache.org/jira/browse/INLONG-546) | Restore the original license header of the referenced external source files | Major |
+| [INLONG-547](https://issues.apache.org/jira/browse/INLONG-547) | Recode the implementation of the *Startup.java classes in the Tool package | Major |
+| [INLONG-548](https://issues.apache.org/jira/browse/INLONG-548) | Handle the LICENSE authorization of font files in the resources | Major |
+| [INLONG-549](https://issues.apache.org/jira/browse/INLONG-549) | Handling the problem of compilation failure | Major |
+| [INLONG-550](https://issues.apache.org/jira/browse/INLONG-550) | Adjust LICENSE file content | Major |
+| [INLONG-551](https://issues.apache.org/jira/browse/INLONG-551) | Adjust NOTICE file content | Major |
+| [INLONG-558](https://issues.apache.org/jira/browse/INLONG-558) | Adjust the LICENSE of the file header | Major |
+| [INLONG-559](https://issues.apache.org/jira/browse/INLONG-559) | Update the LICENSE file according to the 0.8.0-RC2 review | Major |
+| [INLONG-560](https://issues.apache.org/jira/browse/INLONG-560) | Remove unprepared modules | Major |
\ No newline at end of file
diff --git a/docs/en-us/getting_started.md b/docs/en-us/getting_started.md
new file mode 100644
index 0000000..6c7242d
--- /dev/null
+++ b/docs/en-us/getting_started.md
@@ -0,0 +1,42 @@
+---
+title: Getting Started - Apache InLong
+---
+
+This section contains a quick start guide to help you get started with Apache InLong.
+
+# Overall architecture
+<img src="https://github.com/apache/incubator-inlong-website/blob/master/img/inlong_architecture.png" align="center" alt="Apache InLong"/>
+[Apache InLong](https://inlong.apache.org)(incubating) overall architecture is as above. This component is a one-stop data streaming platform that provides automated, secure, distributed, and efficient data publishing and subscription capabilities to help You can easily build stream-based data applications.
+
+InLong (Yinglong) was originally built in Tencent and has served online business for more than 8 years. It supports massive data (over 40 trillion pieces of data per day) report services under big data scenarios. The entire platform integrates 5 modules including data collection, aggregation, caching, sorting and management modules. Through this system, the business only needs to provide data sources, data service quality, data landing clusters and data landing formats, that is, data can [...]
+
+
+# How to use
+Through the overall architecture diagram of InLong above, we can see that InLong contains complete data reporting components, and we need to compile and deploy modules one by one.
+
+## Compile and deploy Manager
+[How to compile and deploy Manager](modules/manager/quick_start.md)
+
+## Compile and deploy Manager web
+[How to compile and deploy Manager Web](modules/console/quick_start.md)
+
+## Compile and deploy TubeMQ
+[How to compile and deploy TubeMQ](modules/tubemq/quick_start.md)
+
+## Compile and deploy TubeMQ Manager
+[How to compile and deploy TubeMQ Manager](modules/tubemq/tubemq-manager/quick_start.md)
+
+## Compile and deploy Sort
+[How to compile and deploy Sort](modules/sort/quick_start.md)
+
+## Compile and deploy DataProxy
+[How to compile and deploy DataProxy](modules/dataproxy/quick_start.md)
+
+## Compile and deploy the Agent
+[How to compile and deploy Agent](modules/agent/quick_start.md)
+
+## Business configuration
+[How to configure a new business](modules/manager/userManual.md)
+
+## Data report verification
+At this stage, you can collect data through the file agent and verify whether the received data is consistent with the sent data in the specified Hive table.
diff --git a/docs/en-us/img/client_rpc/rpc_event_proto_status.png b/docs/en-us/img/client_rpc/rpc_event_proto_status.png
deleted file mode 100644
index 4f308d9..0000000
Binary files a/docs/en-us/img/client_rpc/rpc_event_proto_status.png and /dev/null differ
diff --git a/docs/en-us/img/client_rpc/rpc_header_fill.png b/docs/en-us/img/client_rpc/rpc_header_fill.png
deleted file mode 100644
index b193448..0000000
Binary files a/docs/en-us/img/client_rpc/rpc_header_fill.png and /dev/null differ
diff --git a/docs/en-us/img/configure/conf_ini_pos.png b/docs/en-us/img/configure/conf_ini_pos.png
deleted file mode 100644
index bf7e0d2..0000000
Binary files a/docs/en-us/img/configure/conf_ini_pos.png and /dev/null differ
diff --git a/docs/en-us/img/configure/conf_velocity_pos.png b/docs/en-us/img/configure/conf_velocity_pos.png
deleted file mode 100644
index e2ba302..0000000
Binary files a/docs/en-us/img/configure/conf_velocity_pos.png and /dev/null differ
diff --git a/docs/en-us/img/store_file.png b/docs/en-us/img/store_file.png
deleted file mode 100644
index 82f11c8..0000000
Binary files a/docs/en-us/img/store_file.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_address_host.png b/docs/en-us/img/sysdeployment/sys_address_host.png
deleted file mode 100644
index 6bd1812..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_address_host.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_broker_configure.png b/docs/en-us/img/sysdeployment/sys_broker_configure.png
deleted file mode 100644
index a1db395..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_broker_configure.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_broker_deploy.png b/docs/en-us/img/sysdeployment/sys_broker_deploy.png
deleted file mode 100644
index 7b537a3..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_broker_deploy.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_broker_finished.png b/docs/en-us/img/sysdeployment/sys_broker_finished.png
deleted file mode 100644
index 0a67121..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_broker_finished.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_broker_online.png b/docs/en-us/img/sysdeployment/sys_broker_online.png
deleted file mode 100644
index b79ab95..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_broker_online.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_broker_online_2.png b/docs/en-us/img/sysdeployment/sys_broker_online_2.png
deleted file mode 100644
index 2043528..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_broker_online_2.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_broker_restart_1.png b/docs/en-us/img/sysdeployment/sys_broker_restart_1.png
deleted file mode 100644
index 1fad8c2..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_broker_restart_1.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_broker_restart_2.png b/docs/en-us/img/sysdeployment/sys_broker_restart_2.png
deleted file mode 100644
index 7c7d8f2..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_broker_restart_2.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_broker_start.png b/docs/en-us/img/sysdeployment/sys_broker_start.png
deleted file mode 100644
index 6f2b8b3..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_broker_start.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_broker_start_error.png b/docs/en-us/img/sysdeployment/sys_broker_start_error.png
deleted file mode 100644
index ab9ad51..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_broker_start_error.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_compile.png b/docs/en-us/img/sysdeployment/sys_compile.png
deleted file mode 100644
index b8baf81..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_compile.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_configure_1.png b/docs/en-us/img/sysdeployment/sys_configure_1.png
deleted file mode 100644
index 2100cdf..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_configure_1.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_configure_2.png b/docs/en-us/img/sysdeployment/sys_configure_2.png
deleted file mode 100644
index c24454c..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_configure_2.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_master_console.png b/docs/en-us/img/sysdeployment/sys_master_console.png
deleted file mode 100644
index 1b39645..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_master_console.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_master_start.png b/docs/en-us/img/sysdeployment/sys_master_start.png
deleted file mode 100644
index 307f44b..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_master_start.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_master_startted.png b/docs/en-us/img/sysdeployment/sys_master_startted.png
deleted file mode 100644
index 1ebe924..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_master_startted.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_node_log.png b/docs/en-us/img/sysdeployment/sys_node_log.png
deleted file mode 100644
index d81e522..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_node_log.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_node_status.png b/docs/en-us/img/sysdeployment/sys_node_status.png
deleted file mode 100644
index 8c731b1..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_node_status.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_node_status_2.png b/docs/en-us/img/sysdeployment/sys_node_status_2.png
deleted file mode 100644
index 07a0fb9..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_node_status_2.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_package.png b/docs/en-us/img/sysdeployment/sys_package.png
deleted file mode 100644
index 7135b8a..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_package.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_package_list.png b/docs/en-us/img/sysdeployment/sys_package_list.png
deleted file mode 100644
index 6c72d64..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_package_list.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_topic_create.png b/docs/en-us/img/sysdeployment/sys_topic_create.png
deleted file mode 100644
index c96b618..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_topic_create.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_topic_deploy.png b/docs/en-us/img/sysdeployment/sys_topic_deploy.png
deleted file mode 100644
index 5520230..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_topic_deploy.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_topic_error.png b/docs/en-us/img/sysdeployment/sys_topic_error.png
deleted file mode 100644
index 4889364..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_topic_error.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_topic_finished.png b/docs/en-us/img/sysdeployment/sys_topic_finished.png
deleted file mode 100644
index 263d218..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_topic_finished.png and /dev/null differ
diff --git a/docs/en-us/img/sysdeployment/sys_topic_select.png b/docs/en-us/img/sysdeployment/sys_topic_select.png
deleted file mode 100644
index 3a6d645..0000000
Binary files a/docs/en-us/img/sysdeployment/sys_topic_select.png and /dev/null differ
diff --git a/docs/en-us/modules/agent/architecture.md b/docs/en-us/modules/agent/architecture.md
new file mode 100644
index 0000000..1bf7334
--- /dev/null
+++ b/docs/en-us/modules/agent/architecture.md
@@ -0,0 +1,42 @@
+## 1. Overview of InLong-Agent
+InLong-Agent is a collection tool that supports multiple types of data sources, and is committed to achieving stable and efficient data collection functions between multiple heterogeneous data sources including file, sql, Binlog, metrics, etc.
+
+### The brief architecture diagram is as follows:
+
+
+### design concept
+In order to solve the problem of data source diversity, InLong-agent abstracts multiple data sources into a unified source concept, and abstracts sinks to write data. When you need to access a new data source, you only need to configure the format and reading parameters of the data source to achieve efficient reading.
+
+### Current status of use
+InLong-Agent is widely used within the Tencent Group, undertaking most of the data collection business, and the amount of online data reaches tens of billions.
+
+## 2. InLong-Agent architecture
+The InLong Agent task is used as a data acquisition framework, constructed with a channel + plug-in architecture. Read and write the data source into a reader/writer plug-in, and then into the entire framework.
+
++ Reader: Reader is the data collection module, responsible for collecting data from the data source and sending the data to the channel.
++ Writer: Writer is a data writing module, which reuses data continuously to the channel and writes the data to the destination.
++ Channel: The channel used to connect the reader and writer, and as the data transmission channel of the connection, which realizes the function of data reading and monitoring
+
+
+## 3. Different kinds of agent
+### 3.1 file agent
+File collection includes the following functions:
+
+User-configured path monitoring, able to monitor the created file information
+Directory regular filtering, support YYYYMMDD+regular expression path configuration
+Breakpoint retransmission, when InLong-Agent restarts, it can automatically re-read from the last read position to ensure no reread or missed reading.
+
+### 3.2 sql agent
+This type of data refers to the way it is executed through SQL
+SQL regular decomposition, converted into multiple SQL statements
+Execute SQL separately, pull the data set, the pull process needs to pay attention to the impact on mysql itself
+The execution cycle, which is generally executed regularly
+
+### 3.3 binlog agent
+This type of collection reads binlog and restores data by configuring mysql slave
+Need to pay attention to multi-threaded parsing when binlog is read, and multi-threaded parsing data needs to be labeled in order
+The code is based on the old version of dbsync, the main modification is to change the sending of tdbus-sender to push to agent-channel for integration
+
+
+
+
diff --git a/docs/en-us/modules/agent/quick_start.md b/docs/en-us/modules/agent/quick_start.md
new file mode 100644
index 0000000..cdbdb9b
--- /dev/null
+++ b/docs/en-us/modules/agent/quick_start.md
@@ -0,0 +1,124 @@
+
+## 1、install
+
+ mvn clean package -DskipTests
+
+ The tgz installation package can be found in the target under the project
+
+
+
+## 2、Configuration
+###2.1 Agent configuration
+
+The agent supports two modes of operation: local operation and online operation
+
+Online operation needs to pull the configuration from inlong-manager, the configuration conf/agent.properties is as follows:
+agent.fetcher.classname=org.apache.inlong.agent.plugin.fetcher.ManagerFetcher (设置任务获取的类名，默认为ManagerFetcher）
+agent.local.ip=Write local ip
+agent.manager.vip.http.host=manager host
+agent.manager.vip.http.port=manager port
+
+###2.2 Proxy configuration
+Create a new folder named .inlong\.managerIps in the agent directory, and create a new bid+.local file inside. For example, if the sending bid is set to a, then create a new file a.local
+
+write:
+
+ {"cluster_id":45,"isInterVisit":1,"size":1,"address": [{"port":write proxy port,"host":"write proxy ip"}], "switch":0}
+
+###2.3 local job configuration
+If you do not use the online mode, you can use the local file to create a new read task
+Create a new directory jobs in conf,
+vim job1.json：
+
+put
+ {
+
+ "job": {
+
+ "dir": {
+
+ "pattern": "The path of the file to be read, which can contain regular expressions"
+
+ },
+
+ "trigger": "org.apache.inlong.agent.plugin.trigger.DirectoryTrigger",
+
+ "id": 1,
+
+ "name": "fileAgentTest",
+
+ "source": "org.apache.inlong.agent.plugin.sources.TextFileSource",
+
+ "sink": "org.apache.inlong.agent.plugin.sinks.ProxySink",
+
+ "channel": "org.apache.inlong.agent.plugin.channel.MemoryChannel"
+
+ },
+
+ "proxy": {
+
+ "bid": "testbid1"
+
+ }
+
+ }
+
+
+
+The meaning of each parameter is ：
+
+ job.dir.pattern: Configure the read file path, which can include regular expressions
+
+ job.trigger: Trigger name, the default is DirectoryTrigger, the function is to monitor the files under the folder to generate events
+
+ job.source: The type of data source used, the default is TextFileSource, which reads text files
+
+ job.sink：The type of writer used, the default is ProxySink, which sends messages to the proxy
+
+ proxy.bid: The bid type used when writing proxy
+
+###2.4 Add job configuration in real time
+
+##agent.propertities Modify the following two places
+
+ # whether enable http service
+ agent.http.enable=true
+ # http default port
+ agent.http.port=Available ports
+
+ curl --location --request POST 'http://localhost:8129/config/job' \
+ --header 'Content-Type: application/json' \
+ --data '{
+ "job": {
+ "dir": {
+ "path": "",
+ "pattern": "/data/inlong-agent/test.log"
+ },
+ "trigger": "org.apache.inlong.agent.plugin.trigger.DirectoryTrigger",
+ "id": 1,
+ "thread": {
+ "running": {
+ "core": "4"
+ },
+ "onejob": true
+ },
+ "name": "fileAgentTest",
+ "source": "org.apache.inlong.agent.plugin.sources.TextFileSource",
+ "sink": "org.apache.inlong.agent.plugin.sinks.TdBusSink",
+ "channel": "org.apache.inlong.agent.plugin.channel.MemoryChannel"
+ },
+ "bus": {
+ "bid": "thirtybid10",
+ "tdmanager": {
+ "port": "8099",
+ "host": "http://tl-tdbank-tdmanger.tencent-distribute.com"
+ }
+ },
+ "op": "add"
+ }'
+
+
+##3、run
+After decompression, run the following command
+
+ sh agent.sh start
diff --git a/docs/en-us/modules/console/quick_start.md b/docs/en-us/modules/console/quick_start.md
new file mode 100644
index 0000000..fb6a558
--- /dev/null
+++ b/docs/en-us/modules/console/quick_start.md
@@ -0,0 +1,41 @@
+## Before
+
+You should check that `nodejs >= 12.0` is installed.
+
+## Dev
+
+In the project, you can run some built-in commands:
+
+If `node_modules` is not installed, you should first run `npm install` or `yarn install`.
+
+Use `npm run dev` or `yarn dev` to run the application in development mode.
+
+If the server runs successfully, the browser will open [http://localhost:8080](http://localhost:8080) to view in the browser.
+
+If you edit, the page will reload.
+You will also see any lint errors in the console.
+
+### Note
+
+The start of the web server depends on the back-end server api interface.
+
+You should start the backend server first, and then set the variable `target` in `/inlong-website/src/setupProxy.js` to the address of the api service.
+
+## Test
+
+Run `npm test` or `yarn test`
+
+Start the test runner in interactive observation mode.
+For more information, see the section on [Running Tests](https://create-react-app.dev/docs/running-tests/).
+
+## Build and deploy
+
+Run `npm run build` or `yarn build`
+
+Build the application for production into the build folder.
+Better page performance can be obtained in the constructed production mode.
+
+After the build, the code is compressed, and the file name includes the hash value.
+Your application is ready to be deployed!
+
+For details, see the section on [deployment](https://create-react-app.dev/docs/deployment/).
\ No newline at end of file
diff --git a/docs/en-us/modules/dataproxy-sdk/architecture.md b/docs/en-us/modules/dataproxy-sdk/architecture.md
new file mode 100644
index 0000000..5d20906
--- /dev/null
+++ b/docs/en-us/modules/dataproxy-sdk/architecture.md
@@ -0,0 +1,57 @@
+# 1、intro
+When the business uses the message access method, the business generally only needs to format the data in a proxy-recognizable format (such as six-segment protocol, digital protocol, etc.)
+After group packet transmission, data can be connected to inlong. But in order to ensure data reliability, load balancing, and dynamic update of the proxy list and other security features
+The user program needs to consider more and ultimately leads to the program being too cumbersome and bloated.
+
+The original intention of API design is to simplify user access and assume some reliability-related logic. After the user integrates the API in the service delivery program, the data can be sent to the proxy without worrying about the grouping format, load balancing and other logic.
+
+# 2、functions
+
+## 2.1 overall functions
+
+| function | description |
+| ---- | ---- |
+| Package function (new) | The user data is packaged and sent to the proxy in a packet format recognized by the proxy (such as six-segment protocol, digital protocol, etc.)|
+| Compression function| Before sending proxy, compress user data to reduce network bandwidth usage|
+| Maintain proxy list| Get the proxy list every five minutes to detect whether there is a proxy machine on the operation and maintenance side; automatically remove unavailable connections every 20s to ensure that the connected proxy can operate normally |
+| Indicator statistics (new)| Increase the indicator of business minute-level sending volume (interface level)|
+| Load balancing (new)| Use the new strategy to load balance the sent data among multiple proxies, instead of relying on simple random + polling mechanism to ensure|
+| proxy list persistence (new)| Persist the proxy list according to the business id to prevent the configuration center from failing to send data when the program starts
+
+
+## 2.2 Data transmission function description
+
+### Synchronous batch function
+
+ public SendResult sendMessage(List<byte[]> bodyList, String bid, String tid, long dt, long timeout, TimeUnit timeUnit)
+
+ Parameter Description
+
+ bodyListIt is a collection of multiple pieces of data that users need to send. The total length is recommended to be less than 512k. bid represents the service id, and tid represents the interface id. dt represents the time stamp of the data, accurate to the millisecond level. It can also be set to 0 directly, and the api will get the current time as its timestamp in the background. timeout & timeUnit: These two parameters are used to set the timeout time for sending data, and it is [...]
+
+### Synchronize a single function
+
+ public SendResult sendMessage(byte[] body, String bid, String tid, long dt, long timeout, TimeUnit timeUnit)
+
+ Parameter Description
+
+ body is the content of a single piece of data that the user wants to send, and the meaning of the remaining parameters is basically the same as the batch sending interface.
+
+
+### Asynchronous batch function
+
+ public void asyncSendMessage(SendMessageCallback callback, List<byte[]> bodyList, String bid, String tid, long dt, long timeout,TimeUnit timeUnit)
+
+ Parameter Description
+
+ SendMessageCallback is a callback for processing messages. The bodyList is a collection of multiple pieces of data that users need to send. The total length of multiple pieces of data is recommended to be less than 512k. bid is the service id, and tid is the interface id. dt represents the time stamp of the data, accurate to the millisecond level. It can also be set to 0 directly, and the api will get the current time as its timestamp in the background. timeout and timeUnit are the t [...]
+
+
+### Asynchronous single function
+
+
+ public void asyncSendMessage(SendMessageCallback callback, byte[] body, String bid, String tid, long dt, long timeout, TimeUnit timeUnit)
+
+ Parameter Description
+
+ The body is the content of a single message, and the meaning of the remaining parameters is basically the same as the batch sending interface
diff --git a/docs/en-us/modules/dataproxy-sdk/quick_start.md b/docs/en-us/modules/dataproxy-sdk/quick_start.md
new file mode 100644
index 0000000..a96047a
--- /dev/null
+++ b/docs/en-us/modules/dataproxy-sdk/quick_start.md
@@ -0,0 +1,9 @@
+# how to use
+
+add dependency in pom and use the api in architecture.md
+
+ <dependency>
+ <groupId>com.tencent.tdbank</groupId>
+ <artifactId>TDBusSDK</artifactId>
+ <version>1.2.21</version>
+ </dependency>
\ No newline at end of file
diff --git a/docs/en-us/modules/dataproxy/architecture.md b/docs/en-us/modules/dataproxy/architecture.md
new file mode 100644
index 0000000..2fe2abf
--- /dev/null
+++ b/docs/en-us/modules/dataproxy/architecture.md
@@ -0,0 +1,11 @@
+# 1、intro
+
+ Inlong-bus belongs to the inlong proxy layer and is used for data collection, reception and forwarding. Through format conversion, the data is converted into TDMsg1 format that can be cached and processed by the cache layer
+ The overall architecture of inlong-bus is based on Apache Flume. On the basis of this project, inlong-bus expands the source layer and sink layer, and optimizes disaster tolerance forwarding, which improves the stability of the system.
+
+
+# 2、architecture
+
+ 1. The source layer opens port monitoring, which is realized through netty server. The decoded data is sent to the channel layer
+ 2. The channel layer has a selector, which is used to choose which type of channel to go. If the memory is eventually full, the data will be processed.
+ 3. The data of the channel layer will be forwarded through the sink layer. The main purpose here is to convert the data to the TDMsg1 format and push it to the cache layer (tube is more commonly used here)
diff --git a/docs/en-us/modules/dataproxy/quick_start.md b/docs/en-us/modules/dataproxy/quick_start.md
new file mode 100644
index 0000000..3abdc59
--- /dev/null
+++ b/docs/en-us/modules/dataproxy/quick_start.md
@@ -0,0 +1,40 @@
+## 1、install
+
+ mvn clean package -DskipTests
+
+The tgz installation package apache-inlong-proxy-0.9.0-incubating-SNAPSHOT-bin.tar.gz can be found under the inlong-dataproxy/dataproxy-dist/target project
+
+ un tar it
+ tar -zxvf apache-inlong-proxy-0.9.0-incubating-SNAPSHOT-bin.tar.gz
+
+
+## 2、configuration
+
+ cd apache-inlong-proxy-0.9.0-incubating-SNAPSHOT-bin
+
+### config tube
+ vim conf/flume.conf
+ In vim command line mode, execute the following replacement commands, where xxx is the tube address
+ :%s/TUBE_LIST/xx.xx.xx.xx:port,xx.xx.xx.xx:port
+
+### Environmental preparation
+ cd bin
+ sh prepare_env.sh
+ cd ..
+
+### config manager
+ vim conf/commmon.properties
+ 写入以下配置：
+ cluster_id=1
+ manager_hosts=xx.xx.xx.xx:port
+
+## 3、run
+ sh bin/start.sh
+
+## 4、check
+ telnet 127.0.0.1 46801
+
+## 5、test
+ use proxySdk to test
+
+
diff --git a/docs/en-us/modules/manager/architecture.md b/docs/en-us/modules/manager/architecture.md
new file mode 100644
index 0000000..fc683ac
--- /dev/null
+++ b/docs/en-us/modules/manager/architecture.md
@@ -0,0 +1,33 @@
+---
+title: Architecture Introduction-Apache InLong Manager
+---
+
+## Introduction to Apache InLong Manager
+
++ Target positioning: Apache inlong is positioned as a one-stop data access solution, providing complete coverage of big data access scenarios from data collection, transmission, sorting, and technical capabilities.
+
++ Platform value: Users can complete task configuration, management, and indicator monitoring through the platform's built-in management and configuration platform. At the same time, the platform provides SPI extension points in the main links of the process to implement custom logic as needed. Ensure stable and efficient functions while lowering the threshold for platform use.
+
++ Apache InLong Manager is the user-oriented unified UI of the entire data access platform. After the user logs in, it will provide different function permissions and data permissions according to the corresponding role. The page provides maintenance portals for the platform's basic clusters (such as mq, sorting), and you can view basic maintenance information and capacity planning adjustments at any time. At the same time, business users can complete the creation, modification and maint [...]
+## Architecture
+
+
+
+
+##Module division of labor
+
+|Module |Responsibilities |
+| :----| :---- |
+|manager-common |Module common code, entry exception definition, tool class, enumeration, etc.|
+|manager-dao|Database Operation|
+|manager-openapi |Background open interface|
+|manager-service |Business Logic Layer |
+|manager-web |Front-end interactive response interface|
+|manager-workflow-engin|Workflow Engine|
+
+## use process
+
+
+
+## data model
+
\ No newline at end of file
diff --git a/docs/en-us/modules/manager/img/datamodel.jpg b/docs/en-us/modules/manager/img/datamodel.jpg
new file mode 100644
index 0000000..7d0b578
Binary files /dev/null and b/docs/en-us/modules/manager/img/datamodel.jpg differ
diff --git a/docs/en-us/modules/manager/img/inlong-manager.png b/docs/en-us/modules/manager/img/inlong-manager.png
new file mode 100644
index 0000000..3db4937
Binary files /dev/null and b/docs/en-us/modules/manager/img/inlong-manager.png differ
diff --git a/docs/en-us/modules/manager/img/interactive.jpg b/docs/en-us/modules/manager/img/interactive.jpg
new file mode 100644
index 0000000..7238d00
Binary files /dev/null and b/docs/en-us/modules/manager/img/interactive.jpg differ
diff --git a/docs/en-us/modules/manager/quick_start.md b/docs/en-us/modules/manager/quick_start.md
new file mode 100644
index 0000000..25b3dff
--- /dev/null
+++ b/docs/en-us/modules/manager/quick_start.md
@@ -0,0 +1,116 @@
+---
+ Quick start-Apache inlong-manager
+---
+
+# 1. Compile
+
++ Environment preparation: Java (1.8+) and Maven (3.3+) tools have been installed correctly.
+
++ Enter the `inlong-manager` directory of the project through the terminal of macOS (or cmd on Windows), and run the following Maven command to package the project:
+
+-Compile and Package
+```
+mvn clean package -DskipTests
+```
+
++ After the correct packaging is completed, you can see the tar package in the `target` directory of each submodule, manager-web-xxx-incubating-SNAPSHOT.tar.gz
+
+
+# 2 Dependency Preparation
+## 2.1 Database initialization
++ mysql 5.7+, create a database in advance, and import inlong-manager/doc/sql/apache_inlong_manager.sql to complete the initialization of the table structure and basic data, and modify the database connection in application-xx.yml
++ zookeeper 3.5+, configure the information to the corresponding location of the application-xx.yml file
++ Tube cluster information, and modify tube-related configuration information in application-xx.yml
++ hadoop 2.10.x cluster, hive 2.3.x needs to be built and started in advance
+
+# 3. Background service deployment & startup
+
+## 3.1 manager-web deployment
++ 3.1.1 Find the installation package, enter /apache-inlong/inlong-manager/manager-web/target and find manager-web-xxx-incubating-SNAPSHOT.tar.gz
++ 3.1.2 Deploy the installation package and press it to the corresponding directory of the server where the service will be deployed tar -zxvf manager-web-xxx-incubating-SNAPSHOT.tar.gz
++ 3.1.3 Modify the configuration file, change the configuration file in manager-web/conf, take profile.active=dev in application.yml as an example, modify the application-dev.yml file according to the actual content
++ 3.1.4 Start the service, execute the start.sh script in the bin directory, and observe whether the log manager-web/log/manager-web.log and the back-end port are listening normally
+
+## 3.2 manager-apenapi deployment
++ 3.2.1 Find the installation package, enter /apache-inlong/inlong-manager/manager-openapi/target and find manager-openapi-xxx-incubating-SNAPSHOT.tar.gz
++ 3.2.2 Deploy the installation package and press it to the corresponding directory of the server where the service will be deployed tar -zxvf manager-web-0.9.0-incubating-SNAPSHOT.tar.gz
++ 3.2.3 Modify the configuration file, change the configuration file in manager-openapi/conf, take profile.active=dev in application.yml as an example, change the content of the configuration application-dev.yml file to the real content
++ 3.2.4 Start the service, execute the start.sh script in the bin directory, and observe whether the log manager-openapi/log/manager-openapi.log and the backend port are listening normally
+
+## 3.3 Detailed back-end configuration
++ `manager-web/conf/application.yml` file
+
+```yml
+logging:
+ level:
+ root: INFO
+ org:
+ apache:
+ inlong:
+ manager:
+ dao:
+ mapper: debug
+ third:
+ debug
+
+spring:
+ datasource:
+ jdbc-url: jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?serverTimezone=GMT%2b8&useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+ username: xxxxxx
+ password: xxxxxx
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ type: com.alibaba.druid.pool.DruidDataSource
+ druid:
+ # Configure test query
+ validationQuery: SELECT 'x'
+ # Initialization size, minimum, maximum
+ initialSize: 20
+ minIdle: 20
+ maxActive: 300
+ # Configure the timeout period to wait for the connection to be acquired
+ maxWait: 600000
+ # Configure the minimum survival time of a connection in the pool, in milliseconds
+ minEvictableIdleTimeMillis: 3600000
+ # Detect when applying for connection. It is recommended to configure it to true, which does not affect performance and ensures safety
+ testWhileIdle: true
+ # Perform detection when obtaining a connection, it is recommended to close it, which affects performance
+ testOnBorrow: false
+ # Perform detection when returning the connection, it is recommended to close it, which affects performance
+ testOnReturn: false
+ # Configure filters for monitoring statistics interception，stat:Monitoring statistics log4j:log wall:Defense against SQL injection
+ filters: stat,wall
+ # Open the mergeSql function through the connectProperties property；Slow SQL records
+ connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+# InLong configuration
+inlong:
+ schedule:
+ user:
+ enable: false
+ update-cron: '0 0 2 * * ?'
+ common:
+ machineNum: 1
+ path: ~/
+ modules:
+ - agent
+
+# Cluster info
+cluster:
+ tube:
+ manager: http://127.0.0.1:8081
+ master: 127.0.0.1:8000,127.0.0.1:8010
+ zk:
+ url: 127.0.0.1:2181
+ root: inlong_hive
+ hive:
+ metastoreAddress: jdbc:mysql://127.0.0.1:3306/hive?useSSL=false
+
+```
+
+## 3.4 Background service verification:
+
+<http://x.x.x.x/api/inlong/manager/doc.html#/home>
+
+Here `x.x.x.x` is modified to the IP of the server where the application is deployed
+
+
diff --git a/docs/en-us/modules/sort/img.png b/docs/en-us/modules/sort/img.png
new file mode 100644
index 0000000..131eddf
Binary files /dev/null and b/docs/en-us/modules/sort/img.png differ
diff --git a/docs/en-us/modules/sort/introduction.md b/docs/en-us/modules/sort/introduction.md
new file mode 100644
index 0000000..0ea4b8f
--- /dev/null
+++ b/docs/en-us/modules/sort/introduction.md
@@ -0,0 +1,36 @@
+---
+title: Introduction - Apache InLong-sort
+---
+
+# overview
+Inlong-sort is used to extract data from different source systems, then transforms the data and finally loads the data into diffrent storage systems.
+Inlong-sort is simply an Flink application, and relys on Inlong-manager to manage meta data(such as the source informations and storage informations)
+
+#features
+## multi-tenancy
+Inlong-sort is an multi-tenancy system, which means you can extract data from different sources(these sources must be of the same source type) and load data into different sinks(these sinks must be of the same storage type).
+e.g. you can extract data form different topics of inlong-tubemq and the load them to different hive clusters.
+
+## change meta data without restart
+Inlong-sort uses zookeeper to manage its meta data, every time you change meta data on zk, inlong-sort application will be informed immediately.
+e.g if you want to change the schema of your data, just change the meta data on zk without restart your inlong-sort application.
+
+# supported sources
+- inlong-tubemq
+
+# supported storages
+- clickhouse
+- hive (Currently we just support parquet file format)
+
+#limitations
+Currently, we just support extracting specified fields in the stage of **Transform**.
+
+# future plans
+## More kinds of source systems
+pulsar, kafka and etc
+
+## More kinds of storage systems
+Hbase, Elastic Search, and etc
+
+## More kinds of file format in hive sink
+sequence file, orc
\ No newline at end of file
diff --git a/docs/en-us/modules/sort/protocol_introduction.md b/docs/en-us/modules/sort/protocol_introduction.md
new file mode 100644
index 0000000..332df2a
--- /dev/null
+++ b/docs/en-us/modules/sort/protocol_introduction.md
@@ -0,0 +1,23 @@
+---
+title: Protocol Introduction - Apache InLong-sort
+---
+
+# Overview
+当前inlong-sort的元数据管理依赖inlong-manager。inlong-sort与inlong-manager之间通过zk进行元数据的交互。
+
+# Zookeeper's path structure
+
+
+
+
+Cluster represents a flink job. Multiple flows can be handled in the same cluster, but these flows must be homogeneous (source is the same as sink).
+
+The DataFlow represents a specific flow, and each flow is identified by a globally unique ID. The flow consists of source + sink.
+
+A path at the top of the figure indicates which dataflow are running in a cluster, without metadata under the node.
+
+The path below is used to store the details of the dataflow.
+
+# Protocol
+Please reference
+`org.apache.inlong.sort.protocol.DataFlowInfo`
\ No newline at end of file
diff --git a/docs/en-us/modules/sort/quick_start.md b/docs/en-us/modules/sort/quick_start.md
new file mode 100644
index 0000000..9f4363f
--- /dev/null
+++ b/docs/en-us/modules/sort/quick_start.md
@@ -0,0 +1,81 @@
+---
+title: Quick Start - Apache InLong-sort
+---
+
+# Requirements
+- Java JDK 1.8
+- Maven 3.6+
+- Flink 1.9.3
+- Zookeeper
+
+#Set up flink environment
+Currently inlong-sort is based on flink, before you run an inlong-sort application,
+you need to set up flink environment.
+
+<a href="https://ci.apache.org/projects/flink/flink-docs-release-1.9/ops/deployment/cluster_setup.html" target="_blank">how to set up flink environment</a>
+
+Currently, inlong-sort relys on flink-1.9.3. Chose `flink-1.9.3-bin-scala_2.11.tgz` when downloading package.
+
+Once your flink environment is set up, you can visit web ui of flink, whose address is stored in `/${your_flink_path}/conf/masters`.
+
+# Zookeeper
+Inlong-sort uses zookeeper to manage its meta data. Make sure your zk is prepared before starting your inlong-sort application.
+
+#Compile inlong-sort
+- `cd /your_path/Inlong/inlong-sort`
+- `mvn clean package`
+
+After running this, you will get `inlong-sort-core-{version}.jar` in `/your_path/Inlong/inlong-sort/core/target`
+
+#Starting an inlong-sort application
+Now you can submit job to flink with the jar compiled.
+
+<a href="https://ci.apache.org/projects/flink/flink-docs-release-1.9/ops/deployment/yarn_setup.html#submit-job-to-flink" target="_blank">how to submit job to flink</a>
+
+Example：
+
+- `./bin/flink run -c org.apache.inlong.sort.flink.Entrance inlong-sort-core-1.0-SNAPSHOT.jar --cluster-id my_application --zookeeper.quorum 127.0.0.1:2181 --zookeeper.path.root /inlong-sort --source.type tubemq --sink.type hive`
+
+Notice：
+
+- `-c org.apache.inlong.sort.flink.Entrance` 表示main class name
+
+- `inlong-sort-core-1.0-SNAPSHOT.jar` 为编译阶段产出的jar包
+
+#Necessary configurations
+- `--cluster-id ` which is used to represent a specified inlong-sort application
+- `--zookeeper.quorum` zk quorum
+- `--zookeeper.path.root` zk root path
+- `--source.type` source of the application, currently only "tubemq" is supported
+- `--sink.type` sink of the application, currently "clickhouse" and "hive" are supported
+
+Configurations above are necessary, you can see full configurations in
+
+`~/Inlong/inlong-sort/common/src/main/java/org/apache/inlong/sort/configuration/Constants.java`
+
+**Example**
+
+`--cluster-id my_application --zookeeper.quorum 192.127.0.1:2181 --zookeeper.path.root /zk_root --source.type tubemq --sink.type hive`
+
+#All configurations
+| name | necessary | default value |description |
+| ------------ | ------------ | ------------ | ------------ |
+|cluster-id | Y | NA | used to represent a specified inlong-sort application |
+|zookeeper.quorum | Y | NA | zk quorum |
+|zookeeper.path.root | Y | "/inlong-sort" | zk root path |
+|source.type | Y | NA | source of the application, currently only "tubemq" is supported |
+|sink.type | Y | NA | sink of the application, currently "clickhouse" and "hive" are supported |
+|source.parallelism | N | 1 | parallelism of source |
+|deserialization.parallelism | N | 1 | parallelism of deserialization |
+|sink.parallelism | N | 1 | parallelism of sink |
+|tubemq.master.address | N | NA | tube master address used if absent in DataFlowInfo on zk |
+|tubemq.session.key |N |"inlong-sort" | session key used when subscribing to tubemq |
+|tubemq.bootstrap.from.max | N | false | whether consume from max or not when subscribing to tubemq |
+|tubemq.message.not.found.wait.period | N | 350ms | The time of waiting period if tube broker return message not found |
+|tubemq.subscribe.retry.timeout | N | 300000 | The time of subscribing tube timeout, in millisecond |
+|zookeeper.client.session-timeout | N | 60000 | The session timeout for the ZooKeeper session in ms |
+|zookeeper.client.connection-timeout | N | 15000 | The connection timeout for ZooKeeper in ms |
+|zookeeper.client.retry-wait | N | 5000 | The pause between consecutive retries in ms |
+|zookeeper.client.max-retry-attempts | N | 3 | The number of connection retries before the client gives up |
+|zookeeper.client.acl | N | "open" | Defines the ACL (open/creator) to be configured on ZK node. The configuration value can be set to “creator” if the ZooKeeper server configuration has the “authProvider” property mapped to use SASLAuthenticationProvider and the cluster is configured to run in secure mode (Kerberos) |
+|zookeeper.sasl.disable | N | false | Whether disable zk sasl or not |
diff --git a/docs/en-us/appendixfiles/http_access_api_definition_cn.xls b/docs/en-us/modules/tubemq/appendixfiles/http_access_api_definition_cn.xls
similarity index 99%
rename from docs/en-us/appendixfiles/http_access_api_definition_cn.xls
rename to docs/en-us/modules/tubemq/appendixfiles/http_access_api_definition_cn.xls
index 31a61b0..8d22d60 100644
Binary files a/docs/en-us/appendixfiles/http_access_api_definition_cn.xls and b/docs/en-us/modules/tubemq/appendixfiles/http_access_api_definition_cn.xls differ
diff --git a/docs/en-us/architecture.md b/docs/en-us/modules/tubemq/architecture.md
similarity index 57%
rename from docs/en-us/architecture.md
rename to docs/en-us/modules/tubemq/architecture.md
index a0ee089..5bdfb4a 100644
--- a/docs/en-us/architecture.md
+++ b/docs/en-us/modules/tubemq/architecture.md
@@ -1,5 +1,5 @@
---
-title: Architecture - Apache TubeMQ
+title: Architecture - Apache InLong's TubeMQ module
---
## TubeMQ Architecture： ##
@@ -14,15 +14,16 @@ After years of evolution, the TubeMQ cluster is divided into the following 5 par
- **Client：** The Client part responsible for data production and consumption. We provide this part in the form of Lib. The most commonly used is the consumer. Compared with the previous, the consumer now supports Push and Pull data pull modes, data consumption behavior support both order and filtered consumption. For the Pull consumption mode, the service supports resetting the precise offset through the client to support the business extract-once consumption. At the same time, the cons [...]
-- **Zookeeper：** Responsible for the zk part of the offset storage. This part of the function has been weakened to only the persistent storage of the offset. Considering the next multi-node copy function, this module is temporarily reserved;
+- **Zookeeper：** Responsible for the Zookeeper part of the offset storage. This part of the function has been weakened to only the persistent storage of the offset. Considering the next multi-node copy function, this module is temporarily reserved;
## Broker File Storage Scheme Improvement： ##
-Systems that use disk as a medium for data persistence are faced with a variety of performance issues caused by disk problems,TubeMQ is no exception. Performance improvements are largely addressed to solve the problem of how message data is read, write and stored. In this respect, TubeMQ has made some improvements:
+Systems that use disks as data persistence media are faced with various system performance problems caused by disk problems. The TubeMQ system is no exception, the performance improvement is largely to solve the problem of how to read, write and store message data. In this regard TubeMQ has made many improvements: storage instances is as the smallest Topic data management unit; each storage instance includes a file storage block and a memory cache block; each Topic can be assigned multip [...]
-1. **File structure and organization adjustment:** TubeMQ's disk storage scheme is similar to Kafka, but not the same, as the figure shown below. Storage instance is consisted of an index file and a data file, each topic can allocate one or more storage instances. And each topic separately maintains the mechanisms of managing storage instances, including aging cycles, number of partitions, whether readable or writable, etc.
+1. **File storage block:** The disk storage solution of TubeMQ is similar to Kafka, but it is not the same, as shown in the following figure: each file storage block is composed of an index file and a data file; the partiton is a logical partition in the data file; each Topic maintains and manages the file storage block separately, the related mechanisms include the aging cycle, the number of partitions, whether it is readable and writable, etc.
-2. **Memory block cache:** We add an additional memory cache block for each storage instance based on the file storage, i.e. add a piece of memory to the original write disk to isolate the slow impact of hard disk. The data is brushed into memory first, and the memory control block then brushes the data to disk files in bulk.
+
+2. **Memory cache block:** We added a separate memory cache block on the file storage block, that is, add a block of memory to the original write disk to isolate the slow effect of the hard disk. The data is first flushed to the memory cache block, and then the memory cache block is batched flush the data to the disk file.
diff --git a/docs/en-us/client_rpc.md b/docs/en-us/modules/tubemq/client_rpc.md
similarity index 98%
rename from docs/en-us/client_rpc.md
rename to docs/en-us/modules/tubemq/client_rpc.md
index e935b4e..e423857 100644
--- a/docs/en-us/client_rpc.md
+++ b/docs/en-us/modules/tubemq/client_rpc.md
@@ -1,8 +1,8 @@
---
-title: Client RPC - Apache TubeMQ
+title: Client RPC - Apache InLong's TubeMQ module
---
-# Definition of Apache TubeMQ RPC
+# Definition of TubeMQ RPC
## General Introduction
diff --git a/docs/en-us/clients_java.md b/docs/en-us/modules/tubemq/clients_java.md
similarity index 93%
rename from docs/en-us/clients_java.md
rename to docs/en-us/modules/tubemq/clients_java.md
index d2c5a8d..780b1ab 100644
--- a/docs/en-us/clients_java.md
+++ b/docs/en-us/modules/tubemq/clients_java.md
@@ -1,5 +1,5 @@
---
-title: JAVA SDK API - Apache TubeMQ
+title: JAVA SDK API - Apache InLong's TubeMQ module
---
## **TubeMQ Lib** **接口使用**
@@ -64,7 +64,7 @@ Message类是TubeMQ里传递的消息对象类，业务设置的data会从生产
#### **a) 环境准备：**
-TubeMQ开源包org.apache.tube.example里提供了生产和消费的具体代码示例，这里我们通过一个实际的例子来介绍如何填参和调用对应接口。首先我们搭建一个带3个Master节点的TubeMQ集群，3个Master地址及端口分别为test_1.domain.com，test_2.domain.com，test_3.domain.com，端口均为8080，在该集群里我们建立了若干个Broker，并且针对Broker我们创建了3个topic：topic_1，topic_2，topic_3等Topic配置；然后我们启动对应的Broker等待Consumer和Producer的创建。
+TubeMQ开源包org.apache.tubemq.example里提供了生产和消费的具体代码示例，这里我们通过一个实际的例子来介绍如何填参和调用对应接口。首先我们搭建一个带3个Master节点的TubeMQ集群，3个Master地址及端口分别为test_1.domain.com，test_2.domain.com，test_3.domain.com，端口均为8080，在该集群里我们建立了若干个Broker，并且针对Broker我们创建了3个topic：topic_1，topic_2，topic_3等Topic配置；然后我们启动对应的Broker等待Consumer和Producer的创建。
@@ -139,7 +139,7 @@ public void subscribe(final Map<String, TreeSet<String>> topicTidsMap)
到此，对集群里对应topic的订阅就已完成，系统运行开始后，回调函数里数据将不断的通过回调函数推送到业务层进行处理：
```java
-public class DefaultMessageListener implements MessageV2Listener {
+public class DefaultMessageListener implements MessageListener {
private String topic;
@@ -154,11 +154,6 @@ public class DefaultMessageListener implements MessageV2Listener {
}
}
- public void receiveMessages(final List<Message> messages) throws InterruptedException
- {
- // deprecated
- }
-
public Executor getExecutor() {
return null;
}
diff --git a/docs/en-us/configure_introduction.md b/docs/en-us/modules/tubemq/configure_introduction.md
similarity index 98%
rename from docs/en-us/configure_introduction.md
rename to docs/en-us/modules/tubemq/configure_introduction.md
index 3ae8962..11bc04c 100644
--- a/docs/en-us/configure_introduction.md
+++ b/docs/en-us/modules/tubemq/configure_introduction.md
@@ -1,17 +1,18 @@
---
-title: Configure Introduction - Apache TubeMQ
+title: Configure Introduction - Apache InLong's TubeMQ module
---
# TubeMQ configuration item description
The TubeMQ server includes two modules for the Master and the Broker. The Master also includes a Web front-end module for external page access (this part is stored in the resources). Considering the actual deployment, two modules are often deployed in the same machine, TubeMQ. The contents of the three parts of the two modules are packaged and delivered to the operation and maintenance; the client does not include the lib package of the server part and is delivered to the user separately.
-Master and Broker use the ini configuration file format, and the relevant configuration files are placed in the master.ini and broker.ini files in the tubemq-server-3.8.0/conf/ directory.
+Master and Broker use the ini configuration file format, and the relevant configuration files are placed in the master.ini and broker.ini files in the tubemq-server-3.9.0/conf/ directory:
+
Their configuration is defined by a set of configuration units. The Master configuration consists of four mandatory units: [master], [zookeeper], [bdbStore], and optional [tlsSetting]. The Broker configuration is mandatory. Broker], [zookeeper] and optional [tlsSetting] consist of a total of 3 configuration units; in actual use, you can also combine the contents of the two configuration files into one ini file.
In addition to the back-end system configuration file, the Master also stores the Web front-end page module in the resources. The root directory velocity.properties file of the resources is the Web front-end page configuration file of the Master.
-
+
## Configuration item details:
diff --git a/docs/en-us/console_introduction.md b/docs/en-us/modules/tubemq/console_introduction.md
similarity index 99%
rename from docs/en-us/console_introduction.md
rename to docs/en-us/modules/tubemq/console_introduction.md
index 0ec9c20..d05e9ce 100644
--- a/docs/en-us/console_introduction.md
+++ b/docs/en-us/modules/tubemq/console_introduction.md
@@ -1,5 +1,5 @@
---
-title: Console Introduction - Apache TubeMQ
+title: Console Introduction - Apache InLong's TubeMQ module
---
# TubeMQ管控台操作指引
diff --git a/docs/en-us/consumer_example.md b/docs/en-us/modules/tubemq/consumer_example.md
similarity index 86%
rename from docs/en-us/consumer_example.md
rename to docs/en-us/modules/tubemq/consumer_example.md
index 8cc4cc7..c59a24b 100644
--- a/docs/en-us/consumer_example.md
+++ b/docs/en-us/modules/tubemq/consumer_example.md
@@ -1,5 +1,5 @@
---
-title: Consumer Example - Apache TubeMQ
+title: Consumer Example - Apache InLong's TubeMQ module
---
## Consumer Example
@@ -31,14 +31,6 @@ title: Consumer Example - Apache TubeMQ
System.out.println("received message : " + message);
}
messagePullConsumer.confirmConsume(result.getConfirmContext(), true);
- } else {
- if (result.getErrCode() == 400) {
- ThreadUtils.sleep(100);
- } else {
- if (result.getErrCode() != 404) {
- System.out.println(String.format("Receive messages errorCode is %d, Error message is %s", result.getErrCode(), result.getErrMsg()));
- }
- }
}
}
}
@@ -61,7 +53,7 @@ title: Consumer Example - Apache TubeMQ
pushConsumer.subscribe(topic, null, new MessageListener() {
@Override
- public void receiveMessages(List<Message> messages) throws InterruptedException {
+ public void receiveMessages(PeerInfo peerInfo, List<Message> messages) throws InterruptedException {
for (Message message : messages) {
System.out.println("received message : " + new String(message.getData()));
}
diff --git a/docs/en-us/deployment.md b/docs/en-us/modules/tubemq/deployment.md
similarity index 64%
rename from docs/en-us/deployment.md
rename to docs/en-us/modules/tubemq/deployment.md
index 2a7b257..9c61464 100644
--- a/docs/en-us/deployment.md
+++ b/docs/en-us/modules/tubemq/deployment.md
@@ -1,5 +1,5 @@
---
-title: Deployment - Apache TubeMQ
+title: Deployment - Apache InLong's TubeMQ Module
---
# Compile, Deploy and Examples of TubeMQ ：
@@ -20,12 +20,12 @@ We can also run individual compilation in each subdirectory. Steps are the same
**Server Deployment**
-As example above, entry directory `E:\GIT\TubeMQ\tubemq-server\target`, we can see several JARs. `tubemq-server-3.8.0-bin.tar.gz` is the complete server-side installation package， including execution scripts, configuration files, dependencies, and frontend source code. `tubemq-server-3.8.0.jar` is a server-side processing package included in `lib` of the complete project installer. Consider to daily changes and upgrades are most made to server side, we place this jar separately so that w [...]
+As example above, entry directory `..\InLong\inlong-tubemq\tubemq-server\target`, we can see several JARs. `apache-inlong-tubemq-server-0.9.0-incubating-SNAPSHOT-bin.tar.gz` is the complete server-side installation package， including execution scripts, configuration files, dependencies, and frontend source code. `apache-inlong-tubemq-server-0.9.0-incubating-SNAPSHOT.jar` is a server-side processing package included in `lib` of the complete project installer. Consider to daily changes and [...]
-Here we have a complete package deployed onto server and we place it in `/data/tubemq`
+Here we have a complete package deployed onto server and we place it in `/data/inlong`
@@ -36,12 +36,12 @@ There are 3 roles in server package: Master, Broker and Tools. Master and Broker
| Machine | Role | TCP Port | TLS Port | WEB Port | Note |
| --- | --- | --- | --- | --- | --- |
-| 10.224.148.145 | **Master** | 8099 | 8199 | 8080 | Metadata stored at `/stage/metadata` |
-| | Broker | 8123 | 8124 | 8081 | Message stored at`/stage/msgdata` |
-| | ZK | 2181 | | | Offset stored at root directory`/tubemq` |
-| 100.115.158.208 | **Master** | 8099 | 8199 | 8080 | Metadata stored at `/stage/metadata` |
-| | Broker | 8123 | 8124 | 8081 | Message stored at`/stage/msgdata` |
-| 10.224.155.80 | Producer ||||
+| 9.23.27.24 | **Master** | 8099 | 8199 | 8080 | Metadata stored at `/stage/meta_data` |
+| | Broker | 8123 | 8124 | 8081 | Message stored at`/stage/msg_data` |
+| | ZooKeeper | 2181 | | | Offset stored at root directory`/tubemq` |
+| 9.23.28.24 | **Master** | 8099 | 8199 | 8080 | Metadata stored at `/stage/meta_data` |
+| | Broker | 8123 | 8124 | 8081 | Message stored at`/stage/msg_data` |
+| 9.23.27.160 | Producer ||||
| | Consumer ||||
|
@@ -52,11 +52,11 @@ Something should be noticed during deploying Master:
-Take `10.224.148.145` and `100.115.158.208` as examples, if we want to deploy both Master and Broker role on them, we need to configure in `/conf/master.ini`, `/resources/velocity.properties` and `/conf/broker.ini`. First set up the configuration of `10.224.148.145`,
+Take `9.23.27.24` and `9.23.28.24` as examples, if we want to deploy both Master and Broker role on them, we need to configure in `/conf/master.ini`, `/resources/velocity.properties` and `/conf/broker.ini`. First set up the configuration of `9.23.27.24`,
-then it is `100.115.158.208`.
+then it is `9.23.28.24`.
@@ -68,11 +68,11 @@ After configuration, entry directory `bin` of Master environment and start up ma
-We First start up `10.224.148.145`, and then start up Master on `100.115.158.208`. The following messages indicate that the master and backup master have been successfully started up and the external service ports are reachable.
+We First start up `9.23.27.24`, and then start up Master on `9.23.28.24`. The following messages indicate that the master and backup master have been successfully started up and the external service ports are reachable.
-Visiting Master's Administrator panel([http://100.115.158.208:8080/config/topic\_list.htm](http://100.115.158.208:8080/config/topic_list.htm)), search operation working well indicates that master has been successfully started up.
+Visiting Master's Administrator panel([http://9.23.27.24:8080](http://9.23.27.24:8080)), search operation working well indicates that master has been successfully started up.
@@ -117,12 +117,9 @@ Check the Master Control Panel, broker has successfully registered.
**Topic Configuration and Activation**：
Configuration of Topic is similar with Broker's, we should add metadata on Master before using them, otherwise it will report an Not Found Error during production/consumption. For example, if we try to consum a non-existent topic `test`,
-```
-/usr/local/java/default/bin/java -Xmx512m -Dlog4j.configuration=file:/data/tubemq/tubemq-server-3.8.0/conf/tools.log4j.properties -Djava.net.preferIPv4Stack=true -cp /data/tubemq/tubemq-server-3.8.0/lib/\*:/data/tubemq/tubemq-server-3.8.0/conf/\*: com.tencent.tubemq.example.MessageProducerExample 100.115.158.208 10.224.148.145:8000,100.115.158.208:8000 test 10000000
-```
+
Demo returns error message.
-
First we add a topic in topic list page in Master Control Panel.
@@ -144,20 +141,13 @@ Topic is available after overload. We can see some status of topic has changed a
**Message Production and Consumption**：
-We pack Demo for test in package or `tubemq-client-3.8.0.jar` can be used for implementing your own production and consumption.
+We pack Demo for test in package or `tubemq-client-0.9.0-incubating-SNAPSHOT.jar` can be used for implementing your own production and consumption.
We run Producer Demo in below script and we can see data accepted on Broker.
-```
-/usr/local/java/default/bin/java -Xmx512m -Dlog4j.configuration=file:/data/tubemq/tubemq-server-3.8.0/conf/tools.log4j.properties -Djava.net.preferIPv4Stack=true -cp /data/tubemq/tubemq-server-3.8.0/lib/\*:/data/tubemq/tubemq-server-3.8.0/conf/\*: com.tencent.tubemq.example.MessageProducerExample 100.115.158.208 10.224.148.145:8000,100.115.158.208:8000 test 10000000
-```
+
Then we run the Consumption Demo and we can see that consumption is also working properly.
-```
- /usr/local/java/default/bin/java -Xmx512m -Dlog4j.configuration=file:/data/tubemq/tubemq-server-3.8.0/conf/tools.log4j.properties -Djava.net.preferIPv4Stack=true -cp /data/tubemq/tubemq-server-3.8.0/lib/\*:/data/tubemq/tubemq-server-3.8.0/conf/\*: com.tencent.tubemq.example.MessageConsumerExample 10.224.148.145 10.224.148.145:8000,100.115.158.208:8000 test testGroup 3 1 1
-
-```
-
As we can see, files relative to broker's production and consumption already exist.
diff --git a/docs/en-us/error_code.md b/docs/en-us/modules/tubemq/error_code.md
similarity index 99%
rename from docs/en-us/error_code.md
rename to docs/en-us/modules/tubemq/error_code.md
index 4eb22dd..00234bb 100644
--- a/docs/en-us/error_code.md
+++ b/docs/en-us/modules/tubemq/error_code.md
@@ -1,5 +1,5 @@
---
-title: Error Code - Apache TubeMQ
+title: Error Code - Apache InLong's TubeMQ module
---
# Introduction of TubeMQ Error
diff --git a/docs/en-us/http_access_api.md b/docs/en-us/modules/tubemq/http_access_api.md
similarity index 99%
rename from docs/en-us/http_access_api.md
rename to docs/en-us/modules/tubemq/http_access_api.md
index 0568efa..7df316b 100644
--- a/docs/en-us/http_access_api.md
+++ b/docs/en-us/modules/tubemq/http_access_api.md
@@ -1,5 +1,5 @@
---
-title: HTTP API - Apache TubeMQ
+title: HTTP API - Apache InLong's TubeMQ module
---
# HTTP access API definition
diff --git a/docs/en-us/img/.gitkeep b/docs/en-us/modules/tubemq/img/.gitkeep
similarity index 100%
rename from docs/en-us/img/.gitkeep
rename to docs/en-us/modules/tubemq/img/.gitkeep
diff --git a/docs/zh-cn/img/client_rpc/rpc_broker_info.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_broker_info.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_broker_info.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_broker_info.png
diff --git a/docs/zh-cn/img/client_rpc/rpc_bytes_def.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_bytes_def.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_bytes_def.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_bytes_def.png
diff --git a/docs/zh-cn/img/client_rpc/rpc_conn_detail.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_conn_detail.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_conn_detail.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_conn_detail.png
diff --git a/docs/zh-cn/img/client_rpc/rpc_consumer_diagram.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_consumer_diagram.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_consumer_diagram.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_consumer_diagram.png
diff --git a/docs/zh-cn/img/client_rpc/rpc_convert_topicinfo.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_convert_topicinfo.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_convert_topicinfo.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_convert_topicinfo.png
diff --git a/docs/zh-cn/img/client_rpc/rpc_event_proto.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_event_proto.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_event_proto.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_event_proto.png
diff --git a/docs/zh-cn/img/client_rpc/rpc_event_proto_optype.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_event_proto_optype.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_event_proto_optype.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_event_proto_optype.png
diff --git a/docs/en-us/modules/tubemq/img/client_rpc/rpc_event_proto_status.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_event_proto_status.png
new file mode 100644
index 0000000..7a787cc
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/client_rpc/rpc_event_proto_status.png differ
diff --git a/docs/en-us/modules/tubemq/img/client_rpc/rpc_header_fill.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_header_fill.png
new file mode 100644
index 0000000..0023e89
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/client_rpc/rpc_header_fill.png differ
diff --git a/docs/zh-cn/img/client_rpc/rpc_inner_structure.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_inner_structure.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_inner_structure.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_inner_structure.png
diff --git a/docs/zh-cn/img/client_rpc/rpc_master_authorizedinfo.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_master_authorizedinfo.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_master_authorizedinfo.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_master_authorizedinfo.png
diff --git a/docs/zh-cn/img/client_rpc/rpc_message_data.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_message_data.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_message_data.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_message_data.png
diff --git a/docs/zh-cn/img/client_rpc/rpc_pbmsg_structure.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_pbmsg_structure.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_pbmsg_structure.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_pbmsg_structure.png
diff --git a/docs/zh-cn/img/client_rpc/rpc_producer_close2M.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_producer_close2M.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_producer_close2M.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_producer_close2M.png
diff --git a/docs/zh-cn/img/client_rpc/rpc_producer_diagram.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_producer_diagram.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_producer_diagram.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_producer_diagram.png
diff --git a/docs/zh-cn/img/client_rpc/rpc_producer_heartbeat2M.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_producer_heartbeat2M.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_producer_heartbeat2M.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_producer_heartbeat2M.png
diff --git a/docs/zh-cn/img/client_rpc/rpc_producer_register2M.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_producer_register2M.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_producer_register2M.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_producer_register2M.png
diff --git a/docs/zh-cn/img/client_rpc/rpc_producer_sendmsg2B.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_producer_sendmsg2B.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_producer_sendmsg2B.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_producer_sendmsg2B.png
diff --git a/docs/zh-cn/img/client_rpc/rpc_proto_def.png b/docs/en-us/modules/tubemq/img/client_rpc/rpc_proto_def.png
similarity index 100%
rename from docs/zh-cn/img/client_rpc/rpc_proto_def.png
rename to docs/en-us/modules/tubemq/img/client_rpc/rpc_proto_def.png
diff --git a/docs/en-us/modules/tubemq/img/configure/conf_ini_pos.png b/docs/en-us/modules/tubemq/img/configure/conf_ini_pos.png
new file mode 100644
index 0000000..a68e36d
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/configure/conf_ini_pos.png differ
diff --git a/docs/en-us/modules/tubemq/img/configure/conf_velocity_pos.png b/docs/en-us/modules/tubemq/img/configure/conf_velocity_pos.png
new file mode 100644
index 0000000..40e6625
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/configure/conf_velocity_pos.png differ
diff --git a/docs/zh-cn/img/console/1568169770714.png b/docs/en-us/modules/tubemq/img/console/1568169770714.png
similarity index 100%
rename from docs/zh-cn/img/console/1568169770714.png
rename to docs/en-us/modules/tubemq/img/console/1568169770714.png
diff --git a/docs/zh-cn/img/console/1568169796122.png b/docs/en-us/modules/tubemq/img/console/1568169796122.png
similarity index 100%
rename from docs/zh-cn/img/console/1568169796122.png
rename to docs/en-us/modules/tubemq/img/console/1568169796122.png
diff --git a/docs/zh-cn/img/console/1568169806810.png b/docs/en-us/modules/tubemq/img/console/1568169806810.png
similarity index 100%
rename from docs/zh-cn/img/console/1568169806810.png
rename to docs/en-us/modules/tubemq/img/console/1568169806810.png
diff --git a/docs/zh-cn/img/console/1568169823675.png b/docs/en-us/modules/tubemq/img/console/1568169823675.png
similarity index 100%
rename from docs/zh-cn/img/console/1568169823675.png
rename to docs/en-us/modules/tubemq/img/console/1568169823675.png
diff --git a/docs/zh-cn/img/console/1568169839931.png b/docs/en-us/modules/tubemq/img/console/1568169839931.png
similarity index 100%
rename from docs/zh-cn/img/console/1568169839931.png
rename to docs/en-us/modules/tubemq/img/console/1568169839931.png
diff --git a/docs/zh-cn/img/console/1568169851085.png b/docs/en-us/modules/tubemq/img/console/1568169851085.png
similarity index 100%
rename from docs/zh-cn/img/console/1568169851085.png
rename to docs/en-us/modules/tubemq/img/console/1568169851085.png
diff --git a/docs/zh-cn/img/console/1568169863402.png b/docs/en-us/modules/tubemq/img/console/1568169863402.png
similarity index 100%
rename from docs/zh-cn/img/console/1568169863402.png
rename to docs/en-us/modules/tubemq/img/console/1568169863402.png
diff --git a/docs/zh-cn/img/console/1568169879529.png b/docs/en-us/modules/tubemq/img/console/1568169879529.png
similarity index 100%
rename from docs/zh-cn/img/console/1568169879529.png
rename to docs/en-us/modules/tubemq/img/console/1568169879529.png
diff --git a/docs/zh-cn/img/console/1568169889594.png b/docs/en-us/modules/tubemq/img/console/1568169889594.png
similarity index 100%
rename from docs/zh-cn/img/console/1568169889594.png
rename to docs/en-us/modules/tubemq/img/console/1568169889594.png
diff --git a/docs/zh-cn/img/console/1568169900634.png b/docs/en-us/modules/tubemq/img/console/1568169900634.png
similarity index 100%
rename from docs/zh-cn/img/console/1568169900634.png
rename to docs/en-us/modules/tubemq/img/console/1568169900634.png
diff --git a/docs/zh-cn/img/console/1568169908522.png b/docs/en-us/modules/tubemq/img/console/1568169908522.png
similarity index 100%
rename from docs/zh-cn/img/console/1568169908522.png
rename to docs/en-us/modules/tubemq/img/console/1568169908522.png
diff --git a/docs/zh-cn/img/console/1568169916091.png b/docs/en-us/modules/tubemq/img/console/1568169916091.png
similarity index 100%
rename from docs/zh-cn/img/console/1568169916091.png
rename to docs/en-us/modules/tubemq/img/console/1568169916091.png
diff --git a/docs/zh-cn/img/console/1568169925657.png b/docs/en-us/modules/tubemq/img/console/1568169925657.png
similarity index 100%
rename from docs/zh-cn/img/console/1568169925657.png
rename to docs/en-us/modules/tubemq/img/console/1568169925657.png
diff --git a/docs/zh-cn/img/console/1568169946683.png b/docs/en-us/modules/tubemq/img/console/1568169946683.png
similarity index 100%
rename from docs/zh-cn/img/console/1568169946683.png
rename to docs/en-us/modules/tubemq/img/console/1568169946683.png
diff --git a/docs/zh-cn/img/console/1568169954746.png b/docs/en-us/modules/tubemq/img/console/1568169954746.png
similarity index 100%
rename from docs/zh-cn/img/console/1568169954746.png
rename to docs/en-us/modules/tubemq/img/console/1568169954746.png
diff --git a/docs/zh-cn/img/development/create_pull_request.png b/docs/en-us/modules/tubemq/img/development/create_pull_request.png
similarity index 100%
rename from docs/zh-cn/img/development/create_pull_request.png
rename to docs/en-us/modules/tubemq/img/development/create_pull_request.png
diff --git a/docs/zh-cn/img/development/github_fork_repository.png b/docs/en-us/modules/tubemq/img/development/github_fork_repository.png
similarity index 100%
rename from docs/zh-cn/img/development/github_fork_repository.png
rename to docs/en-us/modules/tubemq/img/development/github_fork_repository.png
diff --git a/docs/zh-cn/img/development/jira_create_issue.png b/docs/en-us/modules/tubemq/img/development/jira_create_issue.png
similarity index 100%
rename from docs/zh-cn/img/development/jira_create_issue.png
rename to docs/en-us/modules/tubemq/img/development/jira_create_issue.png
diff --git a/docs/zh-cn/img/development/jira_filter.png b/docs/en-us/modules/tubemq/img/development/jira_filter.png
similarity index 100%
rename from docs/zh-cn/img/development/jira_filter.png
rename to docs/en-us/modules/tubemq/img/development/jira_filter.png
diff --git a/docs/zh-cn/img/development/jira_resolve_issue_1.png b/docs/en-us/modules/tubemq/img/development/jira_resolve_issue_1.png
similarity index 100%
rename from docs/zh-cn/img/development/jira_resolve_issue_1.png
rename to docs/en-us/modules/tubemq/img/development/jira_resolve_issue_1.png
diff --git a/docs/zh-cn/img/development/jira_resolve_issue_2.png b/docs/en-us/modules/tubemq/img/development/jira_resolve_issue_2.png
similarity index 100%
rename from docs/zh-cn/img/development/jira_resolve_issue_2.png
rename to docs/en-us/modules/tubemq/img/development/jira_resolve_issue_2.png
diff --git a/docs/zh-cn/img/development/new_pull_request.png b/docs/en-us/modules/tubemq/img/development/new_pull_request.png
similarity index 100%
rename from docs/zh-cn/img/development/new_pull_request.png
rename to docs/en-us/modules/tubemq/img/development/new_pull_request.png
diff --git a/docs/zh-cn/img/mqs_comare.png b/docs/en-us/modules/tubemq/img/mqs_comare.png
similarity index 100%
rename from docs/zh-cn/img/mqs_comare.png
rename to docs/en-us/modules/tubemq/img/mqs_comare.png
diff --git a/docs/zh-cn/img/perf_appendix_1_bx1_1.png b/docs/en-us/modules/tubemq/img/perf_appendix_1_bx1_1.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_1_bx1_1.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_1_bx1_1.png
diff --git a/docs/zh-cn/img/perf_appendix_1_bx1_2.png b/docs/en-us/modules/tubemq/img/perf_appendix_1_bx1_2.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_1_bx1_2.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_1_bx1_2.png
diff --git a/docs/zh-cn/img/perf_appendix_1_bx1_3.png b/docs/en-us/modules/tubemq/img/perf_appendix_1_bx1_3.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_1_bx1_3.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_1_bx1_3.png
diff --git a/docs/zh-cn/img/perf_appendix_1_bx1_4.png b/docs/en-us/modules/tubemq/img/perf_appendix_1_bx1_4.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_1_bx1_4.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_1_bx1_4.png
diff --git a/docs/zh-cn/img/perf_appendix_1_cg1_1.png b/docs/en-us/modules/tubemq/img/perf_appendix_1_cg1_1.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_1_cg1_1.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_1_cg1_1.png
diff --git a/docs/zh-cn/img/perf_appendix_1_cg1_2.png b/docs/en-us/modules/tubemq/img/perf_appendix_1_cg1_2.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_1_cg1_2.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_1_cg1_2.png
diff --git a/docs/zh-cn/img/perf_appendix_1_cg1_3.png b/docs/en-us/modules/tubemq/img/perf_appendix_1_cg1_3.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_1_cg1_3.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_1_cg1_3.png
diff --git a/docs/zh-cn/img/perf_appendix_1_cg1_4.png b/docs/en-us/modules/tubemq/img/perf_appendix_1_cg1_4.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_1_cg1_4.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_1_cg1_4.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_1000_1.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_1.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_1000_1.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_1.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_1000_2.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_2.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_1000_2.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_2.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_1000_3.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_3.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_1000_3.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_3.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_1000_4.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_4.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_1000_4.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_4.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_1000_5.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_5.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_1000_5.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_5.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_1000_6.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_6.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_1000_6.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_6.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_1000_7.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_7.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_1000_7.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_7.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_1000_8.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_8.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_1000_8.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_8.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_1000_9.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_9.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_1000_9.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_1000_9.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_100_1.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_1.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_100_1.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_1.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_100_2.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_2.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_100_2.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_2.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_100_3.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_3.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_100_3.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_3.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_100_4.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_4.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_100_4.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_4.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_100_5.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_5.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_100_5.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_5.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_100_6.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_6.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_100_6.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_6.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_100_7.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_7.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_100_7.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_7.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_100_8.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_8.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_100_8.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_8.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_100_9.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_9.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_100_9.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_100_9.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_200_1.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_1.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_200_1.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_1.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_200_2.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_2.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_200_2.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_2.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_200_3.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_3.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_200_3.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_3.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_200_4.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_4.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_200_4.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_4.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_200_5.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_5.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_200_5.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_5.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_200_6.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_6.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_200_6.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_6.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_200_7.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_7.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_200_7.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_7.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_200_8.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_8.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_200_8.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_8.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_200_9.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_9.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_200_9.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_200_9.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_500_1.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_1.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_500_1.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_1.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_500_2.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_2.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_500_2.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_2.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_500_3.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_3.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_500_3.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_3.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_500_4.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_4.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_500_4.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_4.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_500_5.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_5.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_500_5.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_5.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_500_6.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_6.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_500_6.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_6.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_500_7.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_7.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_500_7.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_7.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_500_8.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_8.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_500_8.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_8.png
diff --git a/docs/zh-cn/img/perf_appendix_2_topic_500_9.png b/docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_9.png
similarity index 100%
rename from docs/zh-cn/img/perf_appendix_2_topic_500_9.png
rename to docs/en-us/modules/tubemq/img/perf_appendix_2_topic_500_9.png
diff --git a/docs/zh-cn/img/perf_scenario_1.png b/docs/en-us/modules/tubemq/img/perf_scenario_1.png
similarity index 100%
rename from docs/zh-cn/img/perf_scenario_1.png
rename to docs/en-us/modules/tubemq/img/perf_scenario_1.png
diff --git a/docs/zh-cn/img/perf_scenario_1_index.png b/docs/en-us/modules/tubemq/img/perf_scenario_1_index.png
similarity index 100%
rename from docs/zh-cn/img/perf_scenario_1_index.png
rename to docs/en-us/modules/tubemq/img/perf_scenario_1_index.png
diff --git a/docs/zh-cn/img/perf_scenario_2.png b/docs/en-us/modules/tubemq/img/perf_scenario_2.png
similarity index 100%
rename from docs/zh-cn/img/perf_scenario_2.png
rename to docs/en-us/modules/tubemq/img/perf_scenario_2.png
diff --git a/docs/zh-cn/img/perf_scenario_2_index.png b/docs/en-us/modules/tubemq/img/perf_scenario_2_index.png
similarity index 100%
rename from docs/zh-cn/img/perf_scenario_2_index.png
rename to docs/en-us/modules/tubemq/img/perf_scenario_2_index.png
diff --git a/docs/zh-cn/img/perf_scenario_3.png b/docs/en-us/modules/tubemq/img/perf_scenario_3.png
similarity index 100%
rename from docs/zh-cn/img/perf_scenario_3.png
rename to docs/en-us/modules/tubemq/img/perf_scenario_3.png
diff --git a/docs/zh-cn/img/perf_scenario_3_index.png b/docs/en-us/modules/tubemq/img/perf_scenario_3_index.png
similarity index 100%
rename from docs/zh-cn/img/perf_scenario_3_index.png
rename to docs/en-us/modules/tubemq/img/perf_scenario_3_index.png
diff --git a/docs/zh-cn/img/perf_scenario_4_index.png b/docs/en-us/modules/tubemq/img/perf_scenario_4_index.png
similarity index 100%
rename from docs/zh-cn/img/perf_scenario_4_index.png
rename to docs/en-us/modules/tubemq/img/perf_scenario_4_index.png
diff --git a/docs/zh-cn/img/perf_scenario_6_index.png b/docs/en-us/modules/tubemq/img/perf_scenario_6_index.png
similarity index 100%
rename from docs/zh-cn/img/perf_scenario_6_index.png
rename to docs/en-us/modules/tubemq/img/perf_scenario_6_index.png
diff --git a/docs/zh-cn/img/perf_scenario_7.png b/docs/en-us/modules/tubemq/img/perf_scenario_7.png
similarity index 100%
rename from docs/zh-cn/img/perf_scenario_7.png
rename to docs/en-us/modules/tubemq/img/perf_scenario_7.png
diff --git a/docs/zh-cn/img/perf_scenario_8.png b/docs/en-us/modules/tubemq/img/perf_scenario_8.png
similarity index 100%
rename from docs/zh-cn/img/perf_scenario_8.png
rename to docs/en-us/modules/tubemq/img/perf_scenario_8.png
diff --git a/docs/zh-cn/img/perf_scenario_8_index.png b/docs/en-us/modules/tubemq/img/perf_scenario_8_index.png
similarity index 100%
rename from docs/zh-cn/img/perf_scenario_8_index.png
rename to docs/en-us/modules/tubemq/img/perf_scenario_8_index.png
diff --git a/docs/zh-cn/img/perf_scheme.png b/docs/en-us/modules/tubemq/img/perf_scheme.png
similarity index 100%
rename from docs/zh-cn/img/perf_scheme.png
rename to docs/en-us/modules/tubemq/img/perf_scheme.png
diff --git a/docs/en-us/modules/tubemq/img/store_file.png b/docs/en-us/modules/tubemq/img/store_file.png
new file mode 100644
index 0000000..c251dc3
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/store_file.png differ
diff --git a/docs/zh-cn/img/store_mem.png b/docs/en-us/modules/tubemq/img/store_mem.png
similarity index 100%
rename from docs/zh-cn/img/store_mem.png
rename to docs/en-us/modules/tubemq/img/store_mem.png
diff --git a/docs/zh-cn/img/sys_structure.png b/docs/en-us/modules/tubemq/img/sys_structure.png
similarity index 100%
rename from docs/zh-cn/img/sys_structure.png
rename to docs/en-us/modules/tubemq/img/sys_structure.png
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_address_host.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_address_host.png
new file mode 100644
index 0000000..4b38251
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_address_host.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_configure.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_configure.png
new file mode 100644
index 0000000..b8b000f
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_configure.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_deploy.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_deploy.png
new file mode 100644
index 0000000..31fc2d7
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_deploy.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_finished.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_finished.png
new file mode 100644
index 0000000..f5364d0
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_finished.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_online.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_online.png
new file mode 100644
index 0000000..1b0e3e3
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_online.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_online_2.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_online_2.png
new file mode 100644
index 0000000..9f12cb9
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_online_2.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_restart_1.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_restart_1.png
new file mode 100644
index 0000000..4c19cb0
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_restart_1.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_restart_2.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_restart_2.png
new file mode 100644
index 0000000..7a6aea0
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_restart_2.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_start.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_start.png
new file mode 100644
index 0000000..2ad204b
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_start.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_start_error.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_start_error.png
new file mode 100644
index 0000000..f7a94c5
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_broker_start_error.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_compile.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_compile.png
new file mode 100644
index 0000000..edecd21
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_compile.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_configure_1.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_configure_1.png
new file mode 100644
index 0000000..f20201b
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_configure_1.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_configure_2.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_configure_2.png
new file mode 100644
index 0000000..1d35431
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_configure_2.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_master_console.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_master_console.png
new file mode 100644
index 0000000..d03148d
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_master_console.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_master_start.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_master_start.png
new file mode 100644
index 0000000..a513e6c
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_master_start.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_master_startted.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_master_startted.png
new file mode 100644
index 0000000..764b996
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_master_startted.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_node_log.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_node_log.png
new file mode 100644
index 0000000..ae6a435
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_node_log.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_node_status.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_node_status.png
new file mode 100644
index 0000000..f7e2982
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_node_status.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_node_status_2.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_node_status_2.png
new file mode 100644
index 0000000..5f46607
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_node_status_2.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_package.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_package.png
new file mode 100644
index 0000000..f04af8a
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_package.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_package_list.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_package_list.png
new file mode 100644
index 0000000..fb531ba
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_package_list.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_topic_create.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_topic_create.png
new file mode 100644
index 0000000..ae4af1e
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_topic_create.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_topic_deploy.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_topic_deploy.png
new file mode 100644
index 0000000..d41b54c
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_topic_deploy.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_topic_error.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_topic_error.png
new file mode 100644
index 0000000..1673b8a
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_topic_error.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_topic_finished.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_topic_finished.png
new file mode 100644
index 0000000..f37f726
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_topic_finished.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/sys_topic_select.png b/docs/en-us/modules/tubemq/img/sysdeployment/sys_topic_select.png
new file mode 100644
index 0000000..a186889
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/sys_topic_select.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/test_sendmessage.png b/docs/en-us/modules/tubemq/img/sysdeployment/test_sendmessage.png
new file mode 100644
index 0000000..c18ffad
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/test_sendmessage.png differ
diff --git a/docs/en-us/modules/tubemq/img/sysdeployment/test_sendmessage_2.png b/docs/en-us/modules/tubemq/img/sysdeployment/test_sendmessage_2.png
new file mode 100644
index 0000000..05dfeac
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/sysdeployment/test_sendmessage_2.png differ
diff --git a/docs/zh-cn/img/test_scheme.png b/docs/en-us/modules/tubemq/img/test_scheme.png
similarity index 100%
rename from docs/zh-cn/img/test_scheme.png
rename to docs/en-us/modules/tubemq/img/test_scheme.png
diff --git a/docs/zh-cn/img/test_summary.png b/docs/en-us/modules/tubemq/img/test_summary.png
similarity index 100%
rename from docs/zh-cn/img/test_summary.png
rename to docs/en-us/modules/tubemq/img/test_summary.png
diff --git a/docs/zh-cn/img/tubemq-add-broker-1.png b/docs/en-us/modules/tubemq/img/tubemq-add-broker-1.png
similarity index 100%
rename from docs/zh-cn/img/tubemq-add-broker-1.png
rename to docs/en-us/modules/tubemq/img/tubemq-add-broker-1.png
diff --git a/docs/zh-cn/img/tubemq-add-broker-2.png b/docs/en-us/modules/tubemq/img/tubemq-add-broker-2.png
similarity index 100%
rename from docs/zh-cn/img/tubemq-add-broker-2.png
rename to docs/en-us/modules/tubemq/img/tubemq-add-broker-2.png
diff --git a/docs/zh-cn/img/tubemq-add-broker-3.png b/docs/en-us/modules/tubemq/img/tubemq-add-broker-3.png
similarity index 100%
rename from docs/zh-cn/img/tubemq-add-broker-3.png
rename to docs/en-us/modules/tubemq/img/tubemq-add-broker-3.png
diff --git a/docs/zh-cn/img/tubemq-add-topic-1.png b/docs/en-us/modules/tubemq/img/tubemq-add-topic-1.png
similarity index 100%
rename from docs/zh-cn/img/tubemq-add-topic-1.png
rename to docs/en-us/modules/tubemq/img/tubemq-add-topic-1.png
diff --git a/docs/zh-cn/img/tubemq-add-topic-2.png b/docs/en-us/modules/tubemq/img/tubemq-add-topic-2.png
similarity index 100%
rename from docs/zh-cn/img/tubemq-add-topic-2.png
rename to docs/en-us/modules/tubemq/img/tubemq-add-topic-2.png
diff --git a/docs/zh-cn/img/tubemq-add-topic-3.png b/docs/en-us/modules/tubemq/img/tubemq-add-topic-3.png
similarity index 100%
rename from docs/zh-cn/img/tubemq-add-topic-3.png
rename to docs/en-us/modules/tubemq/img/tubemq-add-topic-3.png
diff --git a/docs/zh-cn/img/tubemq-add-topic-4.png b/docs/en-us/modules/tubemq/img/tubemq-add-topic-4.png
similarity index 100%
rename from docs/zh-cn/img/tubemq-add-topic-4.png
rename to docs/en-us/modules/tubemq/img/tubemq-add-topic-4.png
diff --git a/docs/zh-cn/img/tubemq-add-topic-5.png b/docs/en-us/modules/tubemq/img/tubemq-add-topic-5.png
similarity index 100%
rename from docs/zh-cn/img/tubemq-add-topic-5.png
rename to docs/en-us/modules/tubemq/img/tubemq-add-topic-5.png
diff --git a/docs/zh-cn/img/tubemq-add-topic-6.png b/docs/en-us/modules/tubemq/img/tubemq-add-topic-6.png
similarity index 100%
rename from docs/zh-cn/img/tubemq-add-topic-6.png
rename to docs/en-us/modules/tubemq/img/tubemq-add-topic-6.png
diff --git a/docs/zh-cn/img/tubemq-console-gui.png b/docs/en-us/modules/tubemq/img/tubemq-console-gui.png
similarity index 100%
rename from docs/zh-cn/img/tubemq-console-gui.png
rename to docs/en-us/modules/tubemq/img/tubemq-console-gui.png
diff --git a/docs/en-us/modules/tubemq/img/tubemq-consume-message.png b/docs/en-us/modules/tubemq/img/tubemq-consume-message.png
new file mode 100644
index 0000000..1bb14a7
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/tubemq-consume-message.png differ
diff --git a/docs/en-us/modules/tubemq/img/tubemq-send-message.png b/docs/en-us/modules/tubemq/img/tubemq-send-message.png
new file mode 100644
index 0000000..c0ab65d
Binary files /dev/null and b/docs/en-us/modules/tubemq/img/tubemq-send-message.png differ
diff --git a/docs/en-us/producer_example.md b/docs/en-us/modules/tubemq/producer_example.md
similarity index 99%
rename from docs/en-us/producer_example.md
rename to docs/en-us/modules/tubemq/producer_example.md
index d7c25da..34d551c 100644
--- a/docs/en-us/producer_example.md
+++ b/docs/en-us/modules/tubemq/producer_example.md
@@ -1,5 +1,5 @@
---
-title: Producer Example - Apache TubeMQ
+title: Producer Example - Apache InLong's TubeMQ module
---
## Producer Example
diff --git a/docs/en-us/quick_start.md b/docs/en-us/modules/tubemq/quick_start.md
similarity index 75%
rename from docs/en-us/quick_start.md
rename to docs/en-us/modules/tubemq/quick_start.md
index ad84f77..6f3a1fc 100644
--- a/docs/en-us/quick_start.md
+++ b/docs/en-us/modules/tubemq/quick_start.md
@@ -1,5 +1,5 @@
---
-title: Quick Start - Apache TubeMQ
+title: Quick Start - Apache InLong's TubeMQ module
---
## Build TubeMQ
@@ -27,7 +27,7 @@ cd module-name (e.g. tubemq-client)
mvn test
```
After the build, please go to `tubemq-server/target`. You can find the
-**tubemq-server-[TUBEMQ-VERSION]-bin.tar.gz** file. It is the TubeMQ deployment package, which includes
+**apache-inlong-tubemq-server-[TUBEMQ-VERSION]-bin.tar.gz** file. It is the TubeMQ deployment package, which includes
scripts, configuration files, dependency jars and web GUI code.
### Setting Up Your IDE
@@ -61,11 +61,11 @@ Afater container is running, you can access ` http://127.0.0.1:8080`, and refere
### Deploy TubeMQ Cluster
#### Prerequisites
- ZooKeeper Cluster
-- [tubemq-server-[TUBEMQ-VERSION]-bin.tar.gz](download/download.md) package file
+- [apache-inlong-tubemq-server-[TUBEMQ-VERSION]-bin.tar.gz](download/download.md) package file
After you extract the package file, here's the folder structure.
```
-/INSTALL_PATH/tubemq-server-[TUBEMQ-VERSION]-bin/
+/INSTALL_PATH/apache-inlong-tubemq-server-[TUBEMQ-VERSION]-bin/
├── bin
├── conf
├── lib
@@ -79,8 +79,8 @@ like this, and all services run on the same node. Zookeeper should be setup in y
| Role | TCP Port | TLS Port | Web Port | Comment |
| ---- | -------- | -------- | -------- | ------- |
-| Master | 8099 | 8199 | 8080 | Meta data is stored at /stage/metadata |
-| Broker | 8123 | 8124 | 8081 | Message is stored at /stage/msgdata |
+| Master | 8099 | 8199 | 8080 | Meta data is stored at /stage/meta_data |
+| Broker | 8123 | 8124 | 8081 | Message is stored at /stage/msg_data |
| Zookeeper | 2181 | | | Offset is stored at /tubemq |
#### Configure Master
@@ -89,7 +89,7 @@ You can change configurations in `conf/master.ini` according to cluster informat
```ini
[master]
hostName=YOUR_SERVER_IP // replaced with your server IP
-port=8000
+port=8099
webPort=8080
```
- Access Authorization Token
@@ -112,7 +112,7 @@ repHelperHost=FIRST_MASTER_NODE_IP:9001 // helperHost is used for building HA m
You can change configurations in `resources/velocity.properties`
```properties
-file.resource.loader.path=/INSTALL_PATH/tubemq-server-[TUBEMQ-VERSION]-bin/resources/templates
+file.resource.loader.path=/INSTALL_PATH/apache-inlong-tubemq-server-[TUBEMQ-VERSION]-bin/resources/templates
```
- (Optional) Master High Availability
@@ -141,11 +141,11 @@ webPort=8081
```
- Master Address
```ini
-masterAddressList=MASTER_NODE_IP:8000 // multi addresses can separate with ","
+masterAddressList=MASTER_NODE_IP1:8099,MASTER_NODE_IP2:8099 // multi addresses can separate with ","
```
- Metadata Path
```ini
-primaryPath=/stage/msgdata
+primaryPath=/stage/msg_data
```
- ZooKeeper Cluster
```ini
@@ -226,39 +226,26 @@ Now we can use `demo` topic which created before to test our cluster.
- Produce Messages
-Please don't forget replace `YOUR_MASTER_IP` with your server ip, and start producer.
+Please don't forget replace `YOUR_MASTER_IP:port` with your server ip and port, and start producer.
+
```bash
-install_path=/INSTALL_PATH/tubemq-server-[TUBEMQ-VERSION]-bin
-java -Dlog4j.configuration=file:${install_path}/conf/tools.log4j.properties \
--Djava.net.preferIPv4Stack=true -cp ${install_path}/lib/*:${install_path}/conf/* \
-org.apache.tubemq.example.MessageProducerExample \
-YOUR_MASTER_IP:8000 demo 100000
+cd /INSTALL_PATH/apache-inlong-tubemq-server-[TUBEMQ-VERSION]-bin
+./bin/tubemq-producer-test.sh --master-servers YOUR_MASTER_IP1:port,YOUR_MASTER_IP2:port --topicName demo
```
+
From the log, we can see the message is sent out.
-```bash
-[2020-06-04 11:19:04,405] INFO Send demo 1000 message, keyCount is 252 (org.apache.tubemq.example.MessageProducerExample)
-[2020-06-04 11:19:04,652] INFO Send demo 2000 message, keyCount is 502 (org.apache.tubemq.example.MessageProducerExample)
-[2020-06-04 11:19:05,096] INFO Send demo 3000 message, keyCount is 752 (org.apache.tubemq.example.MessageProducerExample)
-[2020-06-04 11:19:05,181] INFO Send demo 4000 message, keyCount is 1002 (org.apache.tubemq.example.MessageProducerExample)
-```
+
- Consume Messages
-Please don't forget replace YOUR_MASTER_IP with your server ip, and start consumer.
+Please don't forget replace YOUR_MASTER_IP:port with your server ip and port, and start consumer.
```bash
-java -Xmx512m -Dlog4j.configuration=file:/opt/tubemq-server/conf/tools.log4j.properties \
--Djava.net.preferIPv4Stack=true -cp /opt/tubemq-server/lib/*:/opt/tubemq-server/conf/* \
-org.apache.tubemq.example.MessageConsumerExample \
-YOUR_SERVER_IP:8000 demo demoGroup 3 1 1
+cd /INSTALL_PATH/apache-inlong-tubemq-server-[TUBEMQ-VERSION]-bin
+./bin/tubemq-consumer-test.sh --master-servers YOUR_MASTER_IP1:port,YOUR_MASTER_IP2:port --topicName demo --groupName test_consume
```
-From the log, we can see the message received by the consumer.
-```bash
-[2020-06-04 11:20:29,107] INFO Receive messages:270000 (org.apache.tubemq.example.MsgRecvStats)
-[2020-06-04 11:20:31,206] INFO Receive messages:272500 (org.apache.tubemq.example.MsgRecvStats)
-[2020-06-04 11:20:31,590] INFO Receive messages:275000 (org.apache.tubemq.example.MsgRecvStats)
-[2020-06-04 11:20:31,910] INFO Receive messages:277500 (org.apache.tubemq.example.MsgRecvStats)
-```
+From the log, we can see the message received by the consumer.
+
---
diff --git a/docs/en-us/modules/tubemq/tubemq-manager/quick_start.md b/docs/en-us/modules/tubemq/tubemq-manager/quick_start.md
new file mode 100644
index 0000000..e893718
--- /dev/null
+++ b/docs/en-us/modules/tubemq/tubemq-manager/quick_start.md
@@ -0,0 +1,131 @@
+## compile
+
+ mvn clean package
+
+## deploy
+
+environment requirements：
+
+mysql
+java(1.8+)
+In the dist directory, you can find the file tubemq-manager-bin.zip
+
+ unzip tubemq-manager-bin.zip
+
+Add mysql information in conf/application.properties:
+
+ spring.jpa.hibernate.ddl-auto=update
+ # configuration for manager
+ spring.datasource.url=jdbc:mysql://x.x.x.x:3306/tubemanager
+ spring.datasource.username=xx
+ spring.datasource.password=xxx
+
+Add the database tubemanager and start:
+
+ bin/start-manager.sh
+
+## use
+
+### create cluster
+
+Before using tubeAdmin to operate the cluster, you first need to register the cluster information, and use the following interface to add a cluster:
+ /v1/cluster?method=add
+
+ POST
+
+parameter:
+
+ {
+ "masterIp": "9.23.28.86", (tube master ip)
+ "clusterName": "test",
+ "masterPort": "8000", (tube master port)
+ "masterWebPort": "8080", (tube master web port)
+ "createUser": "test",
+ "token": "abc" (tube token)
+ }
+
+### Operation interface
+
+#### cluster
+Query full data of clusterId and clusterName (get)
+
+Example
+GET
+/v1/cluster
+
+return value
+
+ {
+ "errMsg": "",
+ "errCode": 0,
+ "result": true,
+ "data": "[{\"clusterId\":1,\"clusterName\":\"1124\", \"masterIp\":\"127.0.0.1\"}]"
+ }
+
+#### topic
+
+##### add topicTask
+
+parameter:
+
+ type (required) request type, fill in the field: op_query
+ clusterId (required) Request cluster id
+ addTopicTasks (required) topicTasks, create task task json
+ user (required) After the access authorization verification needs to verify the user, it is reserved here
+
+addTopicTasks currently only includes one field as topicName
+After accessing the region design, a new region field will be added to represent brokers in different regions
+Currently an addTopicTask will create topics in all brokers in the cluster
+
+
+AddTopicTasks is a list of the following objects, which can carry multiple create topic requests
+
+ topicName (required) topic name
+
+Example
+
+POST
+ /v1/task?method=addTopicTask
+
+ {
+ "clusterId": "1",
+ "addTopicTasks": [{"topicName": "1"}],
+ "user": "test"
+ }
+
+return json
+
+ {
+ "errMsg": "There are topic tasks [a12322] already in adding status",
+ "errCode": 200,
+ "result": false,
+ "data": ""
+ }
+
+If result is false, the writing task failed
+
+
+##### Query whether a topic is successfully created (business can be written)
+
+ clusterId (Required) Request cluster id
+ topicName (Required) Query topic name
+ user (Required) After the access authorization verification needs to verify the user, it is reserved here
+
+example
+
+POST
+
+ /v1/topic?method=queryCanWrite
+ {
+ "clusterId": "2",
+ "topicName": "pzrTestss1123123",
+ "user": "test"
+ }
+
+return json
+
+ { "result":true, "errCode":0, "errMsg":"OK", }
+ { "result":false, "errCode": 100, "errMsg":"topic thirty5is not writable"}
+ { "result":false, "errCode": 101, "errMsg":"no such topic in master"}
+
+result is false as not writable
diff --git a/docs/zh-cn/tubemq_perf_test_vs_Kafka_cn.md b/docs/en-us/modules/tubemq/tubemq_perf_test_vs_Kafka_cn.md
similarity index 100%
rename from docs/zh-cn/tubemq_perf_test_vs_Kafka_cn.md
rename to docs/en-us/modules/tubemq/tubemq_perf_test_vs_Kafka_cn.md
diff --git a/docs/zh-cn/contact.md b/docs/zh-cn/contact.md
index 16229a9..5c32170 100644
--- a/docs/zh-cn/contact.md
+++ b/docs/zh-cn/contact.md
@@ -1,18 +1,19 @@
---
-title: 联系我们 - Apache TubeMQ
+title: 联系我们 - Apache InLong
---
联系我们
-------
+- Slack在线交流: [Apache InLong Slack](https://the-asf.slack.com/archives/C01QAG6U00L)
-- 邮件列表
+- 邮件列表:
| Name | Scope | | | |
|:------------------------------------------------------------------------------|:--------------------------------|:----------------------------------------------------------------|:--------------------------------------------------------------------|:-----------------------------------------------------------------------------|
- | [dev@inlong.apache.org](mailto:dev@inlong.apache.org) | Development-related discussions | [Subscribe](mailto:dev-subscribe@inlong.apache.org) | [Unsubscribe](mailto:dev-unsubscribe@inlong.apache.org) | [Archives](http://mail-archives.apache.org/mod_mbox/tubemq-dev/) |
+ | [dev@inlong.apache.org](mailto:dev@inlong.apache.org) | Development-related discussions | [Subscribe](mailto:dev-subscribe@inlong.apache.org) | [Unsubscribe](mailto:dev-unsubscribe@inlong.apache.org) | [Archives](http://mail-archives.apache.org/mod_mbox/inlong-dev/) |
- 项目主页: https://inlong.apache.org
-- 需求与问题: https://issues.apache.org/jira/browse/INLONG
+- 需求与问题: https://issues.apache.org/jira/browse/InLong
diff --git a/docs/zh-cn/development/how-to-become-a-committer.md b/docs/zh-cn/development/how-to-become-a-committer.md
index 704b031..ba7b9e9 100644
--- a/docs/zh-cn/development/how-to-become-a-committer.md
+++ b/docs/zh-cn/development/how-to-become-a-committer.md
@@ -1,35 +1,35 @@
---
-title: 如何成为Committer - Apache TubeMQ
+title: 如何成为Committer - Apache InLong
---
-# 如何成为TubeMQ Committer 和 PPMC
+# 如何成为InLong Committer 和 PPMC
-> Apache TubeMQ是完全按照Apache的规则来构建社区的，Apache Committer是ASF（Apache软件基金会）中用来表示提交特定项目的人的术语，
-Apache TubeMQ Committer拥有TubeMQ代码库的写权限，可以合并PR，任何人只要为社区做出了足够的贡献并获取到足够的信任就可以成为Apache TubeMQ Committer。
+> Apache InLong是完全按照Apache的规则来构建社区的，Apache Committer是ASF（Apache软件基金会）中用来表示提交特定项目的人的术语，
+Apache InLong Committer拥有InLong代码库的写权限，可以合并PR，任何人只要为社区做出了足够的贡献并获取到足够的信任就可以成为Apache InLong Committer。
-任何人只要对TubeMQ项目做了贡献，那你就是官方承认的TubeMQ项目的Contributor了，从Contributor成长为Committer并没有一个确切的标准，
+任何人只要对InLong项目做了贡献，那你就是官方承认的InLong项目的Contributor了，从Contributor成长为Committer并没有一个确切的标准，
也没有任何预期的时间表，但是Committer的候选人一般都是长期活跃的贡献者，成为Committer并没有要求必须有巨大的架构改进贡献，
或者多少行的代码贡献，贡献代码、贡献文档、参与邮件列表的讨论、帮助回答问题等等都提升自己影响力的方式。
潜在贡献清单（无特定顺序）：
- 提交自己发现的Bug、特性、改进到issue
-- 更新官方文档使项目的文档是最近的、撰写TubeMQ的最佳实践、特性剖析的各种对用户有用的文档
-- 执行测试并报告测试结果，性能测试与其他MQ的性能对比测试等
+- 更新官方文档使项目的文档是最近的、撰写InLong的最佳实践、特性剖析的各种对用户有用的文档
+- 执行测试并报告测试结果，性能测试与其他Agent、MQ等模块的性能对比测试等
- 发布版本时，积极参与投票
- 参与邮件列表中的讨论，一般会有以[DISCUSS]开头的邮件
- 回答用户或开发人员在邮件列表中的提问
- 审查(Review)其他人的工作（包括代码和非代码）并发表你自己的建议
- 对JIRA上的issue进行审查，维护issue为最新状态，比如：关闭过时的issue、更改issue的错误信息等
- 指导新加入的贡献者，熟悉社区流程
-- 发表关于TubeMQ的演讲和博客，并将这些添加到TubeMQ的官方网站
-- 有利于TubeMQ社区发展的任何贡献
+- 发表关于InLong的演讲和博客，并将这些添加到InLong的官方网站
+- 有利于InLong社区发展的任何贡献
- ......
更多可以参考：[ASF官方文档](https://community.apache.org/contributors/)
并不是每个人都能完成这个清单上的所有（甚至任何）项目。如果你想用其他方式来做贡献，那就去做吧（并把它们添加到列表中）。
-愉快的举止和乐于奉献的精神是您对TubeMQ项目产生积极影响所需要的全部。
-邀请您成为Committer是您与社区长期稳定互动的结果，是TubeMQ社区对您的信任和认可。
+愉快的举止和乐于奉献的精神是您对InLong项目产生积极影响所需要的全部。
+邀请您成为Committer是您与社区长期稳定互动的结果，是InLong社区对您的信任和认可。
Committer有义务审查(Review)和合并(merge)其他人提交的PR，版本发布时测试和投票候选版本，参与特性设计方案的讨论以及其他类型的项目贡献。
-当你足够活跃且对社区的贡献比较大后，就可以晋升为TubeMQ项目的PPMC成员。
+当你足够活跃且对社区的贡献比较大后，就可以晋升为InLong项目的PPMC成员。
diff --git a/docs/zh-cn/development/how-to-commit.md b/docs/zh-cn/development/how-to-commit.md
index 25368cc..2044704 100644
--- a/docs/zh-cn/development/how-to-commit.md
+++ b/docs/zh-cn/development/how-to-commit.md
@@ -1,17 +1,17 @@
---
-title: 如何提交代码 - Apache TubeMQ
+title: 如何提交代码 - Apache InLong
---
# 如何提交代码
-Apache TubeMQ使用Github的Pull Request (PR)来接收贡献的代码，本文将详细介绍提交代码的详细流程。
+Apache InLong使用Github的Pull Request (PR)来接收贡献的代码，本文将详细介绍提交代码的详细流程。
-- TubeMQ代码库：https://github.com/apache/incubator-tubemq
+- InLong代码库：https://github.com/apache/incubator-inlong
-- TubeMQ官网库：https://github.com/apache/incubator-tubemq-website
+- InLong官网库：https://github.com/apache/incubator-inlong-website
## 1. Fork仓库
-进入 [apache/incubator-tubemq](https://github.com/apache/incubator-tubemq) 的Github页面 ，点击右上角按钮 `Fork` 进行 Fork。如下图所示：
+进入 [apache/incubator-inlong](https://github.com/apache/incubator-inlong) 的Github页面 ，点击右上角按钮 `Fork` 进行 Fork。如下图所示：
@@ -19,22 +19,22 @@ Apache TubeMQ使用Github的Pull Request (PR)来接收贡献的代码，本文
### 2.1 将代码克隆到本地
```shell
-git clone https://github.com/<your_github_name>/incubator-tubemq.git
+git clone https://github.com/<your_github_name>/incubator-inlong.git
```
clone完成后，origin会默认指向github上的远程fork地址。
-### 2.2 将 apache/incubator-tubemq 添加为本地仓库的远程分支upstream
+### 2.2 将 apache/incubator-inlong 添加为本地仓库的远程分支upstream
```shell
-cd incubator-tubemq
-git remote add upstream https://github.com/apache/incubator-tubemq.git
+cd incubator-inlong
+git remote add upstream https://github.com/apache/incubator-inlong.git
```
### 2.3 检查远程仓库设置
```shell
git remote -v
-origin https://github.com/<your_github_name>/incubator-tubemq.git (fetch)
-origin https://github.com/<your_github_name>/incubator-tubemq.git(push)
-upstream https://github.com/apache/incubator-tubemq.git (fetch)
-upstream https://github.com/apache/incubator-tubemq.git (push)
+origin https://github.com/<your_github_name>/incubator-inlong.git (fetch)
+origin https://github.com/<your_github_name>/incubator-inlong.git(push)
+upstream https://github.com/apache/incubator-inlong.git (fetch)
+upstream https://github.com/apache/incubator-inlong.git (push)
```
此时会有两个仓库：origin(自己的仓库)和upstream（官方的仓库）
@@ -44,25 +44,25 @@ git fetch upstream
git pull upstream master
```
### 2.5 新建分支
-> 一般以issue id作为分支名，如：TUBEMQ-123
+> 一般以issue id作为分支名，如：INLONG-123
```shell
-git checkout -b TUBEMQ-123
+git checkout -b INLONG-123
```
-**确保分支`TUBEMQ-123`是基于官方master分支的最新代码**
+**确保分支`INLONG-123`是基于官方master分支的最新代码**
分支创建完成后即可进行代码更改。
### 2.6 提交代码到远程分支
-> commit 信息的格式必须与Issue标题保持一致且以`[issue id]`开头，即：`[TUBEMQ-123] xxx`
+> commit 信息的格式必须与Issue标题保持一致且以`[issue id]`开头，即：`[INLONG-123] xxx`
```shell
-git commit -a -m "[TUBEMQ-123] xxx"
-git push origin TUBEMQ-123
+git commit -a -m "[INLONG-123] xxx"
+git push origin INLONG-123
```
## 3. 创建PR
### 3.1 打开自己的github仓库页面
- `https://github.com/<your_github_name>/incubator-tubemq`
+ `https://github.com/<your_github_name>/incubator-inlong`
### 3.2. 切换分支
- 切换到提交的分支 `TUBEMQ-123`
+ 切换到提交的分支 `INLONG-123`
### 3.3. 创建新PR
点击 `New pull request`或者`Compare & pull request`
@@ -70,7 +70,7 @@ git push origin TUBEMQ-123
需要注意以下几点：
1. PR的标题必须以issue id开头，最好与commit信息保持一致
2. 可以填写部分描述信息也可以不填
- 3. 如果点击`Create pull request`后提示代码冲突，则请将`TUBEMQ-123`分支的代码
+ 3. 如果点击`Create pull request`后提示代码冲突，则请将`INLONG-123`分支的代码
与master分支同步一致后在进行提交
@@ -79,4 +79,4 @@ git push origin TUBEMQ-123
创建完PR后，所有的人都可以Review代码，可能会与您讨论一些实现的细节，可能还需要你进一步修改。
**一般该PR必须有2位以上的社区PPMC/Committer +1后，才可能正式合入官方代码库。**
-最后，恭喜您已经成为了TubeMQ的官方贡献者了！
+最后，恭喜您已经成为了InLong的官方贡献者了！
diff --git a/docs/zh-cn/development/how-to-contribute.md b/docs/zh-cn/development/how-to-contribute.md
index 3f07868..819f55a 100644
--- a/docs/zh-cn/development/how-to-contribute.md
+++ b/docs/zh-cn/development/how-to-contribute.md
@@ -1,34 +1,34 @@
---
-title: 如何参与贡献 - Apache TubeMQ
+title: 如何参与贡献 - Apache InLong
---
# 如何参与贡献
-Apache TubeMQ社区欢迎大家为Apache TubeMQ做贡献，您可以通过很多方式为TubeMQ项目成长贡献一份力量：
- - 贡献文档：浏览文档可以加深您对TubeMQ的了解，一旦发现文档写得不清晰或逻辑混乱的地方，可以订正、修改、补充或[联系我们](mailto:dev@tubemq.apache.org)
- - 贡献代码：欢迎大家为TubeMQ社区贡献代码
- - 欢迎您认领Open状态的[Issues](https://issues.apache.org/jira/projects/TUBEMQ/issues)和未完成的特性，提交PR，成为贡献者之一
+Apache InLong社区欢迎大家为Apache InLong做贡献，您可以通过很多方式为InLong项目成长贡献一份力量：
+ - 贡献文档：浏览文档可以加深您对InLong的了解，一旦发现文档写得不清晰或逻辑混乱的地方，可以订正、修改、补充或[联系我们](mailto:dev@inlong.apache.org)
+ - 贡献代码：欢迎大家为InLong社区贡献代码
+ - 欢迎您认领Open状态的[Issues](https://issues.apache.org/jira/projects/INLONG/issues)和未完成的特性，提交PR，成为贡献者之一
- 如果您在使用过程中发现有些功能无法满足您的需求或出现问题，请在Issues中记录
- 参与邮件讨论：您可以参与dev邮件列表的任何讨论，或者发送任何疑问到dev邮件列表
- - 参与Issue讨论：您可以在任一[Issues](https://issues.apache.org/jira/projects/TUBEMQ/issues)下发表您的建议
- - Review代码：您可以在[GitHub](https://github.com/apache/incubator-tubemq/pulls)上看到所有贡献者提交的PR，您可以Review他们的代码并发表您的建议
+ - 参与Issue讨论：您可以在任一[Issues](https://issues.apache.org/jira/projects/INLONG/issues)下发表您的建议
+ - Review代码：您可以在[GitHub](https://github.com/apache/incubator-inlong/pulls)上看到所有贡献者提交的PR，您可以Review他们的代码并发表您的建议
> 欢迎大家提交Bug反馈、改进、新功能及PR，具体参与贡献流程可参考该指引。
## 1. 主要链接
-- 官网：https://tubemq.apache.org/
-- 代码库：https://github.com/apache/incubator-tubemq
-- 官网代码库：https://github.com/apache/incubator-tubemq-website
-- JIRA任务管理：https://issues.apache.org/jira/projects/TUBEMQ/issues
+- 官网：https://inlong.apache.org/
+- 代码库：https://github.com/apache/incubator-inlong
+- 官网代码库：https://github.com/apache/incubator-inlong-website
+- JRIA任务管理：https://issues.apache.org/jira/projects/INLONG/issues
-## 2. 订阅TubeMQ邮件列表
+## 2. 订阅InLong邮件列表
详见[如何订阅邮件列表](how-to-subscribe.md)
## 3. 注册Jira账号
-Apache TUBEMQ使用Apache官方提供的任务管理平台对TubeMQ相关的任务进行管理，JIRA的使用详见[JIRA使用指南](how-to-use-jira.md)
+Apache InLong使用Apache官方提供的任务管理平台对InLong相关的任务进行管理，JIRA的使用详见[JIRA使用指南](how-to-use-jira.md)
## 4. 提交Bug反馈/特性/改进/文档
-> Apache TUBEMQ使用Apache官方提供的任务管理平台对TubeMQ相关的任务进行管理，详见：https://issues.apache.org/jira/projects/TUBEMQ/issues
+> Apache InLong使用Apache官方提供的任务管理平台对InLong相关的任务进行管理，详见：https://issues.apache.org/jira/projects/INLONG/issues
### 4.1 创建issue
详见[JIRA使用指南](how-to-use-jira.md)
@@ -47,9 +47,9 @@ Apache TUBEMQ使用Apache官方提供的任务管理平台对TubeMQ相关的任
- 编码，编码完成后，提交代码，参考：[代码提交指南](how-to-commit.md)
### 4.3 如何贡献文档
-TubeMQ项目的所有文档将在[官网](https://tubemq.apache.org/)展示，所有的文档都保存在官网代码库的[docs](https://github.com/apache/incubator-tubemq-website/tree/master/docs)文件夹下。
+InLong项目的所有文档将在[官网](https://inlong.apache.org/)展示，所有的文档都保存在官网代码库的[docs](https://github.com/apache/incubator-inlong-website/tree/master/docs)文件夹下。
贡献的文档包括：
-- 编写与TubeMQ相关的文档
+- 编写与InLong相关的文档
- 将中文文档翻译成英文文档
- 将英文文档翻译成中文文档
@@ -60,12 +60,12 @@ TubeMQ项目的所有文档将在[官网](https://tubemq.apache.org/)展示，
### 5. 如何认领Bug/特性/改进/文档
-在TubeMQ的issue列表中，有很多由其他人创建的issue并未被修复，如果你感兴趣的话，可以认领这些issue。认领步骤如下：
+在InLong的issue列表中，有很多由其他人创建的issue并未被修复，如果你感兴趣的话，可以认领这些issue。认领步骤如下：
- 在该issue下留言，表达想认领该任务的想法
- 如果提交者没有意见，则将该issue assign到自己名下并及时更新进度
- 如果是比较大的特性，尽量先输出设计文档，供其他人review
- 开发代码并提交代码至github，提交代码流程参考：[代码提交指南](how-to-commit.md)
-**如果你是第一次参与TubeMQ项目，可能该issue无法Assign给自己，此时你可以发邮件至：dev@tubemq.apache.org或联系TubeMQ的PPMC申请加入TubeMQ的contributor列表，加入后即可Assign其他issue给自己**
+**如果你是第一次参与InLong项目，可能该issue无法Assign给自己，此时你可以发邮件至：dev@inlong.apache.org或联系InLong的PPMC申请加入InLong的contributor列表，加入后即可Assign其他issue给自己**
-您的任何贡献都可以帮助Apache TubeMQ项目成长，如果您刚接触TubeMQ，您可以先从简单的任务入手，循序渐进，甚至可以逐渐成长为Apache TubeMQ的Committer；
\ No newline at end of file
+您的任何贡献都可以帮助Apache InLong项目成长，如果您刚接触InLong，您可以先从简单的任务入手，循序渐进，甚至可以逐渐成长为Apache InLong的Committer；
\ No newline at end of file
diff --git a/docs/zh-cn/development/how-to-release.md b/docs/zh-cn/development/how-to-release.md
index d9cd57e..11219f9 100644
--- a/docs/zh-cn/development/how-to-release.md
+++ b/docs/zh-cn/development/how-to-release.md
@@ -1,5 +1,5 @@
---
-title: 如何发布版本- Apache TubeMQ
+title: 如何发布版本- Apache InLong
---
# 如何发布版本
@@ -7,7 +7,7 @@ title: 如何发布版本- Apache TubeMQ
> 本文主要介绍了Release Manager如何按照Apache的流程发布版本，
Source Release是Apache关注的重点，也是发布的必须内容；
-Binary Release是可选项，TubeMQ可以选择是否发布二进制包到Apache仓库或者发布到Maven中央仓库。
+Binary Release是可选项，InLong可以选择是否发布二进制包到Apache仓库或者发布到Maven中央仓库。
请参考以下链接，找到更多关于ASF的发布指南:
@@ -122,29 +122,29 @@ http://keys.gnupg.net
> 这个步骤需要使用SVN
-DEV分支的svn库是 https://dist.apache.org/repos/dist/dev/incubator/tubemq
+DEV分支的svn库是 https://dist.apache.org/repos/dist/dev/incubator/inlong
-Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/tubemq
+Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/inlong
#### 1.5.1 在dev分支中添加公钥到KEYS，用于发布RC版本
```shell
-➜ ~ svn co https://dist.apache.org/repos/dist/dev/incubator/tubemq /tmp/tubemq-dist-dev
+➜ ~ svn co https://dist.apache.org/repos/dist/dev/incubator/inlong /tmp/inlong-dist-dev
# 这个步骤比较慢，会把所有版本都拷贝下来，如果网断了，用svn cleanup删掉锁，重新执行一下，会断点续传
-➜ ~ cd tubemq-dist-dev
-➜ tubemq-dist-dev ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
-➜ tubemq-dist-dev ~ svn add . # 如果之前存在KEYS文件，则不需要
-➜ tubemq-dist-dev ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
+➜ ~ cd inlong-dist-dev
+➜ inlong-dist-dev ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
+➜ inlong-dist-dev ~ svn add . # 如果之前存在KEYS文件，则不需要
+➜ inlong-dist-dev ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
```
#### 1.5.2 在release分支中添加公钥到KEYS，用于发布正式版本
```shell
-➜ ~ svn co https://dist.apache.org/repos/dist/release/incubator/tubemq /tmp/tubemq-dist-release
-➜ ~ cd tubemq-dist-release
-➜ tubemq-dist-release ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
-➜ tubemq-dist-release ~ svn add . # 如果之前存在KEYS文件，则不需要
-➜ tubemq-dist-release ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
+➜ ~ svn co https://dist.apache.org/repos/dist/release/incubator/inlong /tmp/inlong-dist-release
+➜ ~ cd inlong-dist-release
+➜ inlong-dist-release ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
+➜ inlong-dist-release ~ svn add . # 如果之前存在KEYS文件，则不需要
+➜ inlong-dist-release ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
```
### 1.6 上传GPG公钥到Github账户
@@ -220,20 +220,20 @@ $ git config user.signingkey ${KEY_ID}
> tag创建成功后，我需要将tag源码打包成一个tar包
```shell
-mkdir /tmp/apache-tubemq-${release_version}-${rc_version}
-git archive --format=tar.gz --output="/tmp/apache-tubemq-${release_version}-${rc_version}/apache-tubemq-${release_version}-src.tar.gz" --prefix="apache-tubemq-${release_version}/" $git_tag
+mkdir /tmp/apache-inlong-${release_version}-${rc_version}
+git archive --format=tar.gz --output="/tmp/apache-inlong-${release_version}-${rc_version}/apache-inlong-${release_version}-src.tar.gz" --prefix="apache-inlong-${release_version}/" $git_tag
```
### 3.4 打包二进制包
> 编译上一步打包的源码
```shell
-cd /tmp/apache-tubemq-${release_version}-${rc_version} # 进入源码包目录
-tar xzvf apache-tubemq-${release_version}-src.tar.gz #解压源码包
-cd apache-tubemq-${release_version} # 进入源码目录
+cd /tmp/apache-inlong-${release_version}-${rc_version} # 进入源码包目录
+tar xzvf apache-inlong-${release_version}-src.tar.gz #解压源码包
+cd apache-inlong-${release_version} # 进入源码目录
mvn compile clean install package -DskipTests # 编译
-cp ./tubemq-client/target/apache-tubemq-client-${release_version}-bin.tar.gz /tmp/apache-tubemq-${release_version}-${rc_version}/ # 拷贝client包到源码包目录下，方面下一步对包进行签名
-cp ./tubemq-server/target/apache-tubemq-server-${release_version}-bin.tar.gz /tmp/apache-tubemq-${release_version}-${rc_version}/ # 拷贝server包到源码包目录下，方面下一步对包进行签名
+cp ./inlong-client/target/apache-inlong-client-${release_version}-bin.tar.gz /tmp/apache-inlong-${release_version}-${rc_version}/ # 拷贝client包到源码包目录下，方面下一步对包进行签名
+cp ./inlong-server/target/apache-inlong-server-${release_version}-bin.tar.gz /tmp/apache-inlong-${release_version}-${rc_version}/ # 拷贝server包到源码包目录下，方面下一步对包进行签名
```
### 3.5 对源码包/二进制包进行签名/sha512
@@ -251,9 +251,9 @@ for i in *.tar.gz; do echo $i; gpg --verify $i.asc $i ; done
## 4. 准备Apache发布
### 4.1 发布jar包到Apache Nexus仓库
```shell
-cd /tmp/apache-tubemq-${release_version}-${rc_version} # 进入源码包目录
-tar xzvf apache-tubemq-${release_version}-src.tar.gz #解压源码包
-cd apache-tubemq-${release_version}
+cd /tmp/apache-inlong-${release_version}-${rc_version} # 进入源码包目录
+tar xzvf apache-inlong-${release_version}-src.tar.gz #解压源码包
+cd apache-inlong-${release_version}
mvn -DskipTests deploy -Papache-release -Dmaven.javadoc.skip=true # 开始上传
```
@@ -264,20 +264,20 @@ git push origin ${release_version}-${rc_version}
```
### 4.3 上传编译好的文件到dist
-> 这个步骤需要使用SVN, DEV分支的svn库是 https://dist.apache.org/repos/dist/dev/incubator/tubemq
+> 这个步骤需要使用SVN, DEV分支的svn库是 https://dist.apache.org/repos/dist/dev/incubator/inlong
-### 4.3.1 将TubeMQ checkout到本地目录
+### 4.3.1 将InLong checkout到本地目录
```shell
# 这个步骤可能会比较慢，会把所有版本都考下来，如果网断了，用svn cleanup删掉锁，重新执行一下，会断点续传
-svn co https://dist.apache.org/repos/dist/dev/incubator/tubemq /tmp/tubemq-dist-dev
+svn co https://dist.apache.org/repos/dist/dev/incubator/inlong /tmp/inlong-dist-dev
```
### 4.3.2 添加public key到KEYS文件并提交到SVN仓库
```shell
-cd /tmp/tubemq-dist-dev
+cd /tmp/inlong-dist-dev
mkdir ${release_version}-${rc_version} #创建版本目录
# 将源码包和签名包拷贝到此处
-cp /tmp/apache-tubemq-${release_version}-${rc_version}/*tar.gz* ${release_version}-${rc_version}/
+cp /tmp/apache-inlong-${release_version}-${rc_version}/*tar.gz* ${release_version}-${rc_version}/
svn status # 检查svn状态
svn add ${release_version}-${rc_version} # 添加到svn版本
svn status # 检查svn状态
@@ -287,62 +287,62 @@ svn commit -m 'prepare for ${release_version} ${rc_version}'# 提交至svn远程
> 请确保所有的artifact都是ok的
1. **先登录**http://repository.apache.org , 使用Apache账号登录
2. 点击左侧的Staging repositories，
-3. 搜索TubeMQ关键字，选择你最近上传的仓库
+3. 搜索InLong关键字，选择你最近上传的仓库
4. 点击上方的Close按钮，这个过程会进行一系列检查
5. 检查通过以后, 在下方的Summary标签页上出现一个连接，请保存好这个链接，需要放在接下来的投票邮件当中。
-链接应该是类似这样的: `https://repository.apache.org/content/repositories/orgapachetubemq-xxxx`
+链接应该是类似这样的: `https://repository.apache.org/content/repositories/orgapacheinlong-xxxx`
WARN: 请注意点击Close可能会出现失败，请检查失败原因并处理
## 5. 进入投票
-> TubeMQ仍旧在孵化中，需要进行两次投票，
-- TubeMQ社区投票，发邮件至：`dev@tubemq.apache.org`
+> InLong仍旧在孵化中，需要进行两次投票，
+- InLong社区投票，发邮件至：`dev@inlong.apache.org`
- incubator社区投票，发邮件至：`general@incubator.apache.org`
-TubeMQ毕业之后，只需要在TubeMQ社区投票
+InLong毕业之后，只需要在InLong社区投票
-### 5.1 TubeMQ社区投票
+### 5.1 InLong社区投票
#### 5.1.1 投票模板
```html
-标题：[VOTE] Release Apache TubeMQ ${release_version} ${rc_version}
+标题：[VOTE] Release Apache InLong ${release_version} ${rc_version}
内容：
-Hello Apache TubeMQ PPMC and Community,
+Hello Apache InLong PPMC and Community,
- This is a call for vote to release Apache TubeMQ version ${release_version}-${rc_version}.
+ This is a call for vote to release Apache InLong version ${release_version}-${rc_version}.
The tag to be voted on is ${release_version}-${rc_version}:
- https://github.com/apache/incubator-tubemq/tree/${release_version}-${rc_version}
+ https://github.com/apache/incubator-inlong/tree/${release_version}-${rc_version}
The release tarball, signature, and checksums can be found at:
- https://dist.apache.org/repos/dist/dev/incubator/tubemq/${release_version}-${rc_version}/
+ https://dist.apache.org/repos/dist/dev/incubator/inlong/${release_version}-${rc_version}/
Maven artifacts are available in a staging repository at:
- https://repository.apache.org/content/repositories/orgapachetubemq-{staging-id}
+ https://repository.apache.org/content/repositories/orgapacheinlong-{staging-id}
Artifacts were signed with the {YOUR_PUB_KEY} key which can be found in:
- https://dist.apache.org/repos/dist/dev/incubator/tubemq/KEYS
+ https://dist.apache.org/repos/dist/dev/incubator/inlong/KEYS
${release_version} includes ~ ${issue_count} bug and improvement fixes done since last versions which can be found at:
- https://github.com/apache/incubator-tubemq/blob/${release_version}-${rc_version}/CHANGES.md
+ https://github.com/apache/incubator-inlong/blob/${release_version}-${rc_version}/CHANGES.md
Please download, verify, and test.
The VOTE will remain open for at least 72 hours.
- [ ] +1 Release this package as Apache TubeMQ ${release_version}
+ [ ] +1 Release this package as Apache InLong ${release_version}
[ ] +0
[ ] -1 Do not release this package because...
- To learn more about apache tubemq, please see
- http://tubemq.apache.org/
+ To learn more about apache inlong, please see
+ http://inlong.apache.org/
Checklist for reference:
@@ -358,16 +358,16 @@ Hello Apache TubeMQ PPMC and Community,
https://cwiki.apache.org/confluence/display/INCUBATOR/Incubator+Release+Checklist
Thanks,
-Your TubeMQ Release Manager
+Your InLong Release Manager
```
#### 5.1.2 宣布投票结果模板
```html
-标题：[RESULT][VOTE] Release Apache TubeMQ ${release_version} ${rc_version}
+标题：[RESULT][VOTE] Release Apache InLong ${release_version} ${rc_version}
内容：
-Hello Apache TubeMQ PPMC and Community,
+Hello Apache InLong PPMC and Community,
The vote closes now as 72hr have passed. The vote PASSES with
xx (+1 non-binding) votes from the PPMC,
@@ -381,7 +381,7 @@ Hello Apache TubeMQ PPMC and Community,
If this vote passes also, the release is accepted and will be published.
Thank you for your support.
-Your TubeMQ Release Manager
+Your InLong Release Manager
```
### 5.2 incubator社区投票
@@ -389,38 +389,38 @@ Your TubeMQ Release Manager
#### 5.2.1 投票模板
```html
-标题：[VOTE] Release Apache TubeMQ (Incubating) ${release_version} ${rc_version}
+标题：[VOTE] Release Apache InLong (Incubating) ${release_version} ${rc_version}
内容：
Hello Incubator Community,
- This is a call for a vote to release Apache TubeMQ (Incubating) version
+ This is a call for a vote to release Apache InLong (Incubating) version
${release_version} ${rc_version}
- The Apache TubeMQ community has voted on and approved a proposal to release
- Apache TubeMQ (Incubating) version ${release_version} ${rc_version}
+ The Apache InLong community has voted on and approved a proposal to release
+ Apache InLong (Incubating) version ${release_version} ${rc_version}
We now kindly request the Incubator PMC members review and vote on this
incubator release.
- TubeMQ community vote thread:
+ InLong community vote thread:
• [投票链接]
Vote result thread:
• [投票结果链接]
The release candidate:
- • https://dist.apache.org/repos/dist/dev/incubator/tubemq/${release_version}-${rc_version}/
+ • https://dist.apache.org/repos/dist/dev/incubator/inlong/${release_version}-${rc_version}/
Git tag for the release:
- • https://github.com/apache/incubator-tubemq/tree/${release_version}-${rc_version}
+ • https://github.com/apache/incubator-inlong/tree/${release_version}-${rc_version}
Release notes:
- • https://github.com/apache/incubator-tubemq/releases/tag/${release_version}-${rc_version}
+ • https://github.com/apache/incubator-inlong/releases/tag/${release_version}-${rc_version}
The artifacts signed with PGP key [填写你个人的KEY], corresponding to [填写你个人的邮箱], that can be found in keys file:
- • https://dist.apache.org/repos/dist/dev/incubator/tubemq/KEYS
+ • https://dist.apache.org/repos/dist/dev/incubator/inlong/KEYS
The vote will be open for at least 72 hours or until necessary number of votes are reached.
@@ -431,18 +431,18 @@ Hello Incubator Community,
[ ] -1 disapprove with the reason
Thanks,
-On behalf of Apache TubeMQ (Incubating) community
+On behalf of Apache InLong (Incubating) community
```
#### 5.2.2 宣布投票结果模板
```html
-标题：[RESULT][VOTE] Release Apache TubeMQ ${release_version} {rc_version}
+标题：[RESULT][VOTE] Release Apache InLong ${release_version} {rc_version}
内容：
Hi all
-Thanks for reviewing and voting for Apache TubeMQ (Incubating) ${release_version} {rc_version}
+Thanks for reviewing and voting for Apache InLong (Incubating) ${release_version} {rc_version}
release, I am happy to announce the release voting has passed with [投票结果数]
binding votes, no +0 or -1 votes. Binding votes are from IPMC
@@ -454,11 +454,11 @@ The voting thread is:
[投票链接]
Many thanks for all our mentors helping us with the release procedure, and
-all IPMC helped us to review and vote for Apache TubeMQ (Incubating) release. I will
+all IPMC helped us to review and vote for Apache InLong (Incubating) release. I will
be working on publishing the artifacts soon.
Thanks
-On behalf of Apache TubeMQ (Incubating) community
+On behalf of Apache InLong (Incubating) community
```
## 6. 正式发布
@@ -466,51 +466,51 @@ On behalf of Apache TubeMQ (Incubating) community
### 6.1 合并release-${release_version}分支的改动到master分支
### 6.2 将源码和二进制包从svn的dev目录移动到release目录
```shell
-svn mv https://dist.apache.org/repos/dist/dev/incubator/tubemq/${release_version}-${rc_version} https://dist.apache.org/repos/dist/release/incubator/tubemq/${release_version} -m "Release ${release_version}"
+svn mv https://dist.apache.org/repos/dist/dev/incubator/inlong/${release_version}-${rc_version} https://dist.apache.org/repos/dist/release/incubator/inlong/${release_version} -m "Release ${release_version}"
```
### 6.3 确认dev和release下的包是否正确
-1. 确认[dev](https://dist.apache.org/repos/dist/dev/incubator/tubemq/)下的`${release_version}-${rc_version}`已被删除
-2. 删除[release](https://dist.apache.org/repos/dist/release/incubator/tubemq/)目录下上一个版本的发布包，这些包会被自动保存在[这里](https://archive.apache.org/dist/incubator/tubemq/)
+1. 确认[dev](https://dist.apache.org/repos/dist/dev/incubator/inlong/)下的`${release_version}-${rc_version}`已被删除
+2. 删除[release](https://dist.apache.org/repos/dist/release/incubator/inlong/)目录下上一个版本的发布包，这些包会被自动保存在[这里](https://archive.apache.org/dist/incubator/inlong/)
```shell
-svn delete https://dist.apache.org/repos/dist/release/incubator/tubemq/${last_release_version} -m "Delete ${last_release_version}"
+svn delete https://dist.apache.org/repos/dist/release/incubator/inlong/${last_release_version} -m "Delete ${last_release_version}"
```
### 6.4 在Apache Staging仓库发布版本
> 请确保所有的artifact都是ok的
1. 登录http://repository.apache.org , 使用Apache账号登录
2. 点击左侧的Staging repositories，
-3. 搜索TubeMQ关键字，选择你最近上传的仓库，投票邮件中指定的仓库
+3. 搜索InLong关键字，选择你最近上传的仓库，投票邮件中指定的仓库
4. 点击上方的`Release`按钮，这个过程会进行一系列检查
**等仓库同步到其他数据源，一般需要24小时**
### 6.5 更新官网链接
-### 6.6. 发邮件到 `dev@tubemq.apache.org` 和 `general@incubator.apache.org`
+### 6.6. 发邮件到 `dev@inlong.apache.org` 和 `general@incubator.apache.org`
**请确保6.4中的仓库已发布成功，一般是在6.4后的24小时后发布邮件**
宣布release邮件模板：
```html
-标题： [ANNOUNCE] Release Apache TubeMQ(incubating) ${release_version}
+标题： [ANNOUNCE] Release Apache InLong(incubating) ${release_version}
内容：
Hi all,
-The Apache TubeMQ(incubating) community is pleased to announce
-that Apache TubeMQ (incubating) ${release_version} has been released!
+The Apache InLong(incubating) community is pleased to announce
+that Apache InLong (incubating) ${release_version} has been released!
-Apache TubeMQ is a trillion-records-scale distributed messaging queue (MQ) system,
+Apache InLong is a trillion-records-scale distributed messaging queue (MQ) system,
focuses on data transmission and storage under massive data.
Download Links: xxx
Release Notes: xxx
-Website: https://tubemq.apache.org/
+Website: https://inlong.apache.org/
-TubeMQ Resources:
-- Issue: https://issues.apache.org/jira/projects/TUBEMQ/issues
-- Mailing list: dev@tubemq.apache.org
+InLong Resources:
+- Issue: https://issues.apache.org/jira/projects/INLONG/issues
+- Mailing list: dev@inlong.apache.org
Thanks
-On behalf of Apache TubeMQ (Incubating) community
+On behalf of Apache InLong (Incubating) community
```
diff --git a/docs/zh-cn/development/how-to-subscribe.md b/docs/zh-cn/development/how-to-subscribe.md
index 04d5302..73afc21 100644
--- a/docs/zh-cn/development/how-to-subscribe.md
+++ b/docs/zh-cn/development/how-to-subscribe.md
@@ -1,30 +1,30 @@
---
-title: 订阅邮件列表 - Apache TubeMQ
+title: 订阅邮件列表 - Apache InLong
---
# 订阅邮件列表
邮件列表是Apache社区用来沟通交流的一种形式，通常来说，Apache社区的许多事情都是由邮件列表来承载，比如：项目的提问与解答、技术讨论、事务决策、版本发布投票等等，
-订阅邮件后，你可以第一时间获取TubeMQ社区的动态，可以与社区保持同步。
+订阅邮件后，你可以第一时间获取InLong社区的动态，可以与社区保持同步。
-#### TubeMQ项目邮件列表
+#### InLong项目邮件列表
|名称|描述|订阅邮件|退订邮件|邮件归档|
|:-----|:--------|:------|:-------|:-----|
-| [dev@inlong.apache.org](mailto:dev@inlong.apache.org) | 社区活动信息 | [订阅](mailto:dev-subscribe@inlong.apache.org) | [退订](mailto:dev-unsubscribe@inlong.apache.org) | [归档](http://mail-archives.apache.org/mod_mbox/tubemq-dev) |
-| [commits@tubemq.apache.org](mailto:commits@inlong.apache.org) | 代码库更新信息 | [订阅](mailto:commits-subscribe@inlong.apache.org) | [退订](mailto:commits-unsubscribe@inlong.apache.org) | [归档](http://mail-archives.apache.org/mod_mbox/tubemq-commits) |
+| [dev@inlong.apache.org](mailto:dev@inlong.apache.org) | 社区活动信息 | [订阅](mailto:dev-subscribe@inlong.apache.org) | [退订](mailto:dev-unsubscribe@inlong.apache.org) | [归档](http://mail-archives.apache.org/mod_mbox/inlong-dev) |
+| [commits@inlong.apache.org](mailto:commits@inlong.apache.org) | 代码库更新信息 | [订阅](mailto:commits-subscribe@inlong.apache.org) | [退订](mailto:commits-unsubscribe@inlong.apache.org) | [归档](http://mail-archives.apache.org/mod_mbox/inlong-commits) |
## 1. 订阅邮件列表
-**以订阅dev@tubemq.apache.org邮件列表为例**
+**以订阅dev@inlong.apache.org邮件列表为例**
具体步骤如下：
1. 发送一封不包含任何内容或主题的邮件到: `dev-subscribe@inlong.apache.org`
2. 等待直到收到一封主题为 `confirm subscribe to dev@inlong.apache.org` 的邮件(如果长时间未能收到，请确认该邮件是否被你的邮箱拦截，确定没有被拦截且长时间会收到回复邮件的话，返回第1步）
3. 直接回复该邮件，不用修改主题和添加邮件内容。
4. 等待直到收到一封主题为 `WELCOME to dev@inlong.apache.org` 的邮件。
- 5. 收到(4)的邮件后，就说明订阅邮件成功，若想发起讨论，直接往`dev@tubemq.inlong.org`发送邮件即可，所有订阅了邮件列表的人都会收到邮件。
+ 5. 收到(4)的邮件后，就说明订阅邮件成功，若想发起讨论，直接往`dev@inlong.apache.org`发送邮件即可，所有订阅了邮件列表的人都会收到邮件。
## 2. 退订邮件列表
退订邮件列表的步骤与订阅邮件列表类似，具体步骤如下：
diff --git a/docs/zh-cn/development/how-to-use-jira.md b/docs/zh-cn/development/how-to-use-jira.md
index b493906..13c3188 100644
--- a/docs/zh-cn/development/how-to-use-jira.md
+++ b/docs/zh-cn/development/how-to-use-jira.md
@@ -1,21 +1,21 @@
---
-title: 如何使用JIRA - Apache TubeMQ
+title: 如何使用JIRA - Apache InLong
---
# JIRA使用指南
JIRA是Apache官方推荐的任务管理平台，被Apache下的大部分项目用于缺陷跟踪、需求收集、任务跟踪，其丰富的功能更加便于
-项目的管理，基于此TubeMQ项目同样使用JIRA来进行管理项目。本文将简单介绍在TubeMQ的开发过程中如何使用JIRA。
+项目的管理，基于此InLong项目同样使用JIRA来进行管理项目。本文将简单介绍在InLong的开发过程中如何使用JIRA。
## 1. 注册并登陆到JIRA
对于新用户而言，使用JIRA前需要注册一个个人账号。步骤如下：
1. 登录[注册](https://issues.apache.org/jira/secure/Signup!default.jspa)页面
2. 填入个人邮箱，姓名等注册信息后即可注册。
-3. 注册成功后登录并进入TubeMQ项目。
+3. 注册成功后登录并进入InLong项目。
## 2. 查看issues
-1. 打开[TubeMQ](https://issues.apache.org/jira/projects/TUBEMQ/issues)项目页面
-2. 可以看到TubeMQ项目的所有issue
+1. 打开[InLong](https://issues.apache.org/jira/projects/INLONG/issues)项目页面
+2. 可以看到InLong项目的所有issue
3. 点击右上角`View all issues and filters`即可进行过滤issue，默认过滤规则包括任务类型、任务状态、负责人及输入关键字等搜索，
也点击右侧的`More`按钮，进行更多字段的过滤筛选。
@@ -26,7 +26,7 @@ JIRA是Apache官方推荐的任务管理平台，被Apache下的大部分项目
- 必填项
- - Project: Apache TubeMQ
+ - Project: Apache InLong
- Issue Type: 选择issue类型，包含：Task, Bug, Feature, Improvement等
- Summary: issue标题，一句话描述该issue所要表达的问题
- Reporter: issue的提交者，即本人
@@ -40,10 +40,10 @@ JIRA是Apache官方推荐的任务管理平台，被Apache下的大部分项目
创建好issue后可以将issue指定给自己或者其他人或者为空。如果指定给自己，此时你就可以准备开发代码解决该问题了。
-**如果你是第一次提交issue，可能该issue无法Assign给自己，此时你可以发邮件至：dev@tubemq.apache.org或联系TubeMQ的PPMC申请加入TubeMQ的contributor列表，加入后即可Assign其他issue给自己**
+**如果你是第一次提交issue，可能该issue无法Assign给自己，此时你可以发邮件至：dev@inlong.apache.org或联系InLong的PPMC申请加入InLong的contributor列表，加入后即可Assign其他issue给自己**
## 4. 关闭issues
-当该issue被解决后，可以关闭该issue，**一般由TubeMQ的PPMC和Committer来关闭issue**。
+当该issue被解决后，可以关闭该issue，**一般由InLong的PPMC和Committer来关闭issue**。
### 4.1. 点击`Resolve Issue`按钮
一般不要点击`Close Issue`，如下图所示：
diff --git a/docs/zh-cn/development/how-to-verify.md b/docs/zh-cn/development/how-to-verify.md
index bb26b29..ae5cbd1 100644
--- a/docs/zh-cn/development/how-to-verify.md
+++ b/docs/zh-cn/development/how-to-verify.md
@@ -1,5 +1,5 @@
---
-title: 如何验证版本- Apache TubeMQ
+title: 如何验证版本- Apache InLong
---
# 验证候选版本
@@ -8,7 +8,7 @@ title: 如何验证版本- Apache TubeMQ
## 1. 下载要发布的候选版本到本地环境
```shell
-svn co https://dist.apache.org/repos/dist/dev/incubator/tubemq/${release_version}-${rc_version}/
+svn co https://dist.apache.org/repos/dist/dev/incubator/inlong/${release_version}-${rc_version}/
```
## 2. 验证上传的版本是否合规
> 开始验证环节，验证包含但不局限于以下内容和形式
@@ -24,7 +24,7 @@ svn co https://dist.apache.org/repos/dist/dev/incubator/tubemq/${release_version
### 2.2 检查gpg签名
- 导入公钥
```shell
- curl https://dist.apache.org/repos/dist/dev/incubator/tubemq/KEYS > KEYS # 下载KEYS
+ curl https://dist.apache.org/repos/dist/dev/incubator/inlong/KEYS > KEYS # 下载KEYS
gpg --import KEYS # 导入KEYS到本地
```
- 信任公钥
@@ -85,15 +85,15 @@ svn co https://dist.apache.org/repos/dist/dev/incubator/tubemq/${release_version
```shell
for i in *.tar.gz; do echo $i; gpg --verify $i.asc $i ; done
#或者
- gpg --verify apache-tubemq-${release_version}-src.tar.gz.asc apache-tubemq-${release_version}-src.tar.gz
+ gpg --verify apache-inlong-${release_version}-src.tar.gz.asc apache-inlong-${release_version}-src.tar.gz
# 如果上传二进制包，则同样需要检查二进制包的签名是否正确
- gpg --verify apache-tubemq-server-${release_version}-bin.tar.gz.asc apache-tubemq-server-${release_version}-bin.tar.gz
- gpg --verify apache-tubemq-client-${release_version}-bin.tar.gz.asc apache-tubemq-client-${release_version}-bin.tar.gz
+ gpg --verify apache-inlong-server-${release_version}-bin.tar.gz.asc apache-inlong-server-${release_version}-bin.tar.gz
+ gpg --verify apache-inlong-client-${release_version}-bin.tar.gz.asc apache-inlong-client-${release_version}-bin.tar.gz
```
- 检查结果
> 出现类似以下内容则说明签名正确，关键字：**`Good signature`**
```shell
-apache-tubemq-0.3.0-incubating-src.tar.gz
+apache-inlong-0.3.0-incubating-src.tar.gz
gpg: Signature made Sat May 30 11:45:01 2020 CST
gpg: using RSA key 9B12C2228BDFF4F4CFE849445EF3A66D57EC647A
gpg: Good signature from "Guangxu Cheng <gx...@apache.org>" [ultimate]gular2
@@ -104,17 +104,17 @@ gpg: Good signature from "Guangxu Cheng <gx...@apache.org>" [ultimate]gular2
```shell
for i in *.tar.gz; do echo $i; gpg --print-md SHA512 $i; done
#或者
-gpg --print-md SHA512 apache-tubemq-${release_version}-src.tar.gz
+gpg --print-md SHA512 apache-inlong-${release_version}-src.tar.gz
# 如果上传二进制包，则同样需要检查二进制包的sha512哈希
-gpg --print-md SHA512 apache-tubemq-server-${release_version}-bin.tar.gz
-gpg --print-md SHA512 apache-tubemq-client-${release_version}-bin.tar.gz
+gpg --print-md SHA512 apache-inlong-server-${release_version}-bin.tar.gz
+gpg --print-md SHA512 apache-inlong-client-${release_version}-bin.tar.gz
# 或者
for i in *.tar.gz.sha512; do echo $i; sha512sum -c $i; done
```
### 2.4. 检查源码包的文件内容
- 解压缩`apache-tubemq-${release_version}-src.tar.gz`，进行如下检查:
+ 解压缩`apache-inlong-${release_version}-src.tar.gz`，进行如下检查:
- DISCLAIMER文件是否存在及内容是否正确
- LICENSE and NOTICE文件是否存在及内容是否正确
@@ -124,8 +124,8 @@ for i in *.tar.gz.sha512; do echo $i; sha512sum -c $i; done
- ....
### 2.5 检查二进制包(如果上传了二进制包)
- 解压缩`apache-tubemq-client-${release_version}-src.tar.gz`和`
- apache-tubemq-server-${release_version}-src.tar.gz`，进行如下检查:
+ 解压缩`apache-inlong-client-${release_version}-src.tar.gz`和`
+ apache-inlong-server-${release_version}-src.tar.gz`，进行如下检查:
- DISCLAIMER文件是否存在及内容是否正确
- LICENSE and NOTICE文件是否存在及内容是否正确
- 能否正常部署成功
diff --git a/docs/zh-cn/development/how-to-vote-a-committer-ppmc.md b/docs/zh-cn/development/how-to-vote-a-committer-ppmc.md
index 2f8eb6a..6c10efe 100644
--- a/docs/zh-cn/development/how-to-vote-a-committer-ppmc.md
+++ b/docs/zh-cn/development/how-to-vote-a-committer-ppmc.md
@@ -1,45 +1,45 @@
---
-title: 成为TubeMQ Committer 或 PPMC 的投票过程 - Apache TubeMQ
+title: 成为InLong Committer 或 PPMC 的投票过程 - Apache InLong
---
-# 成为TubeMQ Committer 或 PPMC 的投票过程
+# 成为InLong Committer 或 PPMC 的投票过程
-1. TubeMQ的PPMC成员发现社区贡献者任何有价值的贡献并取得候选人本人同意后，在TubeMQ的private邮件列表发起讨论；
- > [DISCUSS] YYYYY as a TubeMQ XXXXXX
+1. TubeMQ的PPMC成员发现社区贡献者任何有价值的贡献并取得候选人本人同意后，在InLong的private邮件列表发起讨论；
+ > [DISCUSS] YYYYY as a InLong XXXXXX
邮件里要把对方的贡献，可以查看的出处说清楚，便于大家讨论分析；讨论邮件将持续至少72个小时，项目组成员，包括mentor们会针对提议邮件充分发表自己的看法；
-2. 不管有没有分歧，在讨论邮件过后，投票发起者需要在在TubeMQ的private邮件列表发起Committer或PPMC的选举投票；
- > [VOTE] YYYYY as a TubeMQ XXXXXX
+2. 不管有没有分歧，在讨论邮件过后，投票发起者需要在在InLong的private邮件列表发起Committer或PPMC的选举投票；
+ > [VOTE] YYYYY as a InLong XXXXXX
投票邮件至少持续72小时，至少要3票+1通过，如果0票或者有1票-1票则投票失败；如果-1，需要把问题说清楚，便于大家理解和知晓
3. 投票邮件结束后，由投票发起者在投票线上总结并提醒投票结束，并发投票总结邮件；
- > [RESULTS][VOTE] YYYYY as a TubeMQ XXXXXX
+ > [RESULTS][VOTE] YYYYY as a InLong XXXXXX
4. 投票总结邮件发出后，投票发起者要给候选人发起邀请邮件，该邀请邮件需要候选人通过指定的邮箱回复接受或者拒绝；
- > [Invitation] Invitation to join Apache TubeMQ as a XXXXXX
+ > [Invitation] Invitation to join Apache InLong as a XXXXXX
- 邮件主送邀请人，抄送private@tubemq.apache.org
+ 邮件主送邀请人，抄送private@inlong.apache.org
5. 候选人接受邀请后，如果候选人没有apache邮箱帐号，投票发起者需要协助候选人按照指引创建apache帐号；
6. 如果选举的是PPMC，在候选人的Apache帐号创建完成后，投票发起者还需要向IPMC的private邮件组发送知会邮件，并等待至少72小时;
- > [NOTICE] XXXXXX for TubeMQ PPMC
+ > [NOTICE] XXXXXX for InLong PPMC
- 邮件主送private@incubator.apache.org，抄送private@tubemq.apache.org，IPMC们会分析合规性，直到没有疑义。
+ 邮件主送private@incubator.apache.org，抄送private@inlong.apache.org，IPMC们会分析合规性，直到没有疑义。
7. 如果以上内容都以完成，投票发起者还需要做如下2件事情：
7.1 向项目负责人申请添加项目组成员，开通jira及apache项目的权限帐号。
- 7.2 向dev@tubemq.apache.org邮件组发通知邮件：
+ 7.2 向dev@inlong.apache.org邮件组发通知邮件：
> [ANNOUNCE] New XXXXXX: YYYYY
diff --git a/docs/zh-cn/download/download.md b/docs/zh-cn/download/download.md
index f39f0d0..ce59947 100644
--- a/docs/zh-cn/download/download.md
+++ b/docs/zh-cn/download/download.md
@@ -1,9 +1,9 @@
---
-title: 下载 - Apache TubeMQ
+title: 下载 - Apache InLong
---
## 下载链接
- 使用以下链接，下载TubeMQ，最新版本为0.8.0.
+ 使用以下链接，下载InLong，最新版本为0.8.0.
## 0.8.0 release
- 发布时间：2021-03-04
@@ -11,18 +11,21 @@ title: 下载 - Apache TubeMQ
- 源码: [tubemq-0.8.0-incubating-src.tar.gz](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-0.8.0-incubating-src.tar.gz) [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-0.8.0-incubating-src.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-0.8.0-incubating-src.tar.gz.sha512)]
- 客户端: [tubemq-client-0.8.0-incubating-bin.tar.gz](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-client-0.8.0-incubating-bin.tar.gz) [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-client-0.8.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-client-0.8.0-incubating-bin.tar.gz.sha512)]
- 服务端: [tubemq-server-0.8.0-incubating-bin.tar.gz](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-server-0.8.0-incubating-bin.tar.gz) [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-server-0.8.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-server-0.8.0-incubating-bin.tar.gz.sha512)]
+
## 0.7.0 release
- 发布时间：2020-12-04
- [发版说明](release-0.7.0.md)
- 源码: [tubemq-0.7.0-incubating-src.tar.gz](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-0.7.0-incubating-src.tar.gz) [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-0.7.0-incubating-src.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-0.7.0-incubating-src.tar.gz.sha512)]
- 客户端: [tubemq-client-0.7.0-incubating-bin.tar.gz](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-client-0.7.0-incubating-bin.tar.gz) [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-client-0.7.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-client-0.7.0-incubating-bin.tar.gz.sha512)]
- 服务端: [tubemq-server-0.7.0-incubating-bin.tar.gz](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-server-0.7.0-incubating-bin.tar.gz) [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-server-0.7.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-server-0.7.0-incubating-bin.tar.gz.sha512)]
+
## 0.6.0 release
- 发布时间：2020-10-21
- [发版说明](release-0.6.0.md)
- 源码: [tubemq-0.6.0-incubating-src.tar.gz](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-0.6.0-incubating-src.tar.gz) [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-0.6.0-incubating-src.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-0.6.0-incubating-src.tar.gz.sha512)]
- 客户端: [tubemq-client-0.6.0-incubating-bin.tar.gz](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-client-0.6.0-incubating-bin.tar.gz) [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-client-0.6.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-client-0.6.0-incubating-bin.tar.gz.sha512)]
- 服务端: [tubemq-server-0.6.0-incubating-bin.tar.gz](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-server-0.6.0-incubating-bin.tar.gz) [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-server-0.6.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-server-0.6.0-incubating-bin.tar.gz.sha512)]
+
## 0.5.0 release
- 发布时间：2020-08-04
- [发版说明](release-0.5.0.md)
diff --git a/docs/zh-cn/download/release-0.3.0.md b/docs/zh-cn/download/release-0.3.0.md
index d29056b..9cc18bd 100644
--- a/docs/zh-cn/download/release-0.3.0.md
+++ b/docs/zh-cn/download/release-0.3.0.md
@@ -1,64 +1,64 @@
---
-title: 下载 - Apache TubeMQ
+title: 下载 - Apache InLong
---
-# 下载TubeMQ
- 使用以下镜像下载TubeMQ
+# 下载InLong
+ 使用以下镜像下载InLong
-## TubeMQ
+## InLong
| 日期 | 版本| 备注 | 下载 |
|:---:|:--:|:--:|:--:|
-| 2020-06-06 | 0.3.0 | 源码 | [[SRC](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.3.0-incubating/apache-tubemq-0.3.0-incubating-src.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.3.0-incubating/apache-tubemq-0.3.0-incubating-src.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.3.0-incubating/apache-tubemq-0.3.0-incubating-src.tar.gz.sha512)] |
-| | | 客户端 | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.3.0-incubating/apache-tubemq-client-0.3.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.3.0-incubating/apache-tubemq-client-0.3.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.3.0-incubating/apache-tubemq-client-0.3.0-incubating-bin.tar.gz.sha512)] |
-| | | 服务端 | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.3.0-incubating/apache-tubemq-server-0.3.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.3.0-incubating/apache-tubemq-server-0.3.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.3.0-incubating/apache-tubemq-server-0.3.0-incubating-bin.tar.gz.sha512)] |
+| 2020-06-06 | 0.3.0 | 源码 | [[SRC](https://archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-0.3.0-incubating-src.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-0.3.0-incubating-src.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-0.3.0-incubating-src.tar.gz.sha512)] |
+| | | 客户端 | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-client-0.3.0-incubating-bin.tar.gz)] [[PGP](archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-client-0.3.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-client-0.3.0-incubating-bin.tar.gz.sha512)] |
+| | | 服务端 | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-server-0.3.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-server-0.3.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.3.0-incubating/apache-tubemq-server-0.3.0-incubating-bin.tar.gz.sha512)] |
## 发版说明
### 新特性
- - [[TUBEMQ-42](https://issues.apache.org/jira/browse/TUBEMQ-42)] Add peer information about message received Major New Feature
+ - [[INLONG-42](https://issues.apache.org/jira/browse/INLONG-42)] Add peer information about message received Major New Feature
### 改进
- - [[TUBEMQ-7](https://issues.apache.org/jira/browse/TUBEMQ-7)] Using StringBuilder instead of StringBuffer in BaseResult
- - [[TUBEMQ-9](https://issues.apache.org/jira/browse/TUBEMQ-9)] Remove some unnecessary code
- - [[TUBEMQ-16](https://issues.apache.org/jira/browse/TUBEMQ-16)] Correct BdbStoreService#isPrimaryNodeActived to BdbStoreService#isPrimaryNodeActive
- - [[TUBEMQ-18](https://issues.apache.org/jira/browse/TUBEMQ-18)] Correct TMaster#idGenerater to TMaster#idGenerator
- - [[TUBEMQ-19](https://issues.apache.org/jira/browse/TUBEMQ-19)] Correct parameter names to fit in camel case
- - [[TUBEMQ-20](https://issues.apache.org/jira/browse/TUBEMQ-20)] Correct DefaultLoadBalancer#balance parameter
- - [[TUBEMQ-21](https://issues.apache.org/jira/browse/TUBEMQ-21)] Change version number from x.y-SNAPSHOT to x.y.z-incubating-SNAPSHOT
- - [[TUBEMQ-22](https://issues.apache.org/jira/browse/TUBEMQ-22)] Correct ClientSubInfo#getTopicProcesser -> ClientSubInfo#getTopicProcessor
- - [[TUBEMQ-23](https://issues.apache.org/jira/browse/TUBEMQ-23)] Improve project README content introduction
- - [[TUBEMQ-24](https://issues.apache.org/jira/browse/TUBEMQ-24)] Add NOTICE and adjust LICENSE
- - [[TUBEMQ-26](https://issues.apache.org/jira/browse/TUBEMQ-26)] correct spelling (difftime-> diffTime)
- - [[TUBEMQ-27](https://issues.apache.org/jira/browse/TUBEMQ-27)] replace StringBuffer with StringBuilder
- - [[TUBEMQ-28](https://issues.apache.org/jira/browse/TUBEMQ-28)] ignore path error
- - [[TUBEMQ-29](https://issues.apache.org/jira/browse/TUBEMQ-29)] Change the package name to org.apache.tubemq.""
- - [[TUBEMQ-33](https://issues.apache.org/jira/browse/TUBEMQ-33)] refactor enum implement from annoymouse inner class
- - [[TUBEMQ-38](https://issues.apache.org/jira/browse/TUBEMQ-38)] Correct DefaultLoadBalancer#balance parameter
- - [[TUBEMQ-39](https://issues.apache.org/jira/browse/TUBEMQ-39)] Optimize the loadMessageStores() logic
- - [[TUBEMQ-40](https://issues.apache.org/jira/browse/TUBEMQ-40)] Optimize message disk store classes's logic
- - [[TUBEMQ-43](https://issues.apache.org/jira/browse/TUBEMQ-43)] Add DeletePolicy's value check
- - [[TUBEMQ-44](https://issues.apache.org/jira/browse/TUBEMQ-44)] Remove unnecessary synchronized definition of shutdown () function
- - [[TUBEMQ-49](https://issues.apache.org/jira/browse/TUBEMQ-49)] setTimeoutTime change to updTimeoutTime
- - [[TUBEMQ-50](https://issues.apache.org/jira/browse/TUBEMQ-50)] Replace fastjson to gson
+ - [[INLONG-7](https://issues.apache.org/jira/browse/INLONG-7)] Using StringBuilder instead of StringBuffer in BaseResult
+ - [[INLONG-9](https://issues.apache.org/jira/browse/INLONG-9)] Remove some unnecessary code
+ - [[INLONG-16](https://issues.apache.org/jira/browse/INLONG-16)] Correct BdbStoreService#isPrimaryNodeActived to BdbStoreService#isPrimaryNodeActive
+ - [[INLONG-18](https://issues.apache.org/jira/browse/INLONG-18)] Correct TMaster#idGenerater to TMaster#idGenerator
+ - [[INLONG-19](https://issues.apache.org/jira/browse/INLONG-19)] Correct parameter names to fit in camel case
+ - [[INLONG-20](https://issues.apache.org/jira/browse/INLONG-20)] Correct DefaultLoadBalancer#balance parameter
+ - [[INLONG-21](https://issues.apache.org/jira/browse/INLONG-21)] Change version number from x.y-SNAPSHOT to x.y.z-incubating-SNAPSHOT
+ - [[INLONG-22](https://issues.apache.org/jira/browse/INLONG-22)] Correct ClientSubInfo#getTopicProcesser -> ClientSubInfo#getTopicProcessor
+ - [[INLONG-23](https://issues.apache.org/jira/browse/INLONG-23)] Improve project README content introduction
+ - [[INLONG-24](https://issues.apache.org/jira/browse/INLONG-24)] Add NOTICE and adjust LICENSE
+ - [[INLONG-26](https://issues.apache.org/jira/browse/INLONG-26)] correct spelling (difftime-> diffTime)
+ - [[INLONG-27](https://issues.apache.org/jira/browse/INLONG-27)] replace StringBuffer with StringBuilder
+ - [[INLONG-28](https://issues.apache.org/jira/browse/INLONG-28)] ignore path error
+ - [[INLONG-29](https://issues.apache.org/jira/browse/INLONG-29)] Change the package name to org.apache.tubemq.""
+ - [[INLONG-33](https://issues.apache.org/jira/browse/INLONG-33)] refactor enum implement from annoymouse inner class
+ - [[INLONG-38](https://issues.apache.org/jira/browse/INLONG-38)] Correct DefaultLoadBalancer#balance parameter
+ - [[INLONG-39](https://issues.apache.org/jira/browse/INLONG-39)] Optimize the loadMessageStores() logic
+ - [[INLONG-40](https://issues.apache.org/jira/browse/INLONG-40)] Optimize message disk store classes's logic
+ - [[INLONG-43](https://issues.apache.org/jira/browse/INLONG-43)] Add DeletePolicy's value check
+ - [[INLONG-44](https://issues.apache.org/jira/browse/INLONG-44)] Remove unnecessary synchronized definition of shutdown () function
+ - [[INLONG-49](https://issues.apache.org/jira/browse/INLONG-49)] setTimeoutTime change to updTimeoutTime
+ - [[INLONG-50](https://issues.apache.org/jira/browse/INLONG-50)] Replace fastjson to gson
### Bug修复
- - [[TUBEMQ-10](https://issues.apache.org/jira/browse/TUBEMQ-10)] Fix Javadoc error
- - [[TUBEMQ-14](https://issues.apache.org/jira/browse/TUBEMQ-14)] Some compilation errors
- - [[TUBEMQ-15](https://issues.apache.org/jira/browse/TUBEMQ-15)] Correct typo in http_access_API_definition.md
- - [[TUBEMQ-32](https://issues.apache.org/jira/browse/TUBEMQ-32)] File path not match with package name in tubemq-client module
- - [[TUBEMQ-35](https://issues.apache.org/jira/browse/TUBEMQ-35)] check illegal package's field value
- - [[TUBEMQ-36](https://issues.apache.org/jira/browse/TUBEMQ-36)] Remove unnecessary removefirst() function printing
- - [[TUBEMQ-37](https://issues.apache.org/jira/browse/TUBEMQ-37)] Offset is set to 0 when Broker goes offline
- - [[TUBEMQ-45](https://issues.apache.org/jira/browse/TUBEMQ-45)] Check groupName with checkHostName function
- - [[TUBEMQ-48](https://issues.apache.org/jira/browse/TUBEMQ-48)] No timeout when setting consumer timeout
- - [[TUBEMQ-59](https://issues.apache.org/jira/browse/TUBEMQ-59)] Null pointer exception is thrown while constructing ConsumerConfig with MasterInfo
- - [[TUBEMQ-62](https://issues.apache.org/jira/browse/TUBEMQ-62)] consumed and set consumerConfig.setConsumeModel (0) for the first time
- - [[TUBEMQ-66](https://issues.apache.org/jira/browse/TUBEMQ-66)] TubeSingleSessionFactory shutdown bug
- - [[TUBEMQ-85](https://issues.apache.org/jira/browse/TUBEMQ-85)] There is NPE when creating PullConsumer with TubeSingleSessionFactory
- - [[TUBEMQ-88](https://issues.apache.org/jira/browse/TUBEMQ-88)] Broker does not take effect after the deletePolicy value is changed
- - [[TUBEMQ-149](https://issues.apache.org/jira/browse/TUBEMQ-149)] Some of the consumers stop consuming their corresponding partitions and never release the partition to others
- - [[TUBEMQ-153](https://issues.apache.org/jira/browse/TUBEMQ-153)] Some of the consumers stop consuming their corresponding partitions and never release the partition to others
- - [[TUBEMQ-165](https://issues.apache.org/jira/browse/TUBEMQ-165)] Remove unnecessary fiiles
+ - [[INLONG-10](https://issues.apache.org/jira/browse/INLONG-10)] Fix Javadoc error
+ - [[INLONG-14](https://issues.apache.org/jira/browse/INLONG-14)] Some compilation errors
+ - [[INLONG-15](https://issues.apache.org/jira/browse/INLONG-15)] Correct typo in http_access_API_definition.md
+ - [[INLONG-32](https://issues.apache.org/jira/browse/INLONG-32)] File path not match with package name in tubemq-client module
+ - [[INLONG-35](https://issues.apache.org/jira/browse/INLONG-35)] check illegal package's field value
+ - [[INLONG-36](https://issues.apache.org/jira/browse/INLONG-36)] Remove unnecessary removefirst() function printing
+ - [[INLONG-37](https://issues.apache.org/jira/browse/INLONG-37)] Offset is set to 0 when Broker goes offline
+ - [[INLONG-45](https://issues.apache.org/jira/browse/INLONG-45)] Check groupName with checkHostName function
+ - [[INLONG-48](https://issues.apache.org/jira/browse/INLONG-48)] No timeout when setting consumer timeout
+ - [[INLONG-59](https://issues.apache.org/jira/browse/INLONG-59)] Null pointer exception is thrown while constructing ConsumerConfig with MasterInfo
+ - [[INLONG-62](https://issues.apache.org/jira/browse/INLONG-62)] consumed and set consumerConfig.setConsumeModel (0) for the first time
+ - [[INLONG-66](https://issues.apache.org/jira/browse/INLONG-66)] TubeSingleSessionFactory shutdown bug
+ - [[INLONG-85](https://issues.apache.org/jira/browse/INLONG-85)] There is NPE when creating PullConsumer with TubeSingleSessionFactory
+ - [[INLONG-88](https://issues.apache.org/jira/browse/INLONG-88)] Broker does not take effect after the deletePolicy value is changed
+ - [[INLONG-149](https://issues.apache.org/jira/browse/INLONG-149)] Some of the consumers stop consuming their corresponding partitions and never release the partition to others
+ - [[INLONG-153](https://issues.apache.org/jira/browse/INLONG-153)] Some of the consumers stop consuming their corresponding partitions and never release the partition to others
+ - [[INLONG-165](https://issues.apache.org/jira/browse/INLONG-165)] Remove unnecessary fiiles
diff --git a/docs/zh-cn/download/release-0.5.0.md b/docs/zh-cn/download/release-0.5.0.md
index 0d16ee4..01a9a7b 100644
--- a/docs/zh-cn/download/release-0.5.0.md
+++ b/docs/zh-cn/download/release-0.5.0.md
@@ -1,102 +1,102 @@
---
-title: 下载 - Apache TubeMQ
+title: 下载 - Apache InLong
---
-# 下载TubeMQ
- 使用以下镜像下载TubeMQ
+# 下载InLong
+ 使用以下镜像下载InLong
-## TubeMQ
+## InLong
| 日期 | 版本| 备注 | 下载 |
|:---:|:--:|:--:|:--:|
-| 2020-08-04 | 0.5.0 | Source | [[SRC](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.5.0-incubating/apache-tubemq-0.5.0-incubating-src.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.5.0-incubating/apache-tubemq-0.5.0-incubating-src.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.5.0-incubating/apache-tubemq-0.5.0-incubating-src.tar.gz.sha512)] |
-| | | Client | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.5.0-incubating/apache-tubemq-client-0.5.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.5.0-incubating/apache-tubemq-client-0.5.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.5.0-incubating/apache-tubemq-client-0.5.0-incubating-bin.tar.gz.sha512)] |
-| | | Server | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.5.0-incubating/apache-tubemq-server-0.5.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.5.0-incubating/apache-tubemq-server-0.5.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.5.0-incubating/apache-tubemq-server-0.5.0-incubating-bin.tar.gz.sha512)] |
+| 2020-08-04 | 0.5.0 | 源码 | [[SRC](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-0.5.0-incubating-src.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-0.5.0-incubating-src.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-0.5.0-incubating-src.tar.gz.sha512)] |
+| | | 客户端 | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-client-0.5.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-client-0.5.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-client-0.5.0-incubating-bin.tar.gz.sha512)] |
+| | | 服务端 | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-server-0.5.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-server-0.5.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.5.0-incubating/apache-tubemq-server-0.5.0-incubating-bin.tar.gz.sha512)] |
## 发版说明
### 新特性
- - [[TUBEMQ-122](https://issues.apache.org/jira/browse/TUBEMQ-122)] Increase JAVA version collection of SDK environment
- - [[TUBEMQ-163](https://issues.apache.org/jira/browse/TUBEMQ-163)] Flume sink for TubeMQ
- - [[TUBEMQ-197](https://issues.apache.org/jira/browse/TUBEMQ-197)] Support TubeMQ connector for Apache Flink
- - [[TUBEMQ-238](https://issues.apache.org/jira/browse/TUBEMQ-238)] Support TubeMQ connector for Apache Spark Streaming
- - [[TUBEMQ-239](https://issues.apache.org/jira/browse/TUBEMQ-239)] support deployment on kubernetes
+ - [[INLONG-122](https://issues.apache.org/jira/browse/INLONG-122)] Increase JAVA version collection of SDK environment
+ - [[INLONG-163](https://issues.apache.org/jira/browse/INLONG-163)] Flume sink for TubeMQ
+ - [[INLONG-197](https://issues.apache.org/jira/browse/INLONG-197)] Support TubeMQ connector for Apache Flink
+ - [[INLONG-238](https://issues.apache.org/jira/browse/INLONG-238)] Support TubeMQ connector for Apache Spark Streaming
+ - [[INLONG-239](https://issues.apache.org/jira/browse/INLONG-239)] support deployment on kubernetes
### 改进
- - [[TUBEMQ-46](https://issues.apache.org/jira/browse/TUBEMQ-46)] Correct some spelling issues
- - [[TUBEMQ-53](https://issues.apache.org/jira/browse/TUBEMQ-53)] fix some typos
- - [[TUBEMQ-55](https://issues.apache.org/jira/browse/TUBEMQ-55)] fix some typos
- - [[TUBEMQ-57](https://issues.apache.org/jira/browse/TUBEMQ-57)] fix some typos
- - [[TUBEMQ-58](https://issues.apache.org/jira/browse/TUBEMQ-58)] fix some typos
- - [[TUBEMQ-60](https://issues.apache.org/jira/browse/TUBEMQ-60)] Remove unnecessary synchronized & using IllegalArgumentException instead of IllegalStateException
- - [[TUBEMQ-61](https://issues.apache.org/jira/browse/TUBEMQ-61)] minor update & fix some typos
- - [[TUBEMQ-64](https://issues.apache.org/jira/browse/TUBEMQ-64)] minor update & fix some typos
- - [[TUBEMQ-67](https://issues.apache.org/jira/browse/TUBEMQ-67)] remove synchronized & fix some typos
- - [[TUBEMQ-71](https://issues.apache.org/jira/browse/TUBEMQ-71)] using IllegalArgumentException & fix some typos
- - [[TUBEMQ-73](https://issues.apache.org/jira/browse/TUBEMQ-73)] remove duplicate codes & some minor updates
- - [[TUBEMQ-74](https://issues.apache.org/jira/browse/TUBEMQ-74)] minor updates for DefaultBdbStoreService
- - [[TUBEMQ-75](https://issues.apache.org/jira/browse/TUBEMQ-75)] remove unused Logger
- - [[TUBEMQ-76](https://issues.apache.org/jira/browse/TUBEMQ-76)] rename the classes
- - [[TUBEMQ-77](https://issues.apache.org/jira/browse/TUBEMQ-77)] fix typo
- - [[TUBEMQ-79](https://issues.apache.org/jira/browse/TUBEMQ-79)] fix typo
- - [[TUBEMQ-80](https://issues.apache.org/jira/browse/TUBEMQ-80)] Fix some typos
- - [[TUBEMQ-82](https://issues.apache.org/jira/browse/TUBEMQ-82)] Fix some typos & update comments
- - [[TUBEMQ-83](https://issues.apache.org/jira/browse/TUBEMQ-83)] Fix some typos
- - [[TUBEMQ-87](https://issues.apache.org/jira/browse/TUBEMQ-87)] Minor updates
- - [[TUBEMQ-89](https://issues.apache.org/jira/browse/TUBEMQ-89)] Minor updates
- - [[TUBEMQ-90](https://issues.apache.org/jira/browse/TUBEMQ-90)] Remove unused codes in TubeBroker
- - [[TUBEMQ-91](https://issues.apache.org/jira/browse/TUBEMQ-91)] replace explicit type with <>
- - [[TUBEMQ-93](https://issues.apache.org/jira/browse/TUBEMQ-93)] Substitute the parameterized type for client module & missed server module
- - [[TUBEMQ-94](https://issues.apache.org/jira/browse/TUBEMQ-94)] Substitute the parameterized type for core module
- - [[TUBEMQ-95](https://issues.apache.org/jira/browse/TUBEMQ-95)] Substitute the parameterized type for server module
- - [[TUBEMQ-96](https://issues.apache.org/jira/browse/TUBEMQ-96)] Fix typo & use IllegalArgumentException
- - [[TUBEMQ-98](https://issues.apache.org/jira/browse/TUBEMQ-98)] Fix typo & Simplify 'instanceof' judgment
- - [[TUBEMQ-100](https://issues.apache.org/jira/browse/TUBEMQ-100)] Fix typos & remove unused codes
- - [[TUBEMQ-101](https://issues.apache.org/jira/browse/TUBEMQ-101)] Optimize code & Fix type
- - [[TUBEMQ-103](https://issues.apache.org/jira/browse/TUBEMQ-103)] Substitute Chinese comments with English
- - [[TUBEMQ-108](https://issues.apache.org/jira/browse/TUBEMQ-108)] About maven jdk version configuration problem
- - [[TUBEMQ-127](https://issues.apache.org/jira/browse/TUBEMQ-127)] Fixed a bug & minor changes
- - [[TUBEMQ-128](https://issues.apache.org/jira/browse/TUBEMQ-128)] Shorten the log clearup check cycle
- - [[TUBEMQ-138](https://issues.apache.org/jira/browse/TUBEMQ-138)] Optimize core module test case code
- - [[TUBEMQ-141](https://issues.apache.org/jira/browse/TUBEMQ-141)] Remove the requirement to provide localHostIP
- - [[TUBEMQ-152](https://issues.apache.org/jira/browse/TUBEMQ-152)] Modify the master.ini file's annotations
- - [[TUBEMQ-154](https://issues.apache.org/jira/browse/TUBEMQ-154)] Modify the wrong comment & Minor changes for example module
- - [[TUBEMQ-155](https://issues.apache.org/jira/browse/TUBEMQ-155)] Use enum class for consume position
- - [[TUBEMQ-156](https://issues.apache.org/jira/browse/TUBEMQ-156)] Update for README.md
- - [[TUBEMQ-166](https://issues.apache.org/jira/browse/TUBEMQ-166)] Hide `bdbStore` configs in master.ini
- - [[TUBEMQ-167](https://issues.apache.org/jira/browse/TUBEMQ-167)] Change to relative paths in default configs
- - [[TUBEMQ-168](https://issues.apache.org/jira/browse/TUBEMQ-168)] Example module: remove localhost IP configuration parameters
- - [[TUBEMQ-170](https://issues.apache.org/jira/browse/TUBEMQ-170)] improve build/deployment/configuration for quick start
- - [[TUBEMQ-196](https://issues.apache.org/jira/browse/TUBEMQ-196)] use log to print exception
- - [[TUBEMQ-201](https://issues.apache.org/jira/browse/TUBEMQ-201)] [Website] Adjust user guide & fix demo example
- - [[TUBEMQ-202](https://issues.apache.org/jira/browse/TUBEMQ-202)] Add protobuf protocol syntax declaration
- - [[TUBEMQ-213](https://issues.apache.org/jira/browse/TUBEMQ-213)] Optimize code & Minor changes
- - [[TUBEMQ-216](https://issues.apache.org/jira/browse/TUBEMQ-216)] use ThreadUtil.sleep replace Thread.sleep
- - [[TUBEMQ-222](https://issues.apache.org/jira/browse/TUBEMQ-222)] Optimize code: Unnecessary boxing/unboxing conversion
- - [[TUBEMQ-224](https://issues.apache.org/jira/browse/TUBEMQ-224)] Fixed: Unnecessary conversion to string inspection for server module
- - [[TUBEMQ-226](https://issues.apache.org/jira/browse/TUBEMQ-226)] Add Windows startup scripts
- - [[TUBEMQ-227](https://issues.apache.org/jira/browse/TUBEMQ-227)] remove build guide in docker-build readme
- - [[TUBEMQ-232](https://issues.apache.org/jira/browse/TUBEMQ-232)] TubeBroker#register2Master, reconnect and wait
- - [[TUBEMQ-234](https://issues.apache.org/jira/browse/TUBEMQ-234)] Add .asf.yaml to change notifications
- - [[TUBEMQ-235](https://issues.apache.org/jira/browse/TUBEMQ-235)] Add code coverage supporting for pull request created.
- - [[TUBEMQ-237](https://issues.apache.org/jira/browse/TUBEMQ-237)] add maven module build for docker image
+ - [[INLONG-46](https://issues.apache.org/jira/browse/INLONG-46)] Correct some spelling issues
+ - [[INLONG-53](https://issues.apache.org/jira/browse/INLONG-53)] fix some typos
+ - [[INLONG-55](https://issues.apache.org/jira/browse/INLONG-55)] fix some typos
+ - [[INLONG-57](https://issues.apache.org/jira/browse/INLONG-57)] fix some typos
+ - [[INLONG-58](https://issues.apache.org/jira/browse/INLONG-58)] fix some typos
+ - [[INLONG-60](https://issues.apache.org/jira/browse/INLONG-60)] Remove unnecessary synchronized & using IllegalArgumentException instead of IllegalStateException
+ - [[INLONG-61](https://issues.apache.org/jira/browse/INLONG-61)] minor update & fix some typos
+ - [[INLONG-64](https://issues.apache.org/jira/browse/INLONG-64)] minor update & fix some typos
+ - [[INLONG-67](https://issues.apache.org/jira/browse/INLONG-67)] remove synchronized & fix some typos
+ - [[INLONG-71](https://issues.apache.org/jira/browse/INLONG-71)] using IllegalArgumentException & fix some typos
+ - [[INLONG-73](https://issues.apache.org/jira/browse/INLONG-73)] remove duplicate codes & some minor updates
+ - [[INLONG-74](https://issues.apache.org/jira/browse/INLONG-74)] minor updates for DefaultBdbStoreService
+ - [[INLONG-75](https://issues.apache.org/jira/browse/INLONG-75)] remove unused Logger
+ - [[INLONG-76](https://issues.apache.org/jira/browse/INLONG-76)] rename the classes
+ - [[INLONG-77](https://issues.apache.org/jira/browse/INLONG-77)] fix typo
+ - [[INLONG-79](https://issues.apache.org/jira/browse/INLONG-79)] fix typo
+ - [[INLONG-80](https://issues.apache.org/jira/browse/INLONG-80)] Fix some typos
+ - [[INLONG-82](https://issues.apache.org/jira/browse/INLONG-82)] Fix some typos & update comments
+ - [[INLONG-83](https://issues.apache.org/jira/browse/INLONG-83)] Fix some typos
+ - [[INLONG-87](https://issues.apache.org/jira/browse/INLONG-87)] Minor updates
+ - [[INLONG-89](https://issues.apache.org/jira/browse/INLONG-89)] Minor updates
+ - [[INLONG-90](https://issues.apache.org/jira/browse/INLONG-90)] Remove unused codes in TubeBroker
+ - [[INLONG-91](https://issues.apache.org/jira/browse/INLONG-91)] replace explicit type with <>
+ - [[INLONG-93](https://issues.apache.org/jira/browse/INLONG-93)] Substitute the parameterized type for client module & missed server module
+ - [[INLONG-94](https://issues.apache.org/jira/browse/INLONG-94)] Substitute the parameterized type for core module
+ - [[INLONG-95](https://issues.apache.org/jira/browse/INLONG-95)] Substitute the parameterized type for server module
+ - [[INLONG-96](https://issues.apache.org/jira/browse/INLONG-96)] Fix typo & use IllegalArgumentException
+ - [[INLONG-98](https://issues.apache.org/jira/browse/INLONG-98)] Fix typo & Simplify 'instanceof' judgment
+ - [[INLONG-100](https://issues.apache.org/jira/browse/INLONG-100)] Fix typos & remove unused codes
+ - [[INLONG-101](https://issues.apache.org/jira/browse/INLONG-101)] Optimize code & Fix type
+ - [[INLONG-103](https://issues.apache.org/jira/browse/INLONG-103)] Substitute Chinese comments with English
+ - [[INLONG-108](https://issues.apache.org/jira/browse/INLONG-108)] About maven jdk version configuration problem
+ - [[INLONG-127](https://issues.apache.org/jira/browse/INLONG-127)] Fixed a bug & minor changes
+ - [[INLONG-128](https://issues.apache.org/jira/browse/INLONG-128)] Shorten the log clearup check cycle
+ - [[INLONG-138](https://issues.apache.org/jira/browse/INLONG-138)] Optimize core module test case code
+ - [[INLONG-141](https://issues.apache.org/jira/browse/INLONG-141)] Remove the requirement to provide localHostIP
+ - [[INLONG-152](https://issues.apache.org/jira/browse/INLONG-152)] Modify the master.ini file's annotations
+ - [[INLONG-154](https://issues.apache.org/jira/browse/INLONG-154)] Modify the wrong comment & Minor changes for example module
+ - [[INLONG-155](https://issues.apache.org/jira/browse/INLONG-155)] Use enum class for consume position
+ - [[INLONG-156](https://issues.apache.org/jira/browse/INLONG-156)] Update for README.md
+ - [[INLONG-166](https://issues.apache.org/jira/browse/INLONG-166)] Hide `bdbStore` configs in master.ini
+ - [[INLONG-167](https://issues.apache.org/jira/browse/INLONG-167)] Change to relative paths in default configs
+ - [[INLONG-168](https://issues.apache.org/jira/browse/INLONG-168)] Example module: remove localhost IP configuration parameters
+ - [[INLONG-170](https://issues.apache.org/jira/browse/INLONG-170)] improve build/deployment/configuration for quick start
+ - [[INLONG-196](https://issues.apache.org/jira/browse/INLONG-196)] use log to print exception
+ - [[INLONG-201](https://issues.apache.org/jira/browse/INLONG-201)] [Website] Adjust user guide & fix demo example
+ - [[INLONG-202](https://issues.apache.org/jira/browse/INLONG-202)] Add protobuf protocol syntax declaration
+ - [[INLONG-213](https://issues.apache.org/jira/browse/INLONG-213)] Optimize code & Minor changes
+ - [[INLONG-216](https://issues.apache.org/jira/browse/INLONG-216)] use ThreadUtil.sleep replace Thread.sleep
+ - [[INLONG-222](https://issues.apache.org/jira/browse/INLONG-222)] Optimize code: Unnecessary boxing/unboxing conversion
+ - [[INLONG-224](https://issues.apache.org/jira/browse/INLONG-224)] Fixed: Unnecessary conversion to string inspection for server module
+ - [[INLONG-226](https://issues.apache.org/jira/browse/INLONG-226)] Add Windows startup scripts
+ - [[INLONG-227](https://issues.apache.org/jira/browse/INLONG-227)] remove build guide in docker-build readme
+ - [[INLONG-232](https://issues.apache.org/jira/browse/INLONG-232)] TubeBroker#register2Master, reconnect and wait
+ - [[INLONG-234](https://issues.apache.org/jira/browse/INLONG-234)] Add .asf.yaml to change notifications
+ - [[INLONG-235](https://issues.apache.org/jira/browse/INLONG-235)] Add code coverage supporting for pull request created.
+ - [[INLONG-237](https://issues.apache.org/jira/browse/INLONG-237)] add maven module build for docker image
### Bug修复
- - [[TUBEMQ-47](https://issues.apache.org/jira/browse/TUBEMQ-47)] Fix some typos
- - [[TUBEMQ-102](https://issues.apache.org/jira/browse/TUBEMQ-102)] Fix question [TUBEMQ-101] [Optimize code]
- - [[TUBEMQ-121](https://issues.apache.org/jira/browse/TUBEMQ-121)] Fix compilation alarm
- - [[TUBEMQ-139](https://issues.apache.org/jira/browse/TUBEMQ-139)] a bug in the equals method of the TubeClientConfig class
- - [[TUBEMQ-157](https://issues.apache.org/jira/browse/TUBEMQ-157)] Optimize Broker disk anomaly check
- - [[TUBEMQ-158](https://issues.apache.org/jira/browse/TUBEMQ-158)] nextWithAuthInfo2B status should be managed independently according to Broker
- - [[TUBEMQ-159](https://issues.apache.org/jira/browse/TUBEMQ-159)] Fix some typos
- - [[TUBEMQ-165](https://issues.apache.org/jira/browse/TUBEMQ-165)] Remove unnecessary fiiles
- - [[TUBEMQ-205](https://issues.apache.org/jira/browse/TUBEMQ-205)] Duplicate dependency of jetty in tuber-server pom file
- - [[TUBEMQ-206](https://issues.apache.org/jira/browse/TUBEMQ-206)] There are some residual files after executed unit tests
- - [[TUBEMQ-210](https://issues.apache.org/jira/browse/TUBEMQ-210)] Add log4j properties file for unit tests
- - [[TUBEMQ-217](https://issues.apache.org/jira/browse/TUBEMQ-217)] UPdate the je download path
- - [[TUBEMQ-218](https://issues.apache.org/jira/browse/TUBEMQ-218)] build failed: Too many files with unapproved license
- - [[TUBEMQ-230](https://issues.apache.org/jira/browse/TUBEMQ-230)] TubeMQ run mvn test failed with openjdk version 13.0.2
- - [[TUBEMQ-236](https://issues.apache.org/jira/browse/TUBEMQ-236)] Can't get dependencies from the maven repository
- - [[TUBEMQ-253](https://issues.apache.org/jira/browse/TUBEMQ-253)] tube-consumer fetch-worker cpu used too high
- - [[TUBEMQ-254](https://issues.apache.org/jira/browse/TUBEMQ-254)] support using different mapping port for standalone mode
- - [[TUBEMQ-265](https://issues.apache.org/jira/browse/TUBEMQ-265)] Unexpected broker disappearance in broker list after updating default broker metadata
+ - [[INLONG-47](https://issues.apache.org/jira/browse/INLONG-47)] Fix some typos
+ - [[INLONG-102](https://issues.apache.org/jira/browse/INLONG-102)] Fix question [INLONG-101] [Optimize code]
+ - [[INLONG-121](https://issues.apache.org/jira/browse/INLONG-121)] Fix compilation alarm
+ - [[INLONG-139](https://issues.apache.org/jira/browse/INLONG-139)] a bug in the equals method of the TubeClientConfig class
+ - [[INLONG-157](https://issues.apache.org/jira/browse/INLONG-157)] Optimize Broker disk anomaly check
+ - [[INLONG-158](https://issues.apache.org/jira/browse/INLONG-158)] nextWithAuthInfo2B status should be managed independently according to Broker
+ - [[INLONG-159](https://issues.apache.org/jira/browse/INLONG-159)] Fix some typos
+ - [[INLONG-165](https://issues.apache.org/jira/browse/INLONG-165)] Remove unnecessary fiiles
+ - [[INLONG-205](https://issues.apache.org/jira/browse/INLONG-205)] Duplicate dependency of jetty in tuber-server pom file
+ - [[INLONG-206](https://issues.apache.org/jira/browse/INLONG-206)] There are some residual files after executed unit tests
+ - [[INLONG-210](https://issues.apache.org/jira/browse/INLONG-210)] Add log4j properties file for unit tests
+ - [[INLONG-217](https://issues.apache.org/jira/browse/INLONG-217)] UPdate the je download path
+ - [[INLONG-218](https://issues.apache.org/jira/browse/INLONG-218)] build failed: Too many files with unapproved license
+ - [[INLONG-230](https://issues.apache.org/jira/browse/INLONG-230)] TubeMQ run mvn test failed with openjdk version 13.0.2
+ - [[INLONG-236](https://issues.apache.org/jira/browse/INLONG-236)] Can't get dependencies from the maven repository
+ - [[INLONG-253](https://issues.apache.org/jira/browse/INLONG-253)] tube-consumer fetch-worker cpu used too high
+ - [[INLONG-254](https://issues.apache.org/jira/browse/INLONG-254)] support using different mapping port for standalone mode
+ - [[INLONG-265](https://issues.apache.org/jira/browse/INLONG-265)] Unexpected broker disappearance in broker list after updating default broker metadata
diff --git a/docs/zh-cn/download/release-0.6.0.md b/docs/zh-cn/download/release-0.6.0.md
index 3e9daf7..3260819 100644
--- a/docs/zh-cn/download/release-0.6.0.md
+++ b/docs/zh-cn/download/release-0.6.0.md
@@ -1,38 +1,38 @@
---
-title: 下载 - Apache TubeMQ
+title: 下载 - Apache InLong
---
# 下载TubeMQ
- 使用以下镜像下载TubeMQ
+ 使用以下镜像下载InLong
-## TubeMQ
+## InLong
| 日期 | 版本| 备注 | 下载 |
|:---:|:--:|:--:|:--:|
-| 2020-10-21 | 0.6.0 | Source | [[SRC](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.6.0-incubating/apache-tubemq-0.6.0-incubating-src.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.6.0-incubating/apache-tubemq-0.6.0-incubating-src.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.6.0-incubating/apache-tubemq-0.6.0-incubating-src.tar.gz.sha512)] |
-| | | Client | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.6.0-incubating/apache-tubemq-client-0.6.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.6.0-incubating/apache-tubemq-client-0.6.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.6.0-incubating/apache-tubemq-client-0.6.0-incubating-bin.tar.gz.sha512)] |
-| | | Server | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.6.0-incubating/apache-tubemq-server-0.6.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.6.0-incubating/apache-tubemq-server-0.6.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.6.0-incubating/apache-tubemq-server-0.6.0-incubating-bin.tar.gz.sha512)] |
+| 2020-10-21 | 0.6.0 | 源码 | [[SRC](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-0.6.0-incubating-src.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-0.6.0-incubating-src.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-0.6.0-incubating-src.tar.gz.sha512)] |
+| | | 客户端 | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-client-0.6.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-client-0.6.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-client-0.6.0-incubating-bin.tar.gz.sha512)] |
+| | | 服务端 | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-server-0.6.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-server-0.6.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.6.0-incubating/apache-tubemq-server-0.6.0-incubating-bin.tar.gz.sha512)] |
## 发版说明
### 新特性
-- [[TUBEMQ-319](https://issues.apache.org/jira/browse/TUBEMQ-319)] In the pull mode, consumers support the suspension of consumption for a certain partition
-- [[TUBEMQ-3](https://issues.apache.org/jira/browse/TUBEMQ-3)] C++ SDK support in TubeMQ
+- [[INLONG-319](https://issues.apache.org/jira/browse/INLONG-319)] In the pull mode, consumers support the suspension of consumption for a certain partition
+- [[INLONG-3](https://issues.apache.org/jira/browse/INLONG-3)] C++ SDK support in TubeMQ
### 改进
-- [[TUBEMQ-311](https://issues.apache.org/jira/browse/TUBEMQ-311)] Feedback more production information
-- [[TUBEMQ-312](https://issues.apache.org/jira/browse/TUBEMQ-312)] Feedback more consumption information
-- [[TUBEMQ-325](https://issues.apache.org/jira/browse/TUBEMQ-325)] Add 406 ~ 408 error code to pullSelect call
-- [[TUBEMQ-345](https://issues.apache.org/jira/browse/TUBEMQ-345)] Optimize the call logic of getMessage() in Pull mode
-- [[TUBEMQ-352](https://issues.apache.org/jira/browse/TUBEMQ-352)] Set the parameters of the example at startup
-- [[TUBEMQ-353](https://issues.apache.org/jira/browse/TUBEMQ-353)] Update LICENSE about C/C++ SDK's code reference
-- [[TUBEMQ-356](https://issues.apache.org/jira/browse/TUBEMQ-356)] C++ SDK Codec decode add requestid
-- [[TUBEMQ-327](https://issues.apache.org/jira/browse/TUBEMQ-327)] Fix the concurrency problem in the example
+- [[INLONG-311](https://issues.apache.org/jira/browse/INLONG-311)] Feedback more production information
+- [[INLONG-312](https://issues.apache.org/jira/browse/INLONG-312)] Feedback more consumption information
+- [[INLONG-325](https://issues.apache.org/jira/browse/INLONG-325)] Add 406 ~ 408 error code to pullSelect call
+- [[INLONG-345](https://issues.apache.org/jira/browse/INLONG-345)] Optimize the call logic of getMessage() in Pull mode
+- [[INLONG-352](https://issues.apache.org/jira/browse/INLONG-352)] Set the parameters of the example at startup
+- [[INLONG-353](https://issues.apache.org/jira/browse/INLONG-353)] Update LICENSE about C/C++ SDK's code reference
+- [[INLONG-356](https://issues.apache.org/jira/browse/INLONG-356)] C++ SDK Codec decode add requestid
+- [[INLONG-327](https://issues.apache.org/jira/browse/INLONG-327)] Fix the concurrency problem in the example
### BUG修复
-- [[TUBEMQ-316](https://issues.apache.org/jira/browse/TUBEMQ-316)] Where the port the port is aleady used, the process throw the exception, but not exit
-- [[TUBEMQ-317](https://issues.apache.org/jira/browse/TUBEMQ-317)] The Store Manager throws java.lang.NullPointerException
-- [[TUBEMQ-320](https://issues.apache.org/jira/browse/TUBEMQ-320)] Request for static web contents would get responses with no content
-- [[TUBEMQ-354](https://issues.apache.org/jira/browse/TUBEMQ-354)] Found a dns translate bug in C/C++ sdk
-- [[TUBEMQ-306](https://issues.apache.org/jira/browse/TUBEMQ-306)] Raise Nullpointer Exception when create tubemq instance
-- [[TUBEMQ-359](https://issues.apache.org/jira/browse/TUBEMQ-359)] TubeMQ consume speed dropped to 0 in some partitions, it is a very serious bug Blocker
+- [[INLONG-316](https://issues.apache.org/jira/browse/INLONG-316)] Where the port the port is aleady used, the process throw the exception, but not exit
+- [[INLONG-317](https://issues.apache.org/jira/browse/INLONG-317)] The Store Manager throws java.lang.NullPointerException
+- [[INLONG-320](https://issues.apache.org/jira/browse/INLONG-320)] Request for static web contents would get responses with no content
+- [[INLONG-354](https://issues.apache.org/jira/browse/INLONG-354)] Found a dns translate bug in C/C++ sdk
+- [[INLONG-306](https://issues.apache.org/jira/browse/INLONG-306)] Raise Nullpointer Exception when create tubemq instance
+- [[INLONG-359](https://issues.apache.org/jira/browse/INLONG-359)] TubeMQ consume speed dropped to 0 in some partitions, it is a very serious bug Blocker
diff --git a/docs/zh-cn/download/release-0.7.0.md b/docs/zh-cn/download/release-0.7.0.md
index f556381..af23a9f 100644
--- a/docs/zh-cn/download/release-0.7.0.md
+++ b/docs/zh-cn/download/release-0.7.0.md
@@ -1,51 +1,52 @@
---
-title: 下载 - Apache TubeMQ
+title: 下载 - Apache InLong
---
-# 下载TubeMQ
- 使用以下镜像下载TubeMQ
+# 下载InLong
+ 使用以下镜像下载InLong
-## TubeMQ
+## InLong
| 日期 | 版本| 备注 | 下载 |
|:---:|:--:|:--:|:--:|
-| 2020-12-04 | 0.7.0 | Source | [[SRC](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.7.0-incubating/apache-tubemq-0.7.0-incubating-src.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.7.0-incubating/apache-tubemq-0.7.0-incubating-src.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.7.0-incubating/apache-tubemq-0.7.0-incubating-src.tar.gz.sha512)] |
-| | | Client | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.7.0-incubating/apache-tubemq-client-0.7.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.7.0-incubating/apache-tubemq-client-0.7.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.7.0-incubating/apache-tubemq-client-0.7.0-incubating-bin.tar.gz.sha512)] |
-| | | Server | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.7.0-incubating/apache-tubemq-server-0.7.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.7.0-incubating/apache-tubemq-server-0.7.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.7.0-incubating/apache-tubemq-server-0.7.0-incubating-bin.tar.gz.sha512)] |
+| 2020-12-04 | 0.7.0 | 源码 | [[SRC](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-0.7.0-incubating-src.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-0.7.0-incubating-src.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-0.7.0-incubating-src.tar.gz.sha512)] |
+| | | 客户端 | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-client-0.7.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-client-0.7.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-client-0.7.0-incubating-bin.tar.gz.sha512)] |
+| | | 服务端 | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-server-0.7.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-server-0.7.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.7.0-incubating/apache-tubemq-server-0.7.0-incubating-bin.tar.gz.sha512)] |
+
## 发版说明
### 新特性
| JIRA | Summary | Priority |
| :---- | :------- | :------- |
-| [TUBEMQ-162](https://issues.apache.org/jira/browse/TUBEMQ-162) | Python SDK support in TubeMQ | High |
-| [TUBEMQ-336](https://issues.apache.org/jira/browse/TUBEMQ-336) | Propose web portal to manage tube cluster Phase-I | Major |
-| [TUBEMQ-390](https://issues.apache.org/jira/browse/TUBEMQ-390) | support build C++ SDK with docker image | Normal |
+| [INLONG-162](https://issues.apache.org/jira/browse/INLONG-162) | Python SDK support in TubeMQ | High |
+| [INLONG-336](https://issues.apache.org/jira/browse/INLONG-336) | Propose web portal to manage tube cluster Phase-I | Major |
+| [INLONG-390](https://issues.apache.org/jira/browse/INLONG-390) | support build C++ SDK with docker image | Normal |
### 改进
| JIRA | Summary | Priority |
| :---- | :------- | :------- |
-| [TUBEMQ-369](https://issues.apache.org/jira/browse/TUBEMQ-369) | hope to add an option in the compilation script (like `make lib` etc...) | Major |
-| [TUBEMQ-373](https://issues.apache.org/jira/browse/TUBEMQ-373) | Reduce the redundant code of Utils::Split functions | Major |
-| [TUBEMQ-374](https://issues.apache.org/jira/browse/TUBEMQ-374) | Adjust some coding style issues | Major |
-| [TUBEMQ-375](https://issues.apache.org/jira/browse/TUBEMQ-375) | Add a section to the README file about how to compile the project| Major |
-| [TUBEMQ-385](https://issues.apache.org/jira/browse/TUBEMQ-385) | update docker images | Major |
-| [TUBEMQ-393](https://issues.apache.org/jira/browse/TUBEMQ-393) | Optimize the mapping code of WEB API | Major |
-| [TUBEMQ-406](https://issues.apache.org/jira/browse/TUBEMQ-406) | test_consumer.py works for both Python 2 and 3 | Minor |
-| [TUBEMQ-410](https://issues.apache.org/jira/browse/TUBEMQ-410) | install python package and simplify test_consumer.py | Major |
-| [TUBEMQ-416](https://issues.apache.org/jira/browse/TUBEMQ-416) | support consume from specified position | Major |
-| [TUBEMQ-417](https://issues.apache.org/jira/browse/TUBEMQ-417) | C++ Client support parse message from binary data for Python SDK | Major |
-| [TUBEMQ-419](https://issues.apache.org/jira/browse/TUBEMQ-419) | SetMaxPartCheckPeriodMs() negative number, getMessage() still | Major |
+| [INLONG-369](https://issues.apache.org/jira/browse/INLONG-369) | hope to add an option in the compilation script (like `make lib` etc...) | Major |
+| [INLONG-373](https://issues.apache.org/jira/browse/INLONG-373) | Reduce the redundant code of Utils::Split functions | Major |
+| [INLONG-374](https://issues.apache.org/jira/browse/INLONG-374) | Adjust some coding style issues | Major |
+| [INLONG-375](https://issues.apache.org/jira/browse/INLONG-375) | Add a section to the README file about how to compile the project| Major |
+| [INLONG-385](https://issues.apache.org/jira/browse/INLONG-385) | update docker images | Major |
+| [INLONG-393](https://issues.apache.org/jira/browse/INLONG-393) | Optimize the mapping code of WEB API | Major |
+| [INLONG-406](https://issues.apache.org/jira/browse/INLONG-406) | test_consumer.py works for both Python 2 and 3 | Minor |
+| [INLONG-410](https://issues.apache.org/jira/browse/INLONG-410) | install python package and simplify test_consumer.py | Major |
+| [INLONG-416](https://issues.apache.org/jira/browse/INLONG-416) | support consume from specified position | Major |
+| [INLONG-417](https://issues.apache.org/jira/browse/INLONG-417) | C++ Client support parse message from binary data for Python SDK | Major |
+| [INLONG-419](https://issues.apache.org/jira/browse/INLONG-419) | SetMaxPartCheckPeriodMs() negative number, getMessage() still | Major |
### BUG修复
| JIRA | Summary | Priority |
| :----------------------------------------------------------- | :----------------------------------------------------------- | :------- |
-| [TUBEMQ-365](https://issues.apache.org/jira/browse/TUBEMQ-365) | Whether the consumption setting is wrong after the processRequest exception | Major |
-| [TUBEMQ-370](https://issues.apache.org/jira/browse/TUBEMQ-370) | Calling GetCurConsumedInfo API always returns failure | Major |
-| [TUBEMQ-376](https://issues.apache.org/jira/browse/TUBEMQ-376) | Move pullrequests_status notifications commits mail list | Major |
-| [TUBEMQ-366](https://issues.apache.org/jira/browse/TUBEMQ-366) | Found a nullpointerexception bug in broker | Normal |
-| [TUBEMQ-379](https://issues.apache.org/jira/browse/TUBEMQ-379) | Modify the memory cache size default to 3M | Normal |
-| [TUBEMQ-380](https://issues.apache.org/jira/browse/TUBEMQ-380) | Cpp client link error when gcc optimization is disabled | Major |
-| [TUBEMQ-405](https://issues.apache.org/jira/browse/TUBEMQ-405) | python sdk install files lack of the whole cpp configuration | Major |
-| [TUBEMQ-401](https://issues.apache.org/jira/browse/TUBEMQ-401) | python sdk readme bug | Minor |
-| [TUBEMQ-407](https://issues.apache.org/jira/browse/TUBEMQ-407) | Fix some content in README.md | Trivial |
-| [TUBEMQ-418](https://issues.apache.org/jira/browse/TUBEMQ-418) | C++ SDK function SetMaxPartCheckPeriodMs() can't work | Major |
+| [INLONG-365](https://issues.apache.org/jira/browse/INLONG-365) | Whether the consumption setting is wrong after the processRequest exception | Major |
+| [INLONG-370](https://issues.apache.org/jira/browse/INLONG-370) | Calling GetCurConsumedInfo API always returns failure | Major |
+| [INLONG-376](https://issues.apache.org/jira/browse/INLONG-376) | Move pullrequests_status notifications commits mail list | Major |
+| [INLONG-366](https://issues.apache.org/jira/browse/INLONG-366) | Found a nullpointerexception bug in broker | Normal |
+| [INLONG-379](https://issues.apache.org/jira/browse/INLONG-379) | Modify the memory cache size default to 3M | Normal |
+| [INLONG-380](https://issues.apache.org/jira/browse/INLONG-380) | Cpp client link error when gcc optimization is disabled | Major |
+| [INLONG-405](https://issues.apache.org/jira/browse/INLONG-405) | python sdk install files lack of the whole cpp configuration | Major |
+| [INLONG-401](https://issues.apache.org/jira/browse/INLONG-401) | python sdk readme bug | Minor |
+| [INLONG-407](https://issues.apache.org/jira/browse/INLONG-407) | Fix some content in README.md | Trivial |
+| [INLONG-418](https://issues.apache.org/jira/browse/INLONG-418) | C++ SDK function SetMaxPartCheckPeriodMs() can't work | Major |
diff --git a/docs/zh-cn/download/release-0.8.0.md b/docs/zh-cn/download/release-0.8.0.md
index 1741972..5c2eb78 100644
--- a/docs/zh-cn/download/release-0.8.0.md
+++ b/docs/zh-cn/download/release-0.8.0.md
@@ -1,100 +1,100 @@
---
-title: 下载 - Apache TubeMQ
+title: 下载 - Apache InLong
---
-# 下载TubeMQ
- 使用以下镜像下载TubeMQ
+# 下载InLong
+ 使用以下镜像下载InLong
-## TubeMQ
+## InLong
| 日期 | 版本| 备注 | 下载 |
|:---:|:--:|:--:|:--:|
-| 2021-03-04 | 0.8.0 | Source | [[SRC](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.8.0-incubating/apache-tubemq-0.8.0-incubating-src.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.8.0-incubating/apache-tubemq-0.8.0-incubating-src.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.8.0-incubating/apache-tubemq-0.8.0-incubating-src.tar.gz.sha512)] |
-| | | Client | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.8.0-incubating/apache-tubemq-client-0.8.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.8.0-incubating/apache-tubemq-client-0.8.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.8.0-incubating/apache-tubemq-client-0.8.0-incubating-bin.tar.gz.sha512)] |
-| | | Server | [[TAR](http://www.apache.org/dyn/closer.lua/incubator/tubemq/0.8.0-incubating/apache-tubemq-server-0.8.0-incubating-bin.tar.gz)] [[PGP](https://downloads.apache.org/incubator/tubemq/0.8.0-incubating/apache-tubemq-server-0.8.0-incubating-bin.tar.gz.asc)] [[SHA512](https://downloads.apache.org/incubator/tubemq/0.8.0-incubating/apache-tubemq-server-0.8.0-incubating-bin.tar.gz.sha512)] |
+| 2021-03-04 | 0.8.0 | Source | [[SRC](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-0.8.0-incubating-src.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-0.8.0-incubating-src.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-0.8.0-incubating-src.tar.gz.sha512)] |
+| | | Client | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-client-0.8.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-client-0.8.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-client-0.8.0-incubating-bin.tar.gz.sha512)] |
+| | | Server | [[TAR](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-server-0.8.0-incubating-bin.tar.gz)] [[PGP](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-server-0.8.0-incubating-bin.tar.gz.asc)] [[SHA512](https://archive.apache.org/dist/incubator/tubemq/0.8.0-incubating/apache-tubemq-server-0.8.0-incubating-bin.tar.gz.sha512)] |
## 发版说明
### 改进:
| JIRA | Summary | Priority |
| :---- | :------- | :------- |
-| [TUBEMQ-430](https://issues.apache.org/jira/browse/TUBEMQ-430) | Optimizing the implementation of HTTP API for broke | Major |
-| [TUBEMQ-445](https://issues.apache.org/jira/browse/TUBEMQ-445) | Adjust the status check default sleep interval of pullConsumeReadyChkSliceMs | Major |
-| [TUBEMQ-448](https://issues.apache.org/jira/browse/TUBEMQ-448) | Add Committer and PPMC operation process | Major |
-| [TUBEMQ-449](https://issues.apache.org/jira/browse/TUBEMQ-449) | Adjust Example implementation | Major |
-| [TUBEMQ-452](https://issues.apache.org/jira/browse/TUBEMQ-452) | Optimize rebalance performance | Major |
-| [TUBEMQ-467](https://issues.apache.org/jira/browse/TUBEMQ-467) | Add WEB APIs of Master and Broker | Major |
-| [TUBEMQ-489](https://issues.apache.org/jira/browse/TUBEMQ-489) | Add the maximum message length parameter setting | Major |
-| [TUBEMQ-495](https://issues.apache.org/jira/browse/TUBEMQ-495) | Code implementation adjustment based on SpotBugs check | Major |
-| [TUBEMQ-511](https://issues.apache.org/jira/browse/TUBEMQ-511) | Replace the conditional operator (?:) with mid() | Major |
-| [TUBEMQ-512](https://issues.apache.org/jira/browse/TUBEMQ-512) | Add package length control based on Topic | Major |
-| [TUBEMQ-515](https://issues.apache.org/jira/browse/TUBEMQ-515) | Add cluster Topic view web api | Major |
+| [INLONG-430](https://issues.apache.org/jira/browse/INLONG-430) | Optimizing the implementation of HTTP API for broke | Major |
+| [INLONG-445](https://issues.apache.org/jira/browse/INLONG-445) | Adjust the status check default sleep interval of pullConsumeReadyChkSliceMs | Major |
+| [INLONG-448](https://issues.apache.org/jira/browse/INLONG-448) | Add Committer and PPMC operation process | Major |
+| [INLONG-449](https://issues.apache.org/jira/browse/INLONG-449) | Adjust Example implementation | Major |
+| [INLONG-452](https://issues.apache.org/jira/browse/INLONG-452) | Optimize rebalance performance | Major |
+| [INLONG-467](https://issues.apache.org/jira/browse/INLONG-467) | Add WEB APIs of Master and Broker | Major |
+| [INLONG-489](https://issues.apache.org/jira/browse/INLONG-489) | Add the maximum message length parameter setting | Major |
+| [INLONG-495](https://issues.apache.org/jira/browse/INLONG-495) | Code implementation adjustment based on SpotBugs check | Major |
+| [INLONG-511](https://issues.apache.org/jira/browse/INLONG-511) | Replace the conditional operator (?:) with mid() | Major |
+| [INLONG-512](https://issues.apache.org/jira/browse/INLONG-512) | Add package length control based on Topic | Major |
+| [INLONG-515](https://issues.apache.org/jira/browse/INLONG-515) | Add cluster Topic view web api | Major |
### BUG修复:
| JIRA | Summary | Priority |
| :---- | :------- | :------- |
-| [TUBEMQ-437](https://issues.apache.org/jira/browse/TUBEMQ-437) | Fix tubemq table source sink factory instance creating problem | Major |
-| [TUBEMQ-441](https://issues.apache.org/jira/browse/TUBEMQ-441) | An error occurred when using the Tubemq class to create a sink table | Major |
-| [TUBEMQ-442](https://issues.apache.org/jira/browse/TUBEMQ-442) | Modifying the jvm parameters when the broker starts does not take effect | Major |
-| [TUBEMQ-443](https://issues.apache.org/jira/browse/TUBEMQ-443) | TubemqSourceFunction class prints too many logs problem | Major |
-| [TUBEMQ-446](https://issues.apache.org/jira/browse/TUBEMQ-446) | Small bugs fix that do not affect the main logics | Major |
-| [TUBEMQ-450](https://issues.apache.org/jira/browse/TUBEMQ-450) | TubeClientException: Generate producer id failed | Major |
-| [TUBEMQ-453](https://issues.apache.org/jira/browse/TUBEMQ-453) | TubemqSourceFunction class prints too many logs problem | Major |
-| [TUBEMQ-506](https://issues.apache.org/jira/browse/TUBEMQ-506) | cmakelist error | Major |
-| [TUBEMQ-510](https://issues.apache.org/jira/browse/TUBEMQ-510) | Found a bug in MessageProducerExample class | Major |
-| [TUBEMQ-518](https://issues.apache.org/jira/browse/TUBEMQ-518) | fix parameter pass error | Major |
-| [TUBEMQ-526](https://issues.apache.org/jira/browse/TUBEMQ-526) | Adjust the packaging script and version check list, remove the "-WIP" tag | Major |
-| [TUBEMQ-555](https://issues.apache.org/jira/browse/TUBEMQ-555) | short session data can only be written to a specific partition | Major |
-| [TUBEMQ-556](https://issues.apache.org/jira/browse/TUBEMQ-556) | Index value is bigger than the actual number of records | Low |
+| [INLONG-437](https://issues.apache.org/jira/browse/INLONG-437) | Fix tubemq table source sink factory instance creating problem | Major |
+| [INLONG-441](https://issues.apache.org/jira/browse/INLONG-441) | An error occurred when using the Tubemq class to create a sink table | Major |
+| [INLONG-442](https://issues.apache.org/jira/browse/INLONG-442) | Modifying the jvm parameters when the broker starts does not take effect | Major |
+| [INLONG-443](https://issues.apache.org/jira/browse/INLONG-443) | TubemqSourceFunction class prints too many logs problem | Major |
+| [INLONG-446](https://issues.apache.org/jira/browse/INLONG-446) | Small bugs fix that do not affect the main logics | Major |
+| [INLONG-450](https://issues.apache.org/jira/browse/INLONG-450) | TubeClientException: Generate producer id failed | Major |
+| [INLONG-453](https://issues.apache.org/jira/browse/INLONG-453) | TubemqSourceFunction class prints too many logs problem | Major |
+| [INLONG-506](https://issues.apache.org/jira/browse/INLONG-506) | cmakelist error | Major |
+| [INLONG-510](https://issues.apache.org/jira/browse/INLONG-510) | Found a bug in MessageProducerExample class | Major |
+| [INLONG-518](https://issues.apache.org/jira/browse/INLONG-518) | fix parameter pass error | Major |
+| [INLONG-526](https://issues.apache.org/jira/browse/INLONG-526) | Adjust the packaging script and version check list, remove the "-WIP" tag | Major |
+| [INLONG-555](https://issues.apache.org/jira/browse/INLONG-555) | short session data can only be written to a specific partition | Major |
+| [INLONG-556](https://issues.apache.org/jira/browse/INLONG-556) | Index value is bigger than the actual number of records | Low |
### 任务:
| JIRA | Summary | Priority |
|:---- |:---- | :--- |
-| [TUBEMQ-505](https://issues.apache.org/jira/browse/TUBEMQ-505) | Remove the "WIP" label of the DISCLAIMER file | Major |
-| [TUBEMQ-543](https://issues.apache.org/jira/browse/TUBEMQ-543) | Modify the LICENSE statement of multiple files and others | Major |
-| [TUBEMQ-557](https://issues.apache.org/jira/browse/TUBEMQ-557) | Handle the issues mentioned in the 0.8.0-RC2 review | Major |
-| [TUBEMQ-562](https://issues.apache.org/jira/browse/TUBEMQ-562) | Update project contents according to the 0.8.0-RC3 review | Major |
+| [INLONG-505](https://issues.apache.org/jira/browse/INLONG-505) | Remove the "WIP" label of the DISCLAIMER file | Major |
+| [INLONG-543](https://issues.apache.org/jira/browse/INLONG-543) | Modify the LICENSE statement of multiple files and others | Major |
+| [INLONG-557](https://issues.apache.org/jira/browse/INLONG-557) | Handle the issues mentioned in the 0.8.0-RC2 review | Major |
+| [INLONG-562](https://issues.apache.org/jira/browse/INLONG-562) | Update project contents according to the 0.8.0-RC3 review | Major |
### 子任务:
| JIRA | Summary | Priority |
| :---- | :------- | :------- |
-| [TUBEMQ-428](https://issues.apache.org/jira/browse/TUBEMQ-433) | Bumped version to 0.8.0-SNAPSHOT | Major |
-| [TUBEMQ-433](https://issues.apache.org/jira/browse/TUBEMQ-433) | add tubemq perf-consumer/producer scripts | Major |
-| [TUBEMQ-434](https://issues.apache.org/jira/browse/TUBEMQ-434) | Adjust Broker API mapping | Major |
-| [TUBEMQ-435](https://issues.apache.org/jira/browse/TUBEMQ-435) | Create Web field Mapping | Major |
-| [TUBEMQ-436](https://issues.apache.org/jira/browse/TUBEMQ-436) | Adjust Broker's HTTP API implementation | Major |
-| [TUBEMQ-439](https://issues.apache.org/jira/browse/TUBEMQ-439) | Add Cli field Scheme definition | Major |
-| [TUBEMQ-440](https://issues.apache.org/jira/browse/TUBEMQ-440) | Add feature package tube-manager to zip | Major |
-| [TUBEMQ-444](https://issues.apache.org/jira/browse/TUBEMQ-444) | Add consume and produce Cli commands | Major |
-| [TUBEMQ-447](https://issues.apache.org/jira/browse/TUBEMQ-447) | Add Broker-Admin Cli | Major |
-| [TUBEMQ-451](https://issues.apache.org/jira/browse/TUBEMQ-451) | Replace ConsumeTupleInfo with Tuple2 | Major |
-| [TUBEMQ-457](https://issues.apache.org/jira/browse/TUBEMQ-457) | There is no need to return StringBuilder in Master.java | Major |
-| [TUBEMQ-463](https://issues.apache.org/jira/browse/TUBEMQ-463) | Adjust Master rebalance process implementation | Major |
-| [TUBEMQ-464](https://issues.apache.org/jira/browse/TUBEMQ-464) | Add parameter rebalanceParallel in master.ini | Major |
-| [TUBEMQ-470](https://issues.apache.org/jira/browse/TUBEMQ-470) | Add query API of TopicName and BrokerId collection | Major |
-| [TUBEMQ-471](https://issues.apache.org/jira/browse/TUBEMQ-471) | Add query API Introduction of TopicName and BrokerId collection | Major |
-| [TUBEMQ-472](https://issues.apache.org/jira/browse/TUBEMQ-472) | Adjust Broker's AbstractWebHandler class implementation | Major |
-| [TUBEMQ-475](https://issues.apache.org/jira/browse/TUBEMQ-475) | add the offset clone api of the consume group | Major |
-| [TUBEMQ-482](https://issues.apache.org/jira/browse/TUBEMQ-482) | Add offset query api | Major |
-| [TUBEMQ-484](https://issues.apache.org/jira/browse/TUBEMQ-484) | Add query API for topic publication information | Major |
-| [TUBEMQ-485](https://issues.apache.org/jira/browse/TUBEMQ-485) | Add the batch setting API of consume group offset | Major |
-| [TUBEMQ-486](https://issues.apache.org/jira/browse/TUBEMQ-486) | Add the delete API of consumer group offset | Major |
-| [TUBEMQ-494](https://issues.apache.org/jira/browse/TUBEMQ-494) | Update API interface instruction document | Major |
-| [TUBEMQ-499](https://issues.apache.org/jira/browse/TUBEMQ-499) | Add configure store | Major |
-| [TUBEMQ-500](https://issues.apache.org/jira/browse/TUBEMQ-500) | Add setting operate API | Major |
-| [TUBEMQ-501](https://issues.apache.org/jira/browse/TUBEMQ-501) | Adjust max message size check logic | Major |
-| [TUBEMQ-502](https://issues.apache.org/jira/browse/TUBEMQ-502) | Add setting API interface document | Major |
-| [TUBEMQ-504](https://issues.apache.org/jira/browse/TUBEMQ-504) | Adjust the WebMethodMapper class interfaces | Major |
-| [TUBEMQ-508](https://issues.apache.org/jira/browse/TUBEMQ-508) | Optimize Broker's PB parameter check processing logic | Major |
-| [TUBEMQ-509](https://issues.apache.org/jira/browse/TUBEMQ-509) | Adjust the packet length check when data is loaded | Major |
-| [TUBEMQ-522](https://issues.apache.org/jira/browse/TUBEMQ-522) | Add admin_query_cluster_topic_view API document | Major |
-| [TUBEMQ-544](https://issues.apache.org/jira/browse/TUBEMQ-544) | Adjust the LICENSE statement in the client.conf files of Python and C/C++ SDK | Major |
-| [TUBEMQ-546](https://issues.apache.org/jira/browse/TUBEMQ-546) | Restore the original license header of the referenced external source files | Major |
-| [TUBEMQ-547](https://issues.apache.org/jira/browse/TUBEMQ-547) | Recode the implementation of the *Startup.java classes in the Tool package | Major |
-| [TUBEMQ-548](https://issues.apache.org/jira/browse/TUBEMQ-548) | Handle the LICENSE authorization of font files in the resources | Major |
-| [TUBEMQ-549](https://issues.apache.org/jira/browse/TUBEMQ-549) | Handling the problem of compilation failure | Major |
-| [TUBEMQ-550](https://issues.apache.org/jira/browse/TUBEMQ-550) | Adjust LICENSE file content | Major |
-| [TUBEMQ-551](https://issues.apache.org/jira/browse/TUBEMQ-551) | Adjust NOTICE file content | Major |
-| [TUBEMQ-558](https://issues.apache.org/jira/browse/TUBEMQ-558) | Adjust the LICENSE of the file header | Major |
-| [TUBEMQ-559](https://issues.apache.org/jira/browse/TUBEMQ-559) | Update the LICENSE file according to the 0.8.0-RC2 review | Major |
-| [TUBEMQ-560](https://issues.apache.org/jira/browse/TUBEMQ-560) | Remove unprepared modules | Major |
+| [INLONG-428](https://issues.apache.org/jira/browse/INLONG-433) | Bumped version to 0.8.0-SNAPSHOT | Major |
+| [INLONG-433](https://issues.apache.org/jira/browse/INLONG-433) | add tubemq perf-consumer/producer scripts | Major |
+| [INLONG-434](https://issues.apache.org/jira/browse/INLONG-434) | Adjust Broker API mapping | Major |
+| [INLONG-435](https://issues.apache.org/jira/browse/INLONG-435) | Create Web field Mapping | Major |
+| [INLONG-436](https://issues.apache.org/jira/browse/INLONG-436) | Adjust Broker's HTTP API implementation | Major |
+| [INLONG-439](https://issues.apache.org/jira/browse/INLONG-439) | Add Cli field Scheme definition | Major |
+| [INLONG-440](https://issues.apache.org/jira/browse/INLONG-440) | Add feature package tube-manager to zip | Major |
+| [INLONG-444](https://issues.apache.org/jira/browse/INLONG-444) | Add consume and produce Cli commands | Major |
+| [INLONG-447](https://issues.apache.org/jira/browse/INLONG-447) | Add Broker-Admin Cli | Major |
+| [INLONG-451](https://issues.apache.org/jira/browse/INLONG-451) | Replace ConsumeTupleInfo with Tuple2 | Major |
+| [INLONG-457](https://issues.apache.org/jira/browse/INLONG-457) | There is no need to return StringBuilder in Master.java | Major |
+| [INLONG-463](https://issues.apache.org/jira/browse/INLONG-463) | Adjust Master rebalance process implementation | Major |
+| [INLONG-464](https://issues.apache.org/jira/browse/INLONG-464) | Add parameter rebalanceParallel in master.ini | Major |
+| [INLONG-470](https://issues.apache.org/jira/browse/INLONG-470) | Add query API of TopicName and BrokerId collection | Major |
+| [INLONG-471](https://issues.apache.org/jira/browse/INLONG-471) | Add query API Introduction of TopicName and BrokerId collection | Major |
+| [INLONG-472](https://issues.apache.org/jira/browse/INLONG-472) | Adjust Broker's AbstractWebHandler class implementation | Major |
+| [INLONG-475](https://issues.apache.org/jira/browse/INLONG-475) | add the offset clone api of the consume group | Major |
+| [INLONG-482](https://issues.apache.org/jira/browse/INLONG-482) | Add offset query api | Major |
+| [INLONG-484](https://issues.apache.org/jira/browse/INLONG-484) | Add query API for topic publication information | Major |
+| [INLONG-485](https://issues.apache.org/jira/browse/INLONG-485) | Add the batch setting API of consume group offset | Major |
+| [INLONG-486](https://issues.apache.org/jira/browse/INLONG-486) | Add the delete API of consumer group offset | Major |
+| [INLONG-494](https://issues.apache.org/jira/browse/INLONG-494) | Update API interface instruction document | Major |
+| [INLONG-499](https://issues.apache.org/jira/browse/INLONG-499) | Add configure store | Major |
+| [INLONG-500](https://issues.apache.org/jira/browse/INLONG-500) | Add setting operate API | Major |
+| [INLONG-501](https://issues.apache.org/jira/browse/INLONG-501) | Adjust max message size check logic | Major |
+| [INLONG-502](https://issues.apache.org/jira/browse/INLONG-502) | Add setting API interface document | Major |
+| [INLONG-504](https://issues.apache.org/jira/browse/INLONG-504) | Adjust the WebMethodMapper class interfaces | Major |
+| [INLONG-508](https://issues.apache.org/jira/browse/INLONG-508) | Optimize Broker's PB parameter check processing logic | Major |
+| [INLONG-509](https://issues.apache.org/jira/browse/INLONG-509) | Adjust the packet length check when data is loaded | Major |
+| [INLONG-522](https://issues.apache.org/jira/browse/INLONG-522) | Add admin_query_cluster_topic_view API document | Major |
+| [INLONG-544](https://issues.apache.org/jira/browse/INLONG-544) | Adjust the LICENSE statement in the client.conf files of Python and C/C++ SDK | Major |
+| [INLONG-546](https://issues.apache.org/jira/browse/INLONG-546) | Restore the original license header of the referenced external source files | Major |
+| [INLONG-547](https://issues.apache.org/jira/browse/INLONG-547) | Recode the implementation of the *Startup.java classes in the Tool package | Major |
+| [INLONG-548](https://issues.apache.org/jira/browse/INLONG-548) | Handle the LICENSE authorization of font files in the resources | Major |
+| [INLONG-549](https://issues.apache.org/jira/browse/INLONG-549) | Handling the problem of compilation failure | Major |
+| [INLONG-550](https://issues.apache.org/jira/browse/INLONG-550) | Adjust LICENSE file content | Major |
+| [INLONG-551](https://issues.apache.org/jira/browse/INLONG-551) | Adjust NOTICE file content | Major |
+| [INLONG-558](https://issues.apache.org/jira/browse/INLONG-558) | Adjust the LICENSE of the file header | Major |
+| [INLONG-559](https://issues.apache.org/jira/browse/INLONG-559) | Update the LICENSE file according to the 0.8.0-RC2 review | Major |
+| [INLONG-560](https://issues.apache.org/jira/browse/INLONG-560) | Remove unprepared modules | Major |
diff --git a/docs/zh-cn/getting_started.md b/docs/zh-cn/getting_started.md
new file mode 100644
index 0000000..d4f512b
--- /dev/null
+++ b/docs/zh-cn/getting_started.md
@@ -0,0 +1,43 @@
+---
+title: 入门 - Apache InLong
+---
+
+本节包含快速入门指南，可帮助您开始使用 Apache InLong。
+
+# 整体架构
+<img src="https://github.com/apache/incubator-inlong-website/blob/master/img/inlong_architecture.png" align="center" alt="Apache InLong"/>
+[Apache InLong](https://inlong.apache.org)(incubating) 整体架构如上，该组件是一站式数据流媒体平台，提供自动化、安全、分布式、高效的数据发布和订阅能力，帮助您轻松构建基于流的数据应用程序。
+
+InLong(应龙)最初建于腾讯，服务线上业务8年多，支持大数据场景下的海量数据（每天40万亿条数据规模以上）报表服务。整个平台集成了数据采集、汇聚、缓存、分拣和管理模块等共5个模块，通过这个系统，业务只需要提供数据源、数据服务质量、数据落地集群和数据落地格式，即数据可以源源不断地将数据从源集群推送到目标集群，极大满足了业务大数据场景下的数据上报服务需求。
+
+
+# 如何使用
+通过上图的InLong整体架构图，我们可以看到InLong包含了完整的数据上报组件，我们需要逐个模块的编译部署
+
+## 编译部署Manager
+[如何编译部署Manager](modules/manager/quick_start.md)
+
+## 编译部署Manager的web
+[如何编译部署Manager Web](modules/console/quick_start.md)
+
+## 编译部署TubeMQ
+[如何编译部署TubeMQ](modules/tubemq/quick_start.md)
+
+## 编译部署TubeMQ Manager
+[如何编译部署TubeMQ Manager](modules/tubemq/tubemq-manager/quick_start.md)
+
+## 编译部署Sort
+[如何编译部署Sort](modules/sort/quick_start.md)
+
+## 编译部署DataProxy
+[如何编译部署DataProxy](modules/dataproxy/quick_start.md)
+
+## 编译部署Agent
+[如何编译部署Agent](modules/agent/quick_start.md)
+
+## 业务配置
+[如何配置新业务](modules/manager/userManual.md)
+
+## 数据上报验证
+到这里，您就可以通过文件Agent采集数据并在指定的Hive表中验证接收到的数据是否与发送的数据一致。
+
diff --git a/docs/zh-cn/img/client_rpc/rpc_event_proto_status.png b/docs/zh-cn/img/client_rpc/rpc_event_proto_status.png
deleted file mode 100644
index 4f308d9..0000000
Binary files a/docs/zh-cn/img/client_rpc/rpc_event_proto_status.png and /dev/null differ
diff --git a/docs/zh-cn/img/client_rpc/rpc_header_fill.png b/docs/zh-cn/img/client_rpc/rpc_header_fill.png
deleted file mode 100644
index b193448..0000000
Binary files a/docs/zh-cn/img/client_rpc/rpc_header_fill.png and /dev/null differ
diff --git a/docs/zh-cn/img/configure/conf_ini_pos.png b/docs/zh-cn/img/configure/conf_ini_pos.png
deleted file mode 100644
index bf7e0d2..0000000
Binary files a/docs/zh-cn/img/configure/conf_ini_pos.png and /dev/null differ
diff --git a/docs/zh-cn/img/configure/conf_velocity_pos.png b/docs/zh-cn/img/configure/conf_velocity_pos.png
deleted file mode 100644
index e2ba302..0000000
Binary files a/docs/zh-cn/img/configure/conf_velocity_pos.png and /dev/null differ
diff --git a/docs/zh-cn/img/store_file.png b/docs/zh-cn/img/store_file.png
deleted file mode 100644
index 82f11c8..0000000
Binary files a/docs/zh-cn/img/store_file.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_address_host.png b/docs/zh-cn/img/sysdeployment/sys_address_host.png
deleted file mode 100644
index 6bd1812..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_address_host.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_broker_configure.png b/docs/zh-cn/img/sysdeployment/sys_broker_configure.png
deleted file mode 100644
index a1db395..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_broker_configure.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_broker_deploy.png b/docs/zh-cn/img/sysdeployment/sys_broker_deploy.png
deleted file mode 100644
index 7b537a3..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_broker_deploy.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_broker_finished.png b/docs/zh-cn/img/sysdeployment/sys_broker_finished.png
deleted file mode 100644
index 0a67121..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_broker_finished.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_broker_online.png b/docs/zh-cn/img/sysdeployment/sys_broker_online.png
deleted file mode 100644
index b79ab95..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_broker_online.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_broker_online_2.png b/docs/zh-cn/img/sysdeployment/sys_broker_online_2.png
deleted file mode 100644
index 2043528..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_broker_online_2.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_broker_restart_1.png b/docs/zh-cn/img/sysdeployment/sys_broker_restart_1.png
deleted file mode 100644
index 1fad8c2..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_broker_restart_1.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_broker_restart_2.png b/docs/zh-cn/img/sysdeployment/sys_broker_restart_2.png
deleted file mode 100644
index 7c7d8f2..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_broker_restart_2.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_broker_start.png b/docs/zh-cn/img/sysdeployment/sys_broker_start.png
deleted file mode 100644
index 6f2b8b3..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_broker_start.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_broker_start_error.png b/docs/zh-cn/img/sysdeployment/sys_broker_start_error.png
deleted file mode 100644
index ab9ad51..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_broker_start_error.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_compile.png b/docs/zh-cn/img/sysdeployment/sys_compile.png
deleted file mode 100644
index b8baf81..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_compile.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_configure_1.png b/docs/zh-cn/img/sysdeployment/sys_configure_1.png
deleted file mode 100644
index 2100cdf..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_configure_1.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_configure_2.png b/docs/zh-cn/img/sysdeployment/sys_configure_2.png
deleted file mode 100644
index c24454c..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_configure_2.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_master_console.png b/docs/zh-cn/img/sysdeployment/sys_master_console.png
deleted file mode 100644
index 1b39645..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_master_console.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_master_start.png b/docs/zh-cn/img/sysdeployment/sys_master_start.png
deleted file mode 100644
index 307f44b..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_master_start.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_master_startted.png b/docs/zh-cn/img/sysdeployment/sys_master_startted.png
deleted file mode 100644
index 1ebe924..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_master_startted.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_node_log.png b/docs/zh-cn/img/sysdeployment/sys_node_log.png
deleted file mode 100644
index d81e522..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_node_log.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_node_status.png b/docs/zh-cn/img/sysdeployment/sys_node_status.png
deleted file mode 100644
index 8c731b1..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_node_status.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_node_status_2.png b/docs/zh-cn/img/sysdeployment/sys_node_status_2.png
deleted file mode 100644
index 07a0fb9..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_node_status_2.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_package.png b/docs/zh-cn/img/sysdeployment/sys_package.png
deleted file mode 100644
index 7135b8a..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_package.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_package_list.png b/docs/zh-cn/img/sysdeployment/sys_package_list.png
deleted file mode 100644
index 6c72d64..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_package_list.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_topic_create.png b/docs/zh-cn/img/sysdeployment/sys_topic_create.png
deleted file mode 100644
index c96b618..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_topic_create.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_topic_deploy.png b/docs/zh-cn/img/sysdeployment/sys_topic_deploy.png
deleted file mode 100644
index 5520230..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_topic_deploy.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_topic_error.png b/docs/zh-cn/img/sysdeployment/sys_topic_error.png
deleted file mode 100644
index 4889364..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_topic_error.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_topic_finished.png b/docs/zh-cn/img/sysdeployment/sys_topic_finished.png
deleted file mode 100644
index 263d218..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_topic_finished.png and /dev/null differ
diff --git a/docs/zh-cn/img/sysdeployment/sys_topic_select.png b/docs/zh-cn/img/sysdeployment/sys_topic_select.png
deleted file mode 100644
index 3a6d645..0000000
Binary files a/docs/zh-cn/img/sysdeployment/sys_topic_select.png and /dev/null differ
diff --git a/docs/zh-cn/modules/agent/architecture.md b/docs/zh-cn/modules/agent/architecture.md
new file mode 100644
index 0000000..61cd90a
--- /dev/null
+++ b/docs/zh-cn/modules/agent/architecture.md
@@ -0,0 +1,45 @@
+## 一. InLong-Agent 概览
+InLong-Agent是一个支持多种数据源类型的收集工具，致力于实现包括file、sql、Binlog、metrics等多种异构数据源之间稳定高效的数据采集功能。
+
+### 简要的架构图如下：
+
+
+
+
+### 设计理念
+为了解决数据源多样性问题，InLong-agent 将多种数据源抽象成统一的source概念，并抽象出sink来对数据进行写入。当需要接入一个新的数据源的时候，只需要配置好数据源的格式与读取参数便能跟做到高效读取。
+
+### 当前使用现状
+InLong-Agent在腾讯集团内被广泛使用，承担了大部分的数据采集业务，线上数据量达百亿级别。
+
+## 二. InLong-Agent 架构介绍
+InLong Agent本身作为数据采集框架，采用channel + plugin架构构建。将数据源读取和写入抽象成为Reader/Writer插件，纳入到整个框架中。
+
++ Reader：Reader为数据采集模块，负责采集数据源的数据，将数据发送给channel。
++ Writer： Writer为数据写入模块，负责不断向channel取数据，并将数据写入到目的端。
++ Channel：Channel用于连接reader和writer，作为两者的数据传输通道，并起到了数据的写入读取监控作用
+
+
+## 三. InLong-Agent 采集分类说明
+### 3.1 文件采集
+文件采集包含如下功能：
+
+用户配置的路径监听，能够监听出创建的文件信息
+目录正则过滤，支持YYYYMMDD+正则表达式的路径配置
+断点重传，InLong-Agent重启时，能够支持自动从上次读取位置重新读取，保证不重读不漏读。
+### 3.2 sql采集
+这类数据是指通过SQL执行的方式
+SQL正则分解，转化成多条SQL语句
+分别执行SQL，拉取数据集，拉取过程需要注意对mysql本身的影响
+执行周期，这种一般是定时执行
+### 3.3 binlog 采集
+这类采集通过配置mysql slave的方式，读取binlog，并还原数据
+需要注意binlog读取的时候多线程解析，多线程解析的数据需要打上顺序标签
+代码基于老版本的dbsync，主要的修改是将tdbus-sender的发送改为推送到agent-channel的方式做融合
+### 3.4 Metrics采集类
+这种方式采集属于文件采集，只不过metric采集的时候，单行的数据有格式规范
+
+
+
+
+
diff --git a/docs/zh-cn/modules/agent/img/architecture.png b/docs/zh-cn/modules/agent/img/architecture.png
new file mode 100644
index 0000000..1138fe1
Binary files /dev/null and b/docs/zh-cn/modules/agent/img/architecture.png differ
diff --git a/docs/zh-cn/modules/agent/quick_start.md b/docs/zh-cn/modules/agent/quick_start.md
new file mode 100644
index 0000000..419f0bd
--- /dev/null
+++ b/docs/zh-cn/modules/agent/quick_start.md
@@ -0,0 +1,129 @@
+
+##一、安装
+
+ mvn clean package -DskipTests
+
+ 在项目下的target里面可以找到tgz安装包
+
+
+
+## 二、配置
+###2.1 Agent 相关设置
+
+
+
+agent 支持两种运行模式：本地运行以及线上运行
+
+线上运行需要从inlong-manager拉取配置，配置conf/agent.properties如下：
+agent.fetcher.classname=org.apache.inlong.agent.plugin.fetcher.ManagerFetcher (设置任务获取的类名，默认为ManagerFetcher）
+agent.local.ip=写入本机ip
+agent.manager.vip.http.host=manager host
+agent.manager.vip.http.port=manager port
+
+###2.2 Proxy 相关设置
+在agent目录下新建.inlong\.managerIps文件夹，内部新建bid+.local文件，例如设置的发送bid为a, 则新建a.local文件
+
+内部写入：
+
+ {"cluster_id":45,"isInterVisit":1,"size":1,"address": [{"port":写入proxy port,"host":"写入proxy ip"}], "switch":0}
+
+###2.3 本地 job配置
+如果不使用线上模式，可以使用本地文件新建读取任务
+在conf中新建目录jobs，
+vim job1.json：
+
+写入
+
+ {
+
+ "job": {
+
+ "dir": {
+
+ "pattern": "需要读取的文件路径，可包含正则表达式"
+
+ },
+
+ "trigger": "org.apache.inlong.agent.plugin.trigger.DirectoryTrigger",
+
+ "id": 1,
+
+ "name": "fileAgentTest",
+
+ "source": "org.apache.inlong.agent.plugin.sources.TextFileSource",
+
+ "sink": "org.apache.inlong.agent.plugin.sinks.ProxySink",
+
+ "channel": "org.apache.inlong.agent.plugin.channel.MemoryChannel"
+
+ },
+
+ "proxy": {
+
+ "bid": "testbid1"
+
+ }
+
+ }
+
+
+
+其中各个参数含义为：
+
+ job.dir.pattern: 配置读取的文件路径，可包含正则表达式
+
+ job.trigger: 触发器名称，默认为DirectoryTrigger，功能为监听文件夹下的文件产生事件
+
+ job.source: 使用的数据源类型，默认为TextFileSource，读取文本文件
+
+ job.sink：使用的写入器类型，默认为ProxySink，发送消息到proxy中
+
+ proxy.bid: 写入proxy时使用的bid类型
+
+###2.4 实时添加job配置
+
+##agent.propertities 修改下面两处
+
+ # whether enable http service
+ agent.http.enable=true
+ # http default port
+ agent.http.port=可用端口
+
+ curl --location --request POST 'http://localhost:8129/config/job' \
+ --header 'Content-Type: application/json' \
+ --data '{
+ "job": {
+ "dir": {
+ "path": "",
+ "pattern": "/data/inlong-agent/test.log"
+ },
+ "trigger": "org.apache.inlong.agent.plugin.trigger.DirectoryTrigger",
+ "id": 1,
+ "thread": {
+ "running": {
+ "core": "4"
+ },
+ "onejob": true
+ },
+ "name": "fileAgentTest",
+ "source": "org.apache.inlong.agent.plugin.sources.TextFileSource",
+ "sink": "org.apache.inlong.agent.plugin.sinks.TdBusSink",
+ "channel": "org.apache.inlong.agent.plugin.channel.MemoryChannel"
+ },
+ "bus": {
+ "bid": "thirtybid10",
+ "tdmanager": {
+ "port": "8099",
+ "host": "http://tl-tdbank-tdmanger.tencent-distribute.com"
+ }
+ },
+ "op": "add"
+ }'
+
+ 其中参数分别为：
+ op:
+
+##三、运行
+解压后如下命令运行
+
+ sh agent.sh start
diff --git a/docs/zh-cn/modules/console/quick_start.md b/docs/zh-cn/modules/console/quick_start.md
new file mode 100644
index 0000000..457c55b
--- /dev/null
+++ b/docs/zh-cn/modules/console/quick_start.md
@@ -0,0 +1,41 @@
+## 使用前
+
+应该检查 `nodejs >= 12.0` 已经安装。
+
+## 开发
+
+在新创建的项目中，您可以运行一些内置命令：
+
+如果没有安装 `node_modules`，你应该首先运行 `npm install` 或 `yarn install`。
+
+使用 `npm run dev` 或 `yarn dev` 在开发模式下运行应用程序。
+
+如果服务器运行成功，浏览器将打开 [http://localhost:8080](http://localhost:8080) 在浏览器中查看。
+
+如果您进行编辑，页面将重新加载。
+您还将在控制台中看到任何 lint 错误。
+
+### 注意
+
+web服务器的启动依赖于后端服务器api接口。
+
+您应该先启动后端服务器，然后将`/inlong-website/src/setupProxy.js` 中的变量`target` 设置为api服务的地址。
+
+## 测试
+
+运行 `npm test` 或 `yarn test`
+
+在交互式观察模式下启动测试运行器。
+有关更多信息，请参阅有关 [运行测试](https://create-react-app.dev/docs/running-tests/) 的部分。
+
+## 构建和部署
+
+运行 `npm run build` 或 `yarn build`
+
+将用于生产的应用程序构建到构建文件夹。
+在构建后的生产模式下可以获得较好的页面性能。
+
+构建后代码被压缩，文件名包括哈希值。
+您的应用程序已准备好部署！
+
+有关详细信息，请参阅有关 [deployment](https://create-react-app.dev/docs/deployment/) 的部分。
\ No newline at end of file
diff --git a/docs/zh-cn/modules/dataproxy-sdk/architecture.md b/docs/zh-cn/modules/dataproxy-sdk/architecture.md
new file mode 100644
index 0000000..e4920b8
--- /dev/null
+++ b/docs/zh-cn/modules/dataproxy-sdk/architecture.md
@@ -0,0 +1,62 @@
+# 一、说明
+
+在业务使用消息接入方式时，业务一般仅需将数据按照proxy可识别的格式（如六段协议、数字化协议等）
+进行组包发送，就可以将数据接入到inlong。但为了保证数据可靠性、负载均衡、动态更新proxy列表等安全特性
+用户程序就需要考虑更多最终导致程序过于繁琐臃肿。
+
+API的设计初衷就是为了简化用户接入，承担部分可靠性相关的逻辑。用户通过在服务送程序中集成API后，即可将数据发送到proxy，而不用关心组包格式、负载均衡等逻辑。
+
+# 二、功能说明
+
+## 2.1 整体功能说明
+
+| 功能 | 详细描述 |
+| ---- | ---- |
+| 组包功能（新） | 将用户数据按proxy可识别的组包格式（如六段协议、数字化协议等）打包发送到TDBus|
+| 压缩功能 | 发送proxy前，将用户数据进行压缩，减少网络带宽占用 |
+| 维护TDBus列表 | 每隔五分钟获取proxy列表 ，以检测运维侧是否存在上下线proxy机器的情况；每隔20s自动剔除不可用连接，以保证已连接的proxy能正常运作 |
+| 指标统计（新） | 增加业务分钟级别发送量的指标（接口级） |
+| 负载均衡（新） | 使用新的策略将发送的数据在多个proxy间进行负载均衡，不再依靠简单的随机+轮询机制来保证 |
+| proxy列表持久化（新） | 根据业务id对proxy列表持久化，防止程序启动时配置中心发生故障无法发送数据
+
+
+## 2.2 数据发送功能说明
+
+### 同步批量函数
+
+ public SendResult sendMessage(List<byte[]> bodyList, String bid, String tid, long dt, long timeout, TimeUnit timeUnit)
+
+ 参数说明
+
+ bodyList是用户需要发送的多条数据的集合，总长度建议小于512k。bid代表业务id，tid代表接口id。dt表示该数据的时间戳，精确到毫秒级别。也可直接设置为0，此时api会后台获取当前时间作为其时间戳。timeout & timeUnit:这两个参数是设置发送数据的超时时间，一般建议设置成20s。
+
+
+
+###同步单条函数
+
+ public SendResult sendMessage(byte[] body, String bid, String tid, long dt, long timeout, TimeUnit timeUnit)
+
+ 参数说明
+
+ body是用户要发送的单条数据内容，其余各参数涵义基本与批量发送接口一致。
+
+
+
+###异步批量函数
+
+ public void asyncSendMessage(SendMessageCallback callback, List<byte[]> bodyList, String bid, String tid, long dt, long timeout,TimeUnit timeUnit)
+
+ 参数说明
+
+ SendMessageCallback 是处理消息的callback。bodyList为用户需要发送的多条数据的集合，多条数据的总长度建议小于512k。bid是业务id，tid是接口id。dt表示该数据的时间戳，精确到毫秒级别。也可直接设置为0，此时api会后台获取当前时间作为其时间戳。timeout和timeUnit是发送数据的超时时间，一般建议设置成20s。
+
+
+###异步单条函数
+
+ public void asyncSendMessage(SendMessageCallback callback, byte[] body, String bid, String tid, long dt, long timeout, TimeUnit timeUnit)
+
+ 参数说明
+
+ body为单条消息内容，其余各参数涵义基本与批量发送接口一致
+
+
diff --git a/docs/zh-cn/modules/dataproxy-sdk/quick_start.md b/docs/zh-cn/modules/dataproxy-sdk/quick_start.md
new file mode 100644
index 0000000..8893a21
--- /dev/null
+++ b/docs/zh-cn/modules/dataproxy-sdk/quick_start.md
@@ -0,0 +1,9 @@
+# 使用
+
+编写java程序时，增加pom配置如下：
+
+ <dependency>
+ <groupId>com.tencent.tdbank</groupId>
+ <artifactId>TDBusSDK</artifactId>
+ <version>1.2.21</version>
+ </dependency>
\ No newline at end of file
diff --git a/docs/zh-cn/modules/dataproxy/architecture.md b/docs/zh-cn/modules/dataproxy/architecture.md
new file mode 100644
index 0000000..c3a6901
--- /dev/null
+++ b/docs/zh-cn/modules/dataproxy/architecture.md
@@ -0,0 +1,11 @@
+# 一、说明
+
+ inlong-bus属于inlong proxy层，用于数据的汇集接收以及转发。通过格式转换，将数据转为cache层可以缓存处理的TDMsg1格式
+ inlong-bus整体架构基于Apache Flume。inlong-bus在该项目的基础上，扩展了source层和sink层，并对容灾转发做了优化处理，提升了系统的稳定性。
+
+
+# 二、架构
+
+ 1.Source层开启端口监听，通过netty server实现。解码之后的数据发到channel层
+ 2.channel层有一个selector，用于选择走哪种类型的channel，如果memory最终满了，会对数据做落地处理
+ 3.channel层的数据会通过sink层做转发，这里主要是将数据转为TDMsg1的格式，并推送到cache层（这里用的比较多的是tube）
\ No newline at end of file
diff --git a/docs/zh-cn/modules/dataproxy/quick_start.md b/docs/zh-cn/modules/dataproxy/quick_start.md
new file mode 100644
index 0000000..dfc65d4
--- /dev/null
+++ b/docs/zh-cn/modules/dataproxy/quick_start.md
@@ -0,0 +1,42 @@
+
+
+##一、安装
+
+ mvn clean package -DskipTests
+
+在inlong-dataproxy/dataproxy-dist/target项目下可以找到tgz安装包apache-inlong-proxy-0.9.0-incubating-SNAPSHOT-bin.tar.gz
+
+ 解压
+ tar -zxvf apache-inlong-proxy-0.9.0-incubating-SNAPSHOT-bin.tar.gz
+
+
+## 二、配置
+
+ cd apache-inlong-proxy-0.9.0-incubating-SNAPSHOT-bin
+
+### 配置tube地址
+ vim conf/flume.conf
+ vim命令行模式，执行以下替换命令,其中xxx为tube地址
+ :%s/TUBE_LIST/xx.xx.xx.xx:port,xx.xx.xx.xx:port
+
+### 环境准备
+ cd bin
+ sh prepare_env.sh
+ cd ..
+
+### 配置manager地址
+ vim conf/commmon.properties
+ 写入以下配置：
+ cluster_id=1
+ manager_hosts=xx.xx.xx.xx:port
+
+## 三、启动
+ sh bin/start.sh
+
+## 四、检查启动情况
+ telnet 127.0.0.1 46801
+
+## 五、测试
+ 使用proxySdk发送数据测试
+
+
diff --git a/docs/zh-cn/modules/manager/architecture.md b/docs/zh-cn/modules/manager/architecture.md
new file mode 100644
index 0000000..b61cc76
--- /dev/null
+++ b/docs/zh-cn/modules/manager/architecture.md
@@ -0,0 +1,35 @@
+---
+title: 架构介绍 - Apache InLong Manager
+---
+
+## Apache InLong Manager介绍
+
++ 目标定位：Apache inlong 定位为一站式数据接入解决方案，提供完整覆盖大数据接入场景从数据采集、传输、分拣、落地的技术能力。
+
++ 平台价值：用户可以通过平台中自带的管理、配置平台完成任务的配置、管理、指标监控，同时通过平台在流程中各主要环节提供SPI扩展点按需要实现自定义逻辑。保证功能稳定高效的同时降低平台使用门槛。
+
++ Apache InLong Manager作为整个数据接入平台面向用户的统一管理入口，用户登录后会根据对应角色提供不同的功能权限以及数据权限。页面提供平台各基础集群（如mq、分拣）维护入口，可随时查看维护基本信息、容量规划调整。同时业务用户可完成数据接入任务的创建、修改维护、指标查看、接入对账等功能。其对应的后台服务在用户创建并启动任务的同时会与底层各模块进行数据交互，将各模块需要执行的任务通过合理的方式下发。起到协调串联后台业务执行流程的作用。
+
+## Architecture
+
+
+
+
+## 模块分工
+
+| 模块 | 职责 |
+| :-----| :---- |
+| manager-common | 模块公共代码，入异常定义，工具类，枚举等 |
+| manager-dao | 数据库操作 |
+| manager-opapi | 后台开放接口|
+| manager-service | 业务逻辑层 |
+| manager-web | 前端交互对应接口 |
+| manager-workflow-engin | 工作流引擎|
+
+
+## 系统使用流程
+
+
+
+## 数据模型
+
diff --git a/docs/zh-cn/modules/manager/img/datamodel.jpg b/docs/zh-cn/modules/manager/img/datamodel.jpg
new file mode 100644
index 0000000..7d0b578
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/datamodel.jpg differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624431177918.png b/docs/zh-cn/modules/manager/img/image-1624431177918.png
new file mode 100644
index 0000000..9cc6136
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624431177918.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624431271642.png b/docs/zh-cn/modules/manager/img/image-1624431271642.png
new file mode 100644
index 0000000..6584c3e
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624431271642.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624431306077.png b/docs/zh-cn/modules/manager/img/image-1624431306077.png
new file mode 100644
index 0000000..c70ee18
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624431306077.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624431333949.png b/docs/zh-cn/modules/manager/img/image-1624431333949.png
new file mode 100644
index 0000000..0569bc6
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624431333949.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624431416449.png b/docs/zh-cn/modules/manager/img/image-1624431416449.png
new file mode 100644
index 0000000..5bc8f74
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624431416449.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624431435574.png b/docs/zh-cn/modules/manager/img/image-1624431435574.png
new file mode 100644
index 0000000..724e535
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624431435574.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624431594406.png b/docs/zh-cn/modules/manager/img/image-1624431594406.png
new file mode 100644
index 0000000..dc29597
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624431594406.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624431617259.png b/docs/zh-cn/modules/manager/img/image-1624431617259.png
new file mode 100644
index 0000000..eaa10b1
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624431617259.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624431713360.png b/docs/zh-cn/modules/manager/img/image-1624431713360.png
new file mode 100644
index 0000000..fb8658e
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624431713360.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624431787323.png b/docs/zh-cn/modules/manager/img/image-1624431787323.png
new file mode 100644
index 0000000..23621be
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624431787323.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432002615.png b/docs/zh-cn/modules/manager/img/image-1624432002615.png
new file mode 100644
index 0000000..b3d4a1e
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432002615.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432022859.png b/docs/zh-cn/modules/manager/img/image-1624432022859.png
new file mode 100644
index 0000000..25eede7
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432022859.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432076857.png b/docs/zh-cn/modules/manager/img/image-1624432076857.png
new file mode 100644
index 0000000..3215186
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432076857.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432092795.png b/docs/zh-cn/modules/manager/img/image-1624432092795.png
new file mode 100644
index 0000000..3959fc3
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432092795.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432114765.png b/docs/zh-cn/modules/manager/img/image-1624432114765.png
new file mode 100644
index 0000000..e7cad0f
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432114765.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432235900.png b/docs/zh-cn/modules/manager/img/image-1624432235900.png
new file mode 100644
index 0000000..752526e
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432235900.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432254118.png b/docs/zh-cn/modules/manager/img/image-1624432254118.png
new file mode 100644
index 0000000..53cc955
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432254118.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432286674.png b/docs/zh-cn/modules/manager/img/image-1624432286674.png
new file mode 100644
index 0000000..338f2e3
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432286674.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432445002.png b/docs/zh-cn/modules/manager/img/image-1624432445002.png
new file mode 100644
index 0000000..fa418a9
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432445002.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432458971.png b/docs/zh-cn/modules/manager/img/image-1624432458971.png
new file mode 100644
index 0000000..0687ac2
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432458971.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432474526.png b/docs/zh-cn/modules/manager/img/image-1624432474526.png
new file mode 100644
index 0000000..aff2bfe
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432474526.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432496461.png b/docs/zh-cn/modules/manager/img/image-1624432496461.png
new file mode 100644
index 0000000..123632b
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432496461.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432515850.png b/docs/zh-cn/modules/manager/img/image-1624432515850.png
new file mode 100644
index 0000000..7e2c882
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432515850.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432535541.png b/docs/zh-cn/modules/manager/img/image-1624432535541.png
new file mode 100644
index 0000000..29d9bab
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432535541.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432652141.png b/docs/zh-cn/modules/manager/img/image-1624432652141.png
new file mode 100644
index 0000000..308b889
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432652141.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432668340.png b/docs/zh-cn/modules/manager/img/image-1624432668340.png
new file mode 100644
index 0000000..b86aae9
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432668340.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432740241.png b/docs/zh-cn/modules/manager/img/image-1624432740241.png
new file mode 100644
index 0000000..e6d2ab9
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432740241.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432759224.png b/docs/zh-cn/modules/manager/img/image-1624432759224.png
new file mode 100644
index 0000000..4c42d3e
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432759224.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432778845.png b/docs/zh-cn/modules/manager/img/image-1624432778845.png
new file mode 100644
index 0000000..435c7d9
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432778845.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432797226.png b/docs/zh-cn/modules/manager/img/image-1624432797226.png
new file mode 100644
index 0000000..f2309d4
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432797226.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624432829313.png b/docs/zh-cn/modules/manager/img/image-1624432829313.png
new file mode 100644
index 0000000..a502c0c
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624432829313.png differ
diff --git a/docs/zh-cn/modules/manager/img/image-1624433272455.png b/docs/zh-cn/modules/manager/img/image-1624433272455.png
new file mode 100644
index 0000000..4ae71bc
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/image-1624433272455.png differ
diff --git a/docs/zh-cn/modules/manager/img/inlong-manager.png b/docs/zh-cn/modules/manager/img/inlong-manager.png
new file mode 100644
index 0000000..3db4937
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/inlong-manager.png differ
diff --git a/docs/zh-cn/modules/manager/img/interactive.jpg b/docs/zh-cn/modules/manager/img/interactive.jpg
new file mode 100644
index 0000000..7238d00
Binary files /dev/null and b/docs/zh-cn/modules/manager/img/interactive.jpg differ
diff --git a/docs/zh-cn/modules/manager/quick_start.md b/docs/zh-cn/modules/manager/quick_start.md
new file mode 100644
index 0000000..3cd87c9
--- /dev/null
+++ b/docs/zh-cn/modules/manager/quick_start.md
@@ -0,0 +1,121 @@
+
+
+---
+ 快速开始 - Apache inlong-manager
+---
+
+# 1. 编译
+
++ 环境准备：已正确安装 Java（1.8+）、Maven（3.3+） 工具。
++ 通过 macOS 的终端（或 Windows 的 cmd）进入项目根目录`Inlong`执行编译打包命令：
+```
+mvn clean package -DskipTests
+```
++ 进入Inlong-manager子项目`inlong-manager` 目录，运行以下 Maven 命令打包项目，仅编译打包manager子项目：
+```
+mvn clean package -DskipTests
+```
+
++ 正确打包完成后，可在各个子模块的 `target` 目录下看到打好的tar包，manager-web-xxx-incubating-SNAPSHOT.tar.gz
+
+
+# 2 依赖准备
+## 2.1 数据库初始化
++ 基于mysql 5.7+，提前创建好数据库，如``CREATE DATABASE IF NOT EXISTS inlong; USE inlong``， 并导入inlong-manager/doc/sql/apache_inlong_manager.sql完成表结构及基础数据的初始化
++ 修改inlong-manager/manager-web/src/resources/application-xx.yml中数据库连接地址
++ zookeeper 3.5+ ，信息配置到inlong-manager/manager-web/src/resources/application-xx.yml文件对应位置
++ Tube集群信息，修改inlong-manager/manager-web/src/resources/application-xx.yml中tube相关配置信息
++ hadoop2.10.x 集群 , hive 2.3.x需提前构建并启动完成
+
+# 3. 后台服务部署&启动
+
+## 3.1 manager-web部署
+
++ （1）找到安装包,进入 /apache-inlong/inlong-manager/manager-web/target 找到 manager-web-xxx-incubating-SNAPSHOT.tar.gz
++ （2）部署安装包,压到即将部署服务的服务器对应目录 tar -zxvf manager-web-xxx-incubating-SNAPSHOT.tar.gz
++ （3） 修改配置文件，将manager-web/conf中的配置文件, 以application.yml中profile.active=dev为例，将application-dev.yml文件按真实内容修改
++ （4）启动服务，执行bin目录下的start.sh脚本，观察日志manager-web/log/manager-web.log和后端端口是否正常监听，manager-web默认使用8083端口
+
+## 3.2 manager-openapi部署
++ （1） 找到安装包,进入 /apache-inlong/inlong-manager/manager-openapi/target 找到 manager-openapi-xxx-incubating-SNAPSHOT.tar.gz
++ （2） 部署安装包,压到即将部署服务的服务器对应目录 tar -zxvf manager-web-0.9.0-incubating-SNAPSHOT.tar.gz
++ （3）修改配置文件，将manager-openapi/conf中的配置文件, 以application.yml中profile.active=dev为例，将配置application-dev.yml文件内容改为真实内容
++ （4）启动服务，执行bin目录下的start.sh脚本，观察日志manager-openapi/log/manager-openapi.log和后端端口是否正常监听，manager-openapi默认使用8082端口
+
+
+## 3.3 后端配置详解
++ `manager-web/conf/application-xx.yml` 示例
+
+```yml
+
+logging:
+ level:
+ root: INFO
+ org:
+ apache:
+ inlong:
+ manager:
+ dao:
+ mapper: debug
+ third:
+ debug
+
+spring:
+ datasource:
+ jdbc-url: jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?serverTimezone=GMT%2b8&useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+ username: xxxxxx
+ password: xxxxxx
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ type: com.alibaba.druid.pool.DruidDataSource
+ druid:
+ # Configure test query
+ validationQuery: SELECT 'x'
+ # Initialization size, minimum, maximum
+ initialSize: 20
+ minIdle: 20
+ maxActive: 300
+ # Configure the timeout period to wait for the connection to be acquired
+ maxWait: 600000
+ # Configure the minimum survival time of a connection in the pool, in milliseconds
+ minEvictableIdleTimeMillis: 3600000
+ # Detect when applying for connection. It is recommended to configure it to true, which does not affect performance and ensures safety
+ testWhileIdle: true
+ # Perform detection when obtaining a connection, it is recommended to close it, which affects performance
+ testOnBorrow: false
+ # Perform detection when returning the connection, it is recommended to close it, which affects performance
+ testOnReturn: false
+ # Configure filters for monitoring statistics interception，stat:Monitoring statistics log4j:log wall:Defense against SQL injection
+ filters: stat,wall
+ # Open the mergeSql function through the connectProperties property；Slow SQL records
+ connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+# InLong configuration
+inlong:
+ schedule:
+ user:
+ enable: false
+ update-cron: '0 0 2 * * ?'
+ common:
+ machineNum: 1
+ path: ~/
+ modules:
+ - agent
+
+# Cluster info
+cluster:
+ tube:
+ manager: http://127.0.0.1:8081
+ master: 127.0.0.1:8000,127.0.0.1:8010
+ zk:
+ url: 127.0.0.1:2181
+ root: inlong_hive
+ hive:
+ metastoreAddress: jdbc:mysql://127.0.0.1:3306/hive?useSSL=false
+
+```
+
+## 3.4 后台服务验证：
+
+<http://x.x.x.x:8083/api/inlong/manager/doc.html#/home>
+
+其中 `x.x.x.x` 修改为manager-web所部署的机器IP地址
diff --git a/docs/zh-cn/modules/manager/userManual.md b/docs/zh-cn/modules/manager/userManual.md
new file mode 100644
index 0000000..e2023ad
--- /dev/null
+++ b/docs/zh-cn/modules/manager/userManual.md
@@ -0,0 +1,164 @@
+## 1.用户登录
+需系统使用用户输入账号名称和密码
+
+
+
+## 2.数据接入
+数据接入模块展示目前用户权限内接入系统所有任务列表，可以对这些任务详情查看、编辑更新和删除操作
+点击【数据接入】接入流程，数据接入信息填写有两个步骤：业务信息、数据流
+
+
+### 2.1 业务信息
+#### 2.1.1 业务信息
+需要用户对接入任务填写基础业务信息
+
+- 业务ID：统一小写英文名称，请尽量包含产品名和简洁规范，如wechat_pay_base
+- 业务中文名称：业务的中文描述，便于使用与检索，最多128个字
+- 业务责任人：至少2人，业务责任人可查看、修改业务信息，新增和修改所有接入配置项
+- 业务介绍：剪短信对此次接入任务进行业务背景和应用介绍：
+
+#### 2.1.2 接入要求
+接入要求需要用户进行选择消息中间件： 高吞吐（TUBE）
+
+高吞吐—Tube ：高吞吐消息传输组件，适用于日志类的消息传递
+
+#### 2.1.3 接入规模
+接入规模需要用户预先针对接入数据进行规模判断，以便后续分配计算和存储资源
+
+
+### 2.2 数据流
+点击【下一步】进入到数据流信息填写步骤，数据流信息填写有四个模块：基础信息、数据来源、数据信息、数据流向
+在数据流流程中可以点击【新建数据流】，创建一个新的数据流信息填写页面
+
+
+#### 2.2.1 基础信息
+需用户对该接入任务中数据流的基础信息进行填写
+
+- 数据流ID：前缀根据BG/产品/项目自动生成，数据在业务中的唯一标识，TDBank中某个业务数据定义的唯一标识，跟数据源中的数据流ID、入TDW库信息表中的数据流ID一致
+- 数据流名称：接口信息说明,长度限制为varchar(64)，32个中文
+- 数据流责任人：数据流责任人可查看、修改数据流信息，新增和修改所有接入配置项
+- 数据流介绍：数据流简单文本介绍
+
+#### 2.2.2 数据来源
+需用户选择该数据流的消息来源，目前支持文件、自主推送三种方式，并且可以在高级选项中补充该数据来源详细信息；
+- 文件：业务数据以文件形式存放，业务机器部署TDBank Agent,根据定制的策略规则进行读取，详细说明链接
+- 自主推送：文案待定，技术实现与109消息中间件类型有关联
+
+
+
+#### 2.2.3 数据信息
+需用户填写该数据流中数据相关信息
+
+- 数据格式：数据来源格式，是普通文本类型，或者KV键值对数据
+- 数据编码：如数据源含中文，需要选UTF-8或GBK,否则编码格式不对，入库为乱码
+- 源字段分隔符：数据发送到mq里面的格式
+- 源数据字段：数据在mq里按某种格式划分的不同含义的属性
+
+#### 2.2.4 数据流向
+需用户对此任务的流向终流向进行选择，此部分为非必填项
+目前支持hive流向和自主推送两种
+
+HIVE流向
+
+- 目标库：hive数据库名（需要提前准备创建好）
+- 目标表：hive表名
+- 一级分区：hive数据划分hdfs数据一级子目录的字段名
+- 二级分区：hive数据划分hdfs数据一级子目录的字段名
+- 用户名：hiveserver连接账户名
+- 用户密码：hiveserver连接账密码
+- HDFS url：hive底层hdfs连接
+- JDBC url：hiveserver 的jdbcurl
+- 字段相关信息： 源字段名、源字段类型、HIVE字段名、HIVE字段类型、字段描述，并支持删除和新增字段
+
+## 3.接入详情
+### 3.1 执行日志
+当数据接入任务状态为”批准成功“和”配置失败“状态，可通过”执行日志“功能，以便用户查看任务执行进程进程和详情
+
+
+点击【执行日志】将以弹窗形式展示该任务执行日志详情
+
+执行日志中将展示该接入流程执行中任务类型、执行结果、执行日志内容、结束时间、如果执行失败可以”重启“该任务再次执行
+
+### 3.2 任务详情
+业务负责人/关注人可以查看该任务接入详情，并在【待提交】、【配置成功】、【配置失败】状态下可对部分信息进行修改更新
+接入任务详情中具有业务信息、数据流、流向、三个模块
+
+#### 3.2.1 业务信息
+展示接入任务中基础业务信息，点击【编辑】可对部分内容进行修改更改
+
+
+#### 3.2.2 数据流
+展示该接入任务下数据流基础信息，点击【新建数据流】可新建一条数据流信息
+
+
+#### 3.2.3 流向
+展示该接入任务中数据流向基础信息，通过通过下拉框选择不同流向类型，点击【新建流向配置】可新建一条数据流向信息
+
+
+## 4 数据消费
+数据消费目前不支持直接消费接入数据，需走数据审批流程后方可正常消费数据；
+点击【新建消费】，进入数据消费流程，需要对消费信息相关信息进行填写；
+
+
+### 4.1 消费信息
+申请人需在该信息填写模块中逐步填写数据消费申请相关基础消费业务信息
+
+- 消费组名称：前缀根据BG/产品/项目自动生成，消费者的简要名称，必须是小写字母、数字、下划线组成，最后审批会根据简称拼接分配出消费者名称
+- 消费责任人：自行选择责任人，必须至少2人；责任人可查看、修改消费信息
+- 消费目标业务ID：需要选择消费数据的业务ID，可以点击【查询】后，在弹窗页面中选择合适的业务ID，如下图所示：
+- 数据用途：选择数据使用用途
+- 数据用途说明：需申请人根据自身消费场景，简要说明使用的项目和数据的用途
+信息填完完成后，点击【提交】后，会将次数据消费流程正式提交待审批人审批后方可生效
+
+
+
+## 5.审批管理
+审批管理功能模块目前包含了我的申请和我的审批，管理系统中数据接入和数据消费申请审批全部任务
+### 5.1 我的申请
+展示目前申请人在系统中数据接入、消费提交的任务列表，点击【详情】可以查看目前该任务基础信和审批进程
+
+
+#### 5.1.1 数据接入详情
+数据接入任务详细展示目前该申请任务基础信息包括：申请人相关信息、申请接入基础信息、资源预估信息、以及目前审批进程节点
+
+#### 5.1.2 数据消费详情
+数据消费任务详情展示目前申请任务基础信息包括：申请人信息、基础消费信息、资源预估、以及目前审批进程节点
+
+### 5.2 我的审批
+作为具有审批权限的数据接入员和系统成员，具备对数据接入或者消费审批职责
+
+#### 5.2.1 数据接入审批
+新建数据接入审批：目前为一级审批，由系统管理员审批
+系统管理员将根据数据接入业务信息审核此次接入流程是否符合接入要求
+
+#### 5.2.2 新建数据消费审批
+新建数据消费审批：目前为一级审批，由业务负责人审批
+业务审批：主要由数据接入业务负责人根据接入参数信息判断是否符合接入要求，以此依据审批该申请消费任务
+
+
+## 6 系统管理
+系统管理目前针对于具有系统管理员身份用户，可以进行账号创建、修改、删除操作
+
+### 6.1 新建用户
+具有系统管理员权限用户，可以进行创建新用户账号
+
+- 账号类型： 普通用户（具有数据接入和数据消费权限，不具有数据接入审批和账号管理权限）； 系统管理员（具有数据接入和数据消费权限、同时也需要对数据接入审批和账号管理权限）
+- 用户名称：用户登录账号ID
+- 用户密码：用户登录密码
+- 有效时长：该账号可在系统使用期限
+
+
+
+### 6.2 删除用户
+系统管理员可以对已创建的用户进行账户删除，删除后次账号将停止使用
+
+
+### 6.3 用户编辑
+系统管理员可以对以已创建账号，进行二次编辑
+
+目前对于系统管理员支持对已有账号中：账号类型和有效时长进行修改
+
+
+### 6.4 更改密码
+用户可以自行更改账号密码，点击【修改密码】，用户需要输入旧密码和新密码，确认后次账号新密码将生效
+
diff --git a/docs/zh-cn/modules/sort/img.png b/docs/zh-cn/modules/sort/img.png
new file mode 100644
index 0000000..131eddf
Binary files /dev/null and b/docs/zh-cn/modules/sort/img.png differ
diff --git a/docs/zh-cn/modules/sort/introduction.md b/docs/zh-cn/modules/sort/introduction.md
new file mode 100644
index 0000000..6697409
--- /dev/null
+++ b/docs/zh-cn/modules/sort/introduction.md
@@ -0,0 +1,41 @@
+---
+title: 介绍 - Apache InLong-sort
+---
+
+# 简介
+inlong-sort是一个基于flink的ETL系统，支持多种数据源，支持简单的字段抽取，支持多种存储系统。
+inlong-sort依赖inlong-manager进行系统元数据的管理，元数据依赖zk进行存储及同步。
+
+# 特性
+## 多租户系统
+inlong-sort支持多租户，一个inlong-sort的作业中可以包含多个同构的数据源，以及多个同构的存储系统。
+并且针对不同的数据源，可以定义不同的数据格式以及字段抽取方式。
+多租户系统依赖inlong-manager的元数据管理，用户只需要在inlong-manager的前端页面进行相应的配置，即可实现。
+举例：以tubemq为source，hive为存储为例，同一个inlong-sort的作业可以订阅多个topic的tubemq数据，并且每个topic的数据可以写入不同的hive集群。
+
+## 支持热更新元数据
+inlong-sort支持热更新元数据，比如更新数据源的信息，数据schema，或者写入存储系统的信息。
+需要注意的是，当前修改数据源信息时，可能会造成数据丢失，因为修改数据源信息后，系统会认为这是一个全新的subscribe，会默认从消息队列的最新位置开始消费。
+修改数据schema，抽取字段规则以及写入存储的信息，不会造成任何数据丢失，保证exactly-once
+
+# 支持的数据源
+- inlong-tubemq
+
+# 支持的存储系统
+- hive（当前只支持parquet文件格式）
+- clickhouse
+
+# 一些局限
+当前inlong-sort在ETL的transform阶段，只支持简单的字段抽取功能，一些复杂功能暂不支持。
+
+# 未来规划
+## 支持更多种类的数据源
+pulsar，kafka等
+
+
+## 支持更多种类的存储
+Hbase，Elastic Search等
+
+
+## 支持更多种写入hive的文件格式
+sequece file，orc
\ No newline at end of file
diff --git a/docs/zh-cn/modules/sort/protocol_introduction.md b/docs/zh-cn/modules/sort/protocol_introduction.md
new file mode 100644
index 0000000..055a380
--- /dev/null
+++ b/docs/zh-cn/modules/sort/protocol_introduction.md
@@ -0,0 +1,23 @@
+---
+title: 协议介绍 - Apache InLong-sort
+---
+
+# 前言
+当前inlong-sort的元数据管理依赖inlong-manager。inlong-sort与inlong-manager之间通过zk进行元数据的交互。
+
+# Zookeeper结构
+
+
+
+cluster代表一个flink作业，同一个cluster中可以处理多个流向，但是这些流向必须是同构的（source与sink相同）。
+
+dataflow代表一个具体的流向，每个流向有一个全局唯一的id来标识。流向由source + sink组成。
+
+上图中上方的一条路径用来表示某个cluster中运行了哪些dataflow的作业，节点下均不含元数据。
+
+下方的路径用来存储dataflow的具体信息，即真正的元数据存放。
+
+元数据管理逻辑可以查看类`org.apache.inlong.sort.meta.MetaManager`
+
+# 协议设计
+具体的协议可以查看类`org.apache.inlong.sort.protocol.DataFlowInfo`
\ No newline at end of file
diff --git a/docs/zh-cn/modules/sort/quick_start.md b/docs/zh-cn/modules/sort/quick_start.md
new file mode 100644
index 0000000..5af07f7
--- /dev/null
+++ b/docs/zh-cn/modules/sort/quick_start.md
@@ -0,0 +1,78 @@
+---
+title: 快速开始 - Apache InLong-sort
+---
+
+# 环境要求
+- Java JDK 1.8
+- Maven 3.6+
+- Flink 1.9.3
+- Zookeeper
+
+# 配置flink运行环境
+当前inlong-sort是基于flink的一个应用，因此运行inlong-sort应用前，需要准备好flink环境。
+
+[如何配置flink环境](https://ci.apache.org/projects/flink/flink-docs-release-1.9/ops/deployment/cluster_setup.html "how to set up flink environment")
+
+由于当前inlong-sort依赖的是flink1.9.3版本，因此在下载部署包时，请选择`flink-1.9.3-bin-scala_2.11.tgz`
+
+flink环境配置完成后，可以通过浏览器访问flink的web ui，对应的地址是`/{flink部署路径}/conf/masters`文件中的地址
+
+# Zookeeper
+当前inlong-sort依赖zk与inlong-manager进行元数据的交互及管理。运行inlong-sort前，请务必确认zk环境准备就绪。
+
+# 编译
+- 步骤一：进入inlong-sort的目录
+`cd /your_path/Inlong/inlong-sort`
+- 步骤二：编译
+`mvn clean package`
+
+通过以上两个步骤在目录`/your_path/Inlong/inlong-sort/core/target`中，就会产出jar包`inlong-sort-core-{version}.jar`
+
+# 启动inlong-sort应用
+有了上述编译阶段产出的jar包后，就可以启动inlong-sort的应用了。
+
+[如何提交flink作业](https://ci.apache.org/projects/flink/flink-docs-release-1.9/ops/deployment/yarn_setup.html#submit-job-to-flink "如何提交flink作业")
+
+示例：
+
+- `./bin/flink run -c org.apache.inlong.sort.flink.Entrance inlong-sort-core-1.0-SNAPSHOT.jar --cluster-id my_application --zookeeper.quorum 127.0.0.1:2181 --zookeeper.path.root /inlong-sort --source.type tubemq --sink.type hive`
+
+注意：
+
+- `-c org.apache.inlong.sort.flink.Entrance` 表示main class name
+
+- `inlong-sort-core-1.0-SNAPSHOT.jar` 为编译阶段产出的jar包
+
+# 必要的配置
+- `--cluster-id ` 用来唯一标识一个inlong-sort作业
+- `--zookeeper.quorum` zk quorum
+- `--zookeeper.path.root` zk根目录
+- `--source.type` 数据源的种类, 当前仅支持"tubemq"
+- `--sink.type` 存储系统的种类，当前支持"clickhouse" 和 "hive"
+
+**配置示例**
+
+`--cluster-id my_application --zookeeper.quorum 192.127.0.1:2181 --zookeeper.path.root /zk_root --source.type tubemq --sink.type hive`
+
+# 所有支持的配置
+| 配置名 | 是否必须 | 默认值 |描述 |
+| ------------ | ------------ | ------------ | ------------ |
+|cluster-id | Y | NA | 用来唯一标识一个inlong-sort作业 |
+|zookeeper.quorum | Y | NA | zk quorum |
+|zookeeper.path.root | Y | "/inlong-sort" | zk根目录 |
+|source.type | Y | NA | 数据源的种类, 当前仅支持"tubemq" |
+|sink.type | Y | NA | 存储系统的种类，当前支持"clickhouse", "iceberg" 和 "hive" |
+|source.parallelism | N | 1 | source的并行度 |
+|deserialization.parallelism | N | 1 | deserialization的并行度 |
+|sink.parallelism | N | 1 | sink的并行度 |
+|tubemq.master.address | N | NA | 订阅tube的master address，优先级低于zk上的元数据 |
+|tubemq.session.key | N |"inlong-sort" | 订阅tube使用的session key前缀 |
+|tubemq.bootstrap.from.max | N | false | 是否从最大位置开始消费tube |
+|tubemq.message.not.found.wait.period | N | 350ms | tube返回message not found后的等待时间 |
+|tubemq.subscribe.retry.timeout | N | 300000 | 订阅tube的重试超时时间，单位为ms |
+|zookeeper.client.session-timeout | N | 60000 | zk session的超时时间，单位为ms |
+|zookeeper.client.connection-timeout | N | 15000 | zk连接的超时时间，单位为ms |
+|zookeeper.client.retry-wait | N | 5000 | zk重连间的等待时间，单位为ms |
+|zookeeper.client.max-retry-attempts | N | 3 | zk重连的最大重试次数 |
+|zookeeper.client.acl | N | "open" | Defines the ACL (open/creator) to be configured on ZK node. The configuration value can be set to “creator” if the ZooKeeper server configuration has the “authProvider” property mapped to use SASLAuthenticationProvider and the cluster is configured to run in secure mode (Kerberos) |
+|zookeeper.sasl.disable | N | false | 是否禁用sasl |
\ No newline at end of file
diff --git a/docs/zh-cn/appendixfiles/http_access_api_definition_cn.xls b/docs/zh-cn/modules/tubemq/appendixfiles/http_access_api_definition_cn.xls
similarity index 99%
rename from docs/zh-cn/appendixfiles/http_access_api_definition_cn.xls
rename to docs/zh-cn/modules/tubemq/appendixfiles/http_access_api_definition_cn.xls
index 31a61b0..888bd33 100644
Binary files a/docs/zh-cn/appendixfiles/http_access_api_definition_cn.xls and b/docs/zh-cn/modules/tubemq/appendixfiles/http_access_api_definition_cn.xls differ
diff --git a/docs/zh-cn/architecture.md b/docs/zh-cn/modules/tubemq/architecture.md
similarity index 87%
rename from docs/zh-cn/architecture.md
rename to docs/zh-cn/modules/tubemq/architecture.md
index 1df8f0d..9185d56 100644
--- a/docs/zh-cn/architecture.md
+++ b/docs/zh-cn/modules/tubemq/architecture.md
@@ -1,8 +1,8 @@
---
-title: 架构介绍 - Apache TubeMQ
+title: 架构介绍 - Apache InLong TubeMQ模块
---
-## TubeMQ 架构
+## Apache InLong TubeMQ模块的架构
经过多年演变，TubeMQ集群分为如下5个部分：
@@ -17,7 +17,7 @@ title: 架构介绍 - Apache TubeMQ
- **Zookeeper**： 负责offset存储的zk部分，该部分功能已弱化到仅做offset的持久化存储，考虑到接下来的多节点副本功能该模块暂时保留。
-## TubeMQ的系统特点
+## Apache InLong TubeMQ模块的系统特点
- **纯Java实现语言**：
TubeMQ采用纯Java语言开发，便于开发人员快速熟悉项目及问题处理；
@@ -53,18 +53,18 @@ TubeMQ采用连接复用模式，减少连接资源消耗；通过逻辑分区
## Broker文件存储方案改进
-以磁盘为数据持久化媒介的系统都面临各种因磁盘问题导致的系统性能问题，TubeMQ系统也不例外，性能提升很大程度上是在解决消息数据如何读写及存储的问题，在这个方面TubeMQ进行了比较多的改进：
+以磁盘为数据持久化媒介的系统都面临各种因磁盘问题导致的系统性能问题，TubeMQ系统也不例外，性能提升很大程度上是在解决消息数据如何读写及存储的问题。在这个方面TubeMQ进行了比较多的改进，我们采用存储实例来作为最小的Topic数据管理单元，每个存储实例包括一个文件存储块和一个内存缓存块，每个Topic可以分配多个存储实例：
-### 文件结构组织形式调整
- TubeMQ的磁盘存储方案类似Kafka，但又不尽相同，如下图示，存储实例由一个索引文件和一个数据文件组成，每个Topic可以分配1个或者多个存储实例，每个Topic单独维护管理存储实例的相关机制，包括老化周期，partition个数，是否可读可写等。
+### 文件存储块
+ TubeMQ的磁盘存储方案类似Kafka，但又不尽相同，如下图示，每个文件存储块由一个索引文件和一个数据文件组成，partiton为数据文件里的逻辑分区，每个Topic单独维护管理文件存储块的相关机制，包括老化周期，partition个数，是否可读可写等。
-### 内存块缓存
- 在文件存储基础上，我们针对每个存储实例又额外增加了一个单独的内存缓存块，即在原有写磁盘基础上增加一块内存，隔离硬盘的慢速影响，数据先刷到内存，然后由内存控制块批量地将数据刷到磁盘文件。
+### 内存缓存块
+ 在文件存储块基础上，我们额外增加了一个单独的内存缓存块，即在原有写磁盘基础上增加一块内存，隔离硬盘的慢速影响，数据先刷到内存缓存块，然后由内存缓存块批量地将数据刷到磁盘文件。
-## TubeMQ客户端的演进： ##
+## Apache InLong TubeMQ模块的客户端演进： ##
业务与TubeMQ接触得最多的是消费侧，怎样更适应业务特点、更方便业务使用我们在这块做了比较多的改进：
- **数据拉取模式支持Push、Pull：**
diff --git a/docs/zh-cn/client_rpc.md b/docs/zh-cn/modules/tubemq/client_rpc.md
similarity index 94%
rename from docs/zh-cn/client_rpc.md
rename to docs/zh-cn/modules/tubemq/client_rpc.md
index 6faeba6..7abae1e 100644
--- a/docs/zh-cn/client_rpc.md
+++ b/docs/zh-cn/modules/tubemq/client_rpc.md
@@ -1,12 +1,12 @@
---
-title: 客户端RPC - Apache TubeMQ
+title: 客户端RPC - Apache InLong TubeMQ模块
---
-# Apache TubeMQ RPC定义：
+# Apache InLong TubeMQ模块的RPC定义：
## 总体介绍：
-这部分介绍内容在/org/apache/tubemq/corerpc模块下可以找到对应实现，Apache TubeMQ 各个节点间（Client、Master、Broker）通过TCP协议长连接交互，其消息采用的是 【二进制 + Protobuf编码】组合方式进行定义，如下图示：
+这部分介绍内容在/org/apache/inlong/tubemq/corerpc模块下可以找到对应实现，Apache InLong TubeMQ模块的各个节点间（Client、Master、Broker）通过TCP协议长连接交互，其消息采用的是 【二进制 + Protobuf编码】组合方式进行定义，如下图示：
在TCP里我们看到的都是二进制流，我们定义了4字节的msgToken消息头字段RPC\_PROTOCOL\_BEGIN\_TOKEN，用来区分每一条消息以及识别对端的合法性，客户端收到的消息不是以该字段开始的响应消息时，说明连接方非本系统支持的协议，或者返回数据出现了异常，这个时候需要关闭该连接，提示错误退出或者重连；紧接着的是4字节的消息序列号serialNo，该字段由请求方生成通过请求消息携带给服务端，服务器端完成该请求消息服务后通过请求消息的对应响应消息原样返回，主要用于客户端关联请求响应的上下文；4字节的listSize字段表示接下来按照PB编码的数据块个数，即后面跟随的[\<len\>\<data\>]内容的块数，目前协议定义下该字段不为0；[\<len\>\<data\>]是2个字段组合，即数据块长度，数据，主要是表示这个数据块长度及具体的数据。
@@ -163,7 +163,7 @@ Java的SDK版本里ClientId = 节点IP地址（IPV4） + "-" + 进程I
**分区负载均衡过程**:
----------
-Apache TubeMQ目前采用的是服务器端负载均衡模式，均衡过程由服务器管理维护；后续版本会增加客户端负载均衡模式，形成2种模式共存的情况，由业务根据需要选择不同的均衡方式。
+Apache InLong TubeMQ模块目前采用的是服务器端负载均衡模式，均衡过程由服务器管理维护；后续版本会增加客户端负载均衡模式，形成2种模式共存的情况，由业务根据需要选择不同的均衡方式。
**服务器端负载均衡过程如下**：
diff --git a/docs/zh-cn/clients_java.md b/docs/zh-cn/modules/tubemq/clients_java.md
similarity index 84%
rename from docs/zh-cn/clients_java.md
rename to docs/zh-cn/modules/tubemq/clients_java.md
index 08cea7b..c41a50c 100644
--- a/docs/zh-cn/clients_java.md
+++ b/docs/zh-cn/modules/tubemq/clients_java.md
@@ -1,8 +1,8 @@
---
-title: JAVA SDK API介绍 - Apache TubeMQ
+title: JAVA SDK API介绍 - Apache InLong TubeMQ模块
---
-## **TubeMQ Lib** **接口使用**
+## **Apache InLong TubeMQ模块 Lib** **接口使用**
------
@@ -24,7 +24,7 @@ TubeMQ的Master地址信息对象，该对象的特点是支持配置多个Maste
#### **c) TubeClientConfig：**
-MessageSessionFactory（消息会话工厂）初始化类，用来携带创建网络连接信息、客户端控制参数信息的对象类，包括RPC时长设置、Socket属性设置、连接质量检测参数设置、TLS参数设置、认证授权信息设置等信息，该类，连同接下来介绍的ConsumerConfig类，与TubeMQ-3.8.0版本之前版本的类变更最大的类，主要原因是在此之前TubeMQ的接口定义超6年多没有变更，接口使用上存在接口语义定义有歧义、接口属性设置单位不清晰、程序无法识别多种情况的内容选择等问题，考虑到代码开源自查问题方便性，以及新手学习成本问题，我们这次作了接口的重定义。对于重定义的前后差别，见配置接口定义说明部分介绍。
+MessageSessionFactory（消息会话工厂）初始化类，用来携带创建网络连接信息、客户端控制参数信息的对象类，包括RPC时长设置、Socket属性设置、连接质量检测参数设置、TLS参数设置、认证授权信息设置等信息。
@@ -64,13 +64,13 @@ Message类是TubeMQ里传递的消息对象类，业务设置的data会从生产
#### **a) 环境准备：**
-TubeMQ开源包org.apache.tube.example里提供了生产和消费的具体代码示例，这里我们通过一个实际的例子来介绍如何填参和调用对应接口。首先我们搭建一个带3个Master节点的TubeMQ集群，3个Master地址及端口分别为test_1.domain.com，test_2.domain.com，test_3.domain.com，端口均为8080，在该集群里我们建立了若干个Broker，并且针对Broker我们创建了3个topic：topic_1，topic_2，topic_3等Topic配置；然后我们启动对应的Broker等待Consumer和Producer的创建。
+TubeMQ开源包org.apache.inlong.tubemq.example里提供了生产和消费的具体代码示例，这里我们通过一个实际的例子来介绍如何填参和调用对应接口。首先我们搭建一个带3个Master节点的TubeMQ集群，3个Master地址及端口分别为test_1.domain.com，test_2.domain.com，test_3.domain.com，端口均为8080，在该集群里我们建立了若干个Broker，并且针对Broker我们创建了3个topic：topic_1，topic_2，topic_3等Topic配置；然后我们启动对应的Broker等待Consumer和Producer的创建。
#### **b) 创建Consumer：**
-见包org.apache.tubemq.example.MessageConsumerExample类文件，Consumer是一个包含网络交互协调的客户端对象，需要做初始化并且长期驻留内存重复使用的模型，它不适合单次拉起消费的场景。如下图示，我们定义了MessageConsumerExample封装类，在该类中定义了进行网络交互的会话工厂MessageSessionFactory类，以及用来做Push消费的PushMessageConsumer类：
+见包org.apache.inlong.tubemq.example.MessageConsumerExample类文件，Consumer是一个包含网络交互协调的客户端对象，需要做初始化并且长期驻留内存重复使用的模型，它不适合单次拉起消费的场景。如下图示，我们定义了MessageConsumerExample封装类，在该类中定义了进行网络交互的会话工厂MessageSessionFactory类，以及用来做Push消费的PushMessageConsumer类：
- ###### **i.初始化MessageConsumerExample类：**
@@ -139,7 +139,7 @@ public void subscribe(final Map<String, TreeSet<String>> topicTidsMap)
到此，对集群里对应topic的订阅就已完成，系统运行开始后，回调函数里数据将不断的通过回调函数推送到业务层进行处理：
```java
-public class DefaultMessageListener implements MessageV2Listener {
+public class DefaultMessageListener implements MessageListener {
private String topic;
@@ -154,11 +154,6 @@ public class DefaultMessageListener implements MessageV2Listener {
}
}
- public void receiveMessages(final List<Message> messages) throws InterruptedException
- {
- // deprecated
- }
-
public Executor getExecutor() {
return null;
}
@@ -172,7 +167,7 @@ public class DefaultMessageListener implements MessageV2Listener {
#### **c) 创建Producer：**
-现网环境中业务的数据都是通过代理层来做接收汇聚，包装了比较多的异常处理，大部分的业务都没有也不会接触到TubeSDK的Producer类，考虑到业务自己搭建集群使用TubeMQ进行使用的场景，这里提供对应的使用demo，见包org.apache.tubemq.example.MessageProducerExample类文件供参考，**需要注意**的是，业务除非使用数据平台的TubeMQ集群做MQ服务，否则仍要按照现网的接入流程使用代理层来进行数据生产：
+现网环境中业务的数据都是通过代理层来做接收汇聚，包装了比较多的异常处理，大部分的业务都没有也不会接触到TubeSDK的Producer类，考虑到业务自己搭建集群使用TubeMQ进行使用的场景，这里提供对应的使用demo，见包org.apache.inlong.tubemq.example.MessageProducerExample类文件供参考，**需要注意**的是，业务除非使用数据平台的TubeMQ集群做MQ服务，否则仍要按照现网的接入流程使用代理层来进行数据生产：
- **i. 初始化MessageProducerExample类：**
diff --git a/docs/zh-cn/configure_introduction.md b/docs/zh-cn/modules/tubemq/configure_introduction.md
similarity index 98%
rename from docs/zh-cn/configure_introduction.md
rename to docs/zh-cn/modules/tubemq/configure_introduction.md
index 42f0472..aa08d31 100644
--- a/docs/zh-cn/configure_introduction.md
+++ b/docs/zh-cn/modules/tubemq/configure_introduction.md
@@ -1,12 +1,12 @@
---
-title: 配置参数介绍 - Apache TubeMQ
+title: 配置参数介绍 - Apache InLong TubeMQ模块
---
# TubeMQ服务端配置文件说明：
TubeMQ服务端包括Master和Broker共2个模块，Master又包含供外部页面访问的Web前端模块（该部分存放在resources中），考虑到实际部署时2个模块常常部署在同1台机器中，TubeMQ将2个模块3个部分的内容打包在一起交付给运维使用；客户端则不包含服务端部分的lib包单独交付给业务使用。
-Master与Broker采用ini配置文件格式，相关配置文件分别放置在tubemq-server-3.8.0/conf/目录的master.ini和broker.ini文件中：
+Master与Broker采用ini配置文件格式，相关配置文件分别放置在tubemq-server-3.9.0/conf/目录的master.ini和broker.ini文件中：
diff --git a/docs/zh-cn/console_introduction.md b/docs/zh-cn/modules/tubemq/console_introduction.md
similarity index 99%
rename from docs/zh-cn/console_introduction.md
rename to docs/zh-cn/modules/tubemq/console_introduction.md
index 69591f2..4bd104b 100644
--- a/docs/zh-cn/console_introduction.md
+++ b/docs/zh-cn/modules/tubemq/console_introduction.md
@@ -1,5 +1,5 @@
---
-title: 管控台操作指引 - Apache TubeMQ
+title: 管控台操作指引 - Apache InLong TubeMQ模块
---
# TubeMQ管控台操作指引
diff --git a/docs/zh-cn/consumer_example.md b/docs/zh-cn/modules/tubemq/consumer_example.md
similarity index 84%
rename from docs/zh-cn/consumer_example.md
rename to docs/zh-cn/modules/tubemq/consumer_example.md
index 9811b77..b16b087 100644
--- a/docs/zh-cn/consumer_example.md
+++ b/docs/zh-cn/modules/tubemq/consumer_example.md
@@ -1,5 +1,5 @@
---
-title: 消费者示例 - Apache TubeMQ
+title: 消费者示例 - Apache InLong TubeMQ模块
---
## Consumer 示例
@@ -32,14 +32,6 @@ title: 消费者示例 - Apache TubeMQ
System.out.println("received message : " + message);
}
messagePullConsumer.confirmConsume(result.getConfirmContext(), true);
- } else {
- if (result.getErrCode() == 400) {
- ThreadUtils.sleep(100);
- } else {
- if (result.getErrCode() != 404) {
- System.out.println(String.format("Receive messages errorCode is %d, Error message is %s", result.getErrCode(), result.getErrMsg()));
- }
- }
}
}
}
@@ -62,7 +54,7 @@ title: 消费者示例 - Apache TubeMQ
pushConsumer.subscribe(topic, null, new MessageListener() {
@Override
- public void receiveMessages(List<Message> messages) throws InterruptedException {
+ public void receiveMessages(PeerInfo peerInfo, List<Message> messages) throws InterruptedException {
for (Message message : messages) {
System.out.println("received message : " + new String(message.getData()));
}
diff --git a/docs/zh-cn/deployment.md b/docs/zh-cn/modules/tubemq/deployment.md
similarity index 66%
rename from docs/zh-cn/deployment.md
rename to docs/zh-cn/modules/tubemq/deployment.md
index 0f4a0fb..ab381c5 100644
--- a/docs/zh-cn/deployment.md
+++ b/docs/zh-cn/modules/tubemq/deployment.md
@@ -1,5 +1,5 @@
---
-title: 部署指引 - Apache TubeMQ
+title: 部署指引 - Apache InLong TubeMQ模块
---
# TubeMQ编译、部署及简单使用：
@@ -19,12 +19,11 @@ mvn clean package -Dmaven.test.skip
大家也可以进入各个子目录进行单独编译，编译过程与普通的工程编译处理过程一致。
**部署服务端：**
-
-如上例子，进入E:\GIT\TubeMQ\tubemq-server\target目录，服务侧的相关内容如下，其中tubemq-server-3.8.0-bin.tar.gz为完整的服务端安装包，里面包括执行脚本，配置文件，依赖包，以及前端的源码；tubemq-server-3.8.0.jar为服务端处理逻辑包，包含于完整工程安装包的lib里，单独提出是考虑到日常变更升级时改动点多在服务器处理逻辑上，升级的时候只需要单独替换该jar包即可：
+如上例子，进入..\InLong\inlong-tubemq\tubemq-server\target目录，服务侧的相关内容如下，其中apache-inlong-tubemq-server-0.9.0-incubating-SNAPSHOT-bin.tar.gz为完整的服务端安装包，里面包括执行脚本，配置文件，依赖包，以及前端的源码；apache-inlong-tubemq-server-0.9.0-incubating-SNAPSHOT.jar为服务端处理逻辑包，包含于完整工程安装包的lib里，单独提出是考虑到日常变更升级时改动点多在服务器处理逻辑上，升级的时候只需要单独替换该jar包即可：
-这里我们是全新安装，将上述完整的工程安装包部署到待安装机器上，我们这里是放置在/data/tubemq目录下：
+这里我们是全新安装，将上述完整的工程安装包部署到待安装机器上，我们这里是放置在/data/inlong目录下：
@@ -35,12 +34,12 @@ mvn clean package -Dmaven.test.skip
| 机器 | 所属角色 | TCP端口 | TLS端口 | WEB端口 | 备注 |
| --- | --- | --- | --- | --- | --- |
-| 10.224.148.145 | **Master** | 8099 | 8199 | 8080 | 元数据存储在`/stage/metadata` |
-| | Broker | 8123 | 8124 | 8081 | 消息储存在`/stage/msgdata` |
-| | ZK | 2181 | | | Offset储存在根目录`/tubemq` |
-| 100.115.158.208 | **Master** | 8099 | 8199 | 8080 | 元数据存储在 `/stage/metadata` |
-| | Broker | 8123 | 8124 | 8081 | 消息储存在`/stage/msgdata` |
-| 10.224.155.80 | Producer ||||
+| 9.23.27.24 | **Master** | 8099 | 8199 | 8080 | 元数据存储在`/stage/meta_data` |
+| | Broker | 8123 | 8124 | 8081 | 消息储存在`/stage/msg_data` |
+| | ZooKeeper | 2181 | | | Offset储存在根目录`/tubemq` |
+| 9.23.28.24 | **Master** | 8099 | 8199 | 8080 | 元数据存储在 `/stage/meta_data` |
+| | Broker | 8123 | 8124 | 8081 | 消息储存在`/stage/msg_data` |
+| 9.23.27.160 | Producer ||||
| | Consumer ||||
|
部署Master时需要注意：
@@ -50,11 +49,11 @@ mvn clean package -Dmaven.test.skip
-以10.224.148.145和100.115.158.208为例，我们部署了Master和Broker两种角色，需要在/conf/master.ini，/resources/velocity.properties，/conf/broker.ini里进行如下配置，首先是10.224.148.145的配置：
+以9.23.27.24和9.23.28.24为例，我们部署了Master和Broker两种角色，需要在/conf/master.ini，/resources/velocity.properties，/conf/broker.ini里进行如下配置，首先是9.23.27.24的配置：
-然后是配置100.115.158.208：
+然后是配置9.23.28.24：
@@ -66,11 +65,11 @@ mvn clean package -Dmaven.test.skip
-我们首先启动10.224.148.145，然后启动100.115.158.208上的Master，如下打印可以表示主备Master都已启动成功并开启了对外服务端口：
+我们首先启动9.23.27.24，然后启动9.23.28.24上的Master，如下打印可以表示主备Master都已启动成功并开启了对外服务端口：
-访问Master的管控台([http://100.115.158.208:8080/config/topic\_list.htm](http://100.115.158.208:8080/config/topic_list.htm))，页面可查则表示master已成功启动：
+访问Master的管控台([http://9.23.27.24:8080](http://9.23.27.24:8080) )，点击页面可以查看到如下集群信息，则表示master已成功启动：
@@ -115,9 +114,7 @@ Master上所有的变更操作在点击确认的时候，都会弹出如上输
**配置及生效Topic**：
配置Topic和配置Broker信息类似，都需要先在Master上新增元数据信息，然后才能开始使用，要不生产和消费时候会报topic不存在错误，如我们用安装包里的example对不存在的Topic名test进行生产：
-```
-/usr/local/java/default/bin/java -Xmx512m -Dlog4j.configuration=file:/data/tubemq/tubemq-server-3.8.0/conf/tools.log4j.properties -Djava.net.preferIPv4Stack=true -cp /data/tubemq/tubemq-server-3.8.0/lib/\*:/data/tubemq/tubemq-server-3.8.0/conf/\*: com.tencent.tubemq.example.MessageProducerExample 100.115.158.208 10.224.148.145:8000,100.115.158.208:8000 test 10000000
-```
+
Demo实例会报如下错误信息：
@@ -142,18 +139,12 @@ Demo实例会报如下错误信息：
**数据生产和消费**：
-在安装包里，我们打包了example的测试Demo，业务也可以直接使用tubemq-client-3.8.0.jar封装自己的生产和消费逻辑，总的形式是类似，我们先执行生产者的Demo，我们可以看到Broker上已开始有数据接收：
-```
- /usr/local/java/default/bin/java -Xmx512m -Dlog4j.configuration=file:/data/tubemq/tubemq-server-3.8.0/conf/tools.log4j.properties -Djava.net.preferIPv4Stack=true -cp /data/tubemq/tubemq-server-3.8.0/lib/\*:/data/tubemq/tubemq-server-3.8.0/conf/\*: com.tencent.tubemq.example.MessageProducerExample 100.115.158.208 10.224.148.145:8000,100.115.158.208:8000 test 10000000
-```
+在安装包里，我们打包了example的测试Demo，业务也可以直接使用tubemq-client-0.9.0-incubating-SNAPSHOT.jar封装自己的生产和消费逻辑，总的形式是类似，我们先执行生产者的Demo，我们可以看到Broker上已开始有数据接收：
+
我们再执行消费Demo，我们也可以看到消费也正常：
-```
- /usr/local/java/default/bin/java -Xmx512m -Dlog4j.configuration=file:/data/tubemq/tubemq-server-3.8.0/conf/tools.log4j.properties -Djava.net.preferIPv4Stack=true -cp /data/tubemq/tubemq-server-3.8.0/lib/\*:/data/tubemq/tubemq-server-3.8.0/conf/\*: com.tencent.tubemq.example.MessageConsumerExample 10.224.148.145 10.224.148.145:8000,100.115.158.208:8000 test testGroup 3 1 1
-
-```
diff --git a/docs/zh-cn/error_code.md b/docs/zh-cn/modules/tubemq/error_code.md
similarity index 99%
rename from docs/zh-cn/error_code.md
rename to docs/zh-cn/modules/tubemq/error_code.md
index 2fda460..136a2e2 100644
--- a/docs/zh-cn/error_code.md
+++ b/docs/zh-cn/modules/tubemq/error_code.md
@@ -1,5 +1,5 @@
---
-title: 错误码 - Apache TubeMQ
+title: 错误码 - Apache InLong TubeMQ模块
---
# TubeMQ错误信息介绍
diff --git a/docs/zh-cn/http_access_api.md b/docs/zh-cn/modules/tubemq/http_access_api.md
similarity index 90%
rename from docs/zh-cn/http_access_api.md
rename to docs/zh-cn/modules/tubemq/http_access_api.md
index c70d4b9..fcc7247 100644
--- a/docs/zh-cn/http_access_api.md
+++ b/docs/zh-cn/modules/tubemq/http_access_api.md
@@ -1,5 +1,5 @@
---
-title: HTTP API介绍 - Apache TubeMQ
+title: HTTP API介绍 - Apache InLong TubeMQ模块
---
# HTTP API定义
diff --git a/docs/zh-cn/img/api_interface/http-api.png b/docs/zh-cn/modules/tubemq/img/api_interface/http-api.png
similarity index 100%
rename from docs/zh-cn/img/api_interface/http-api.png
rename to docs/zh-cn/modules/tubemq/img/api_interface/http-api.png
diff --git a/docs/en-us/img/client_rpc/rpc_broker_info.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_broker_info.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_broker_info.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_broker_info.png
diff --git a/docs/en-us/img/client_rpc/rpc_bytes_def.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_bytes_def.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_bytes_def.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_bytes_def.png
diff --git a/docs/en-us/img/client_rpc/rpc_conn_detail.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_conn_detail.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_conn_detail.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_conn_detail.png
diff --git a/docs/en-us/img/client_rpc/rpc_consumer_diagram.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_consumer_diagram.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_consumer_diagram.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_consumer_diagram.png
diff --git a/docs/en-us/img/client_rpc/rpc_convert_topicinfo.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_convert_topicinfo.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_convert_topicinfo.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_convert_topicinfo.png
diff --git a/docs/en-us/img/client_rpc/rpc_event_proto.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_event_proto.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_event_proto.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_event_proto.png
diff --git a/docs/en-us/img/client_rpc/rpc_event_proto_optype.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_event_proto_optype.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_event_proto_optype.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_event_proto_optype.png
diff --git a/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_event_proto_status.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_event_proto_status.png
new file mode 100644
index 0000000..7a787cc
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_event_proto_status.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_header_fill.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_header_fill.png
new file mode 100644
index 0000000..0023e89
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_header_fill.png differ
diff --git a/docs/en-us/img/client_rpc/rpc_inner_structure.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_inner_structure.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_inner_structure.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_inner_structure.png
diff --git a/docs/en-us/img/client_rpc/rpc_master_authorizedinfo.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_master_authorizedinfo.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_master_authorizedinfo.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_master_authorizedinfo.png
diff --git a/docs/en-us/img/client_rpc/rpc_message_data.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_message_data.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_message_data.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_message_data.png
diff --git a/docs/en-us/img/client_rpc/rpc_pbmsg_structure.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_pbmsg_structure.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_pbmsg_structure.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_pbmsg_structure.png
diff --git a/docs/en-us/img/client_rpc/rpc_producer_close2M.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_producer_close2M.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_producer_close2M.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_producer_close2M.png
diff --git a/docs/en-us/img/client_rpc/rpc_producer_diagram.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_producer_diagram.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_producer_diagram.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_producer_diagram.png
diff --git a/docs/en-us/img/client_rpc/rpc_producer_heartbeat2M.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_producer_heartbeat2M.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_producer_heartbeat2M.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_producer_heartbeat2M.png
diff --git a/docs/en-us/img/client_rpc/rpc_producer_register2M.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_producer_register2M.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_producer_register2M.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_producer_register2M.png
diff --git a/docs/en-us/img/client_rpc/rpc_producer_sendmsg2B.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_producer_sendmsg2B.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_producer_sendmsg2B.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_producer_sendmsg2B.png
diff --git a/docs/en-us/img/client_rpc/rpc_proto_def.png b/docs/zh-cn/modules/tubemq/img/client_rpc/rpc_proto_def.png
similarity index 100%
rename from docs/en-us/img/client_rpc/rpc_proto_def.png
rename to docs/zh-cn/modules/tubemq/img/client_rpc/rpc_proto_def.png
diff --git a/docs/zh-cn/modules/tubemq/img/configure/conf_ini_pos.png b/docs/zh-cn/modules/tubemq/img/configure/conf_ini_pos.png
new file mode 100644
index 0000000..a68e36d
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/configure/conf_ini_pos.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/configure/conf_velocity_pos.png b/docs/zh-cn/modules/tubemq/img/configure/conf_velocity_pos.png
new file mode 100644
index 0000000..40e6625
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/configure/conf_velocity_pos.png differ
diff --git a/docs/en-us/img/console/1568169770714.png b/docs/zh-cn/modules/tubemq/img/console/1568169770714.png
similarity index 100%
rename from docs/en-us/img/console/1568169770714.png
rename to docs/zh-cn/modules/tubemq/img/console/1568169770714.png
diff --git a/docs/en-us/img/console/1568169796122.png b/docs/zh-cn/modules/tubemq/img/console/1568169796122.png
similarity index 100%
rename from docs/en-us/img/console/1568169796122.png
rename to docs/zh-cn/modules/tubemq/img/console/1568169796122.png
diff --git a/docs/en-us/img/console/1568169806810.png b/docs/zh-cn/modules/tubemq/img/console/1568169806810.png
similarity index 100%
rename from docs/en-us/img/console/1568169806810.png
rename to docs/zh-cn/modules/tubemq/img/console/1568169806810.png
diff --git a/docs/en-us/img/console/1568169823675.png b/docs/zh-cn/modules/tubemq/img/console/1568169823675.png
similarity index 100%
rename from docs/en-us/img/console/1568169823675.png
rename to docs/zh-cn/modules/tubemq/img/console/1568169823675.png
diff --git a/docs/en-us/img/console/1568169839931.png b/docs/zh-cn/modules/tubemq/img/console/1568169839931.png
similarity index 100%
rename from docs/en-us/img/console/1568169839931.png
rename to docs/zh-cn/modules/tubemq/img/console/1568169839931.png
diff --git a/docs/en-us/img/console/1568169851085.png b/docs/zh-cn/modules/tubemq/img/console/1568169851085.png
similarity index 100%
rename from docs/en-us/img/console/1568169851085.png
rename to docs/zh-cn/modules/tubemq/img/console/1568169851085.png
diff --git a/docs/en-us/img/console/1568169863402.png b/docs/zh-cn/modules/tubemq/img/console/1568169863402.png
similarity index 100%
rename from docs/en-us/img/console/1568169863402.png
rename to docs/zh-cn/modules/tubemq/img/console/1568169863402.png
diff --git a/docs/en-us/img/console/1568169879529.png b/docs/zh-cn/modules/tubemq/img/console/1568169879529.png
similarity index 100%
rename from docs/en-us/img/console/1568169879529.png
rename to docs/zh-cn/modules/tubemq/img/console/1568169879529.png
diff --git a/docs/en-us/img/console/1568169889594.png b/docs/zh-cn/modules/tubemq/img/console/1568169889594.png
similarity index 100%
rename from docs/en-us/img/console/1568169889594.png
rename to docs/zh-cn/modules/tubemq/img/console/1568169889594.png
diff --git a/docs/en-us/img/console/1568169900634.png b/docs/zh-cn/modules/tubemq/img/console/1568169900634.png
similarity index 100%
rename from docs/en-us/img/console/1568169900634.png
rename to docs/zh-cn/modules/tubemq/img/console/1568169900634.png
diff --git a/docs/en-us/img/console/1568169908522.png b/docs/zh-cn/modules/tubemq/img/console/1568169908522.png
similarity index 100%
rename from docs/en-us/img/console/1568169908522.png
rename to docs/zh-cn/modules/tubemq/img/console/1568169908522.png
diff --git a/docs/en-us/img/console/1568169916091.png b/docs/zh-cn/modules/tubemq/img/console/1568169916091.png
similarity index 100%
rename from docs/en-us/img/console/1568169916091.png
rename to docs/zh-cn/modules/tubemq/img/console/1568169916091.png
diff --git a/docs/en-us/img/console/1568169925657.png b/docs/zh-cn/modules/tubemq/img/console/1568169925657.png
similarity index 100%
rename from docs/en-us/img/console/1568169925657.png
rename to docs/zh-cn/modules/tubemq/img/console/1568169925657.png
diff --git a/docs/en-us/img/console/1568169946683.png b/docs/zh-cn/modules/tubemq/img/console/1568169946683.png
similarity index 100%
rename from docs/en-us/img/console/1568169946683.png
rename to docs/zh-cn/modules/tubemq/img/console/1568169946683.png
diff --git a/docs/en-us/img/console/1568169954746.png b/docs/zh-cn/modules/tubemq/img/console/1568169954746.png
similarity index 100%
rename from docs/en-us/img/console/1568169954746.png
rename to docs/zh-cn/modules/tubemq/img/console/1568169954746.png
diff --git a/docs/en-us/img/development/create_pull_request.png b/docs/zh-cn/modules/tubemq/img/development/create_pull_request.png
similarity index 100%
rename from docs/en-us/img/development/create_pull_request.png
rename to docs/zh-cn/modules/tubemq/img/development/create_pull_request.png
diff --git a/docs/en-us/img/development/github_fork_repository.png b/docs/zh-cn/modules/tubemq/img/development/github_fork_repository.png
similarity index 100%
rename from docs/en-us/img/development/github_fork_repository.png
rename to docs/zh-cn/modules/tubemq/img/development/github_fork_repository.png
diff --git a/docs/en-us/img/development/jira_create_issue.png b/docs/zh-cn/modules/tubemq/img/development/jira_create_issue.png
similarity index 100%
rename from docs/en-us/img/development/jira_create_issue.png
rename to docs/zh-cn/modules/tubemq/img/development/jira_create_issue.png
diff --git a/docs/en-us/img/development/jira_filter.png b/docs/zh-cn/modules/tubemq/img/development/jira_filter.png
similarity index 100%
rename from docs/en-us/img/development/jira_filter.png
rename to docs/zh-cn/modules/tubemq/img/development/jira_filter.png
diff --git a/docs/en-us/img/development/jira_resolve_issue_1.png b/docs/zh-cn/modules/tubemq/img/development/jira_resolve_issue_1.png
similarity index 100%
rename from docs/en-us/img/development/jira_resolve_issue_1.png
rename to docs/zh-cn/modules/tubemq/img/development/jira_resolve_issue_1.png
diff --git a/docs/en-us/img/development/jira_resolve_issue_2.png b/docs/zh-cn/modules/tubemq/img/development/jira_resolve_issue_2.png
similarity index 100%
rename from docs/en-us/img/development/jira_resolve_issue_2.png
rename to docs/zh-cn/modules/tubemq/img/development/jira_resolve_issue_2.png
diff --git a/docs/en-us/img/development/new_pull_request.png b/docs/zh-cn/modules/tubemq/img/development/new_pull_request.png
similarity index 100%
rename from docs/en-us/img/development/new_pull_request.png
rename to docs/zh-cn/modules/tubemq/img/development/new_pull_request.png
diff --git a/docs/en-us/img/mqs_comare.png b/docs/zh-cn/modules/tubemq/img/mqs_comare.png
similarity index 100%
rename from docs/en-us/img/mqs_comare.png
rename to docs/zh-cn/modules/tubemq/img/mqs_comare.png
diff --git a/docs/en-us/img/perf_appendix_1_bx1_1.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_1_bx1_1.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_1_bx1_1.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_1_bx1_1.png
diff --git a/docs/en-us/img/perf_appendix_1_bx1_2.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_1_bx1_2.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_1_bx1_2.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_1_bx1_2.png
diff --git a/docs/en-us/img/perf_appendix_1_bx1_3.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_1_bx1_3.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_1_bx1_3.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_1_bx1_3.png
diff --git a/docs/en-us/img/perf_appendix_1_bx1_4.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_1_bx1_4.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_1_bx1_4.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_1_bx1_4.png
diff --git a/docs/en-us/img/perf_appendix_1_cg1_1.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_1_cg1_1.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_1_cg1_1.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_1_cg1_1.png
diff --git a/docs/en-us/img/perf_appendix_1_cg1_2.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_1_cg1_2.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_1_cg1_2.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_1_cg1_2.png
diff --git a/docs/en-us/img/perf_appendix_1_cg1_3.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_1_cg1_3.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_1_cg1_3.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_1_cg1_3.png
diff --git a/docs/en-us/img/perf_appendix_1_cg1_4.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_1_cg1_4.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_1_cg1_4.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_1_cg1_4.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_1000_1.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_1.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_1000_1.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_1.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_1000_2.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_2.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_1000_2.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_2.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_1000_3.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_3.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_1000_3.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_3.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_1000_4.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_4.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_1000_4.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_4.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_1000_5.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_5.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_1000_5.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_5.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_1000_6.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_6.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_1000_6.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_6.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_1000_7.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_7.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_1000_7.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_7.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_1000_8.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_8.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_1000_8.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_8.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_1000_9.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_9.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_1000_9.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_1000_9.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_100_1.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_1.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_100_1.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_1.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_100_2.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_2.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_100_2.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_2.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_100_3.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_3.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_100_3.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_3.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_100_4.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_4.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_100_4.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_4.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_100_5.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_5.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_100_5.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_5.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_100_6.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_6.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_100_6.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_6.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_100_7.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_7.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_100_7.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_7.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_100_8.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_8.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_100_8.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_8.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_100_9.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_9.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_100_9.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_100_9.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_200_1.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_1.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_200_1.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_1.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_200_2.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_2.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_200_2.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_2.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_200_3.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_3.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_200_3.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_3.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_200_4.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_4.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_200_4.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_4.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_200_5.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_5.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_200_5.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_5.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_200_6.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_6.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_200_6.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_6.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_200_7.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_7.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_200_7.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_7.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_200_8.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_8.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_200_8.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_8.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_200_9.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_9.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_200_9.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_200_9.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_500_1.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_1.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_500_1.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_1.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_500_2.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_2.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_500_2.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_2.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_500_3.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_3.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_500_3.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_3.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_500_4.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_4.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_500_4.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_4.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_500_5.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_5.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_500_5.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_5.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_500_6.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_6.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_500_6.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_6.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_500_7.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_7.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_500_7.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_7.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_500_8.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_8.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_500_8.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_8.png
diff --git a/docs/en-us/img/perf_appendix_2_topic_500_9.png b/docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_9.png
similarity index 100%
rename from docs/en-us/img/perf_appendix_2_topic_500_9.png
rename to docs/zh-cn/modules/tubemq/img/perf_appendix_2_topic_500_9.png
diff --git a/docs/en-us/img/perf_scenario_1.png b/docs/zh-cn/modules/tubemq/img/perf_scenario_1.png
similarity index 100%
rename from docs/en-us/img/perf_scenario_1.png
rename to docs/zh-cn/modules/tubemq/img/perf_scenario_1.png
diff --git a/docs/en-us/img/perf_scenario_1_index.png b/docs/zh-cn/modules/tubemq/img/perf_scenario_1_index.png
similarity index 100%
rename from docs/en-us/img/perf_scenario_1_index.png
rename to docs/zh-cn/modules/tubemq/img/perf_scenario_1_index.png
diff --git a/docs/en-us/img/perf_scenario_2.png b/docs/zh-cn/modules/tubemq/img/perf_scenario_2.png
similarity index 100%
rename from docs/en-us/img/perf_scenario_2.png
rename to docs/zh-cn/modules/tubemq/img/perf_scenario_2.png
diff --git a/docs/en-us/img/perf_scenario_2_index.png b/docs/zh-cn/modules/tubemq/img/perf_scenario_2_index.png
similarity index 100%
rename from docs/en-us/img/perf_scenario_2_index.png
rename to docs/zh-cn/modules/tubemq/img/perf_scenario_2_index.png
diff --git a/docs/en-us/img/perf_scenario_3.png b/docs/zh-cn/modules/tubemq/img/perf_scenario_3.png
similarity index 100%
rename from docs/en-us/img/perf_scenario_3.png
rename to docs/zh-cn/modules/tubemq/img/perf_scenario_3.png
diff --git a/docs/en-us/img/perf_scenario_3_index.png b/docs/zh-cn/modules/tubemq/img/perf_scenario_3_index.png
similarity index 100%
rename from docs/en-us/img/perf_scenario_3_index.png
rename to docs/zh-cn/modules/tubemq/img/perf_scenario_3_index.png
diff --git a/docs/en-us/img/perf_scenario_4_index.png b/docs/zh-cn/modules/tubemq/img/perf_scenario_4_index.png
similarity index 100%
rename from docs/en-us/img/perf_scenario_4_index.png
rename to docs/zh-cn/modules/tubemq/img/perf_scenario_4_index.png
diff --git a/docs/en-us/img/perf_scenario_6_index.png b/docs/zh-cn/modules/tubemq/img/perf_scenario_6_index.png
similarity index 100%
rename from docs/en-us/img/perf_scenario_6_index.png
rename to docs/zh-cn/modules/tubemq/img/perf_scenario_6_index.png
diff --git a/docs/en-us/img/perf_scenario_7.png b/docs/zh-cn/modules/tubemq/img/perf_scenario_7.png
similarity index 100%
rename from docs/en-us/img/perf_scenario_7.png
rename to docs/zh-cn/modules/tubemq/img/perf_scenario_7.png
diff --git a/docs/en-us/img/perf_scenario_8.png b/docs/zh-cn/modules/tubemq/img/perf_scenario_8.png
similarity index 100%
rename from docs/en-us/img/perf_scenario_8.png
rename to docs/zh-cn/modules/tubemq/img/perf_scenario_8.png
diff --git a/docs/en-us/img/perf_scenario_8_index.png b/docs/zh-cn/modules/tubemq/img/perf_scenario_8_index.png
similarity index 100%
rename from docs/en-us/img/perf_scenario_8_index.png
rename to docs/zh-cn/modules/tubemq/img/perf_scenario_8_index.png
diff --git a/docs/en-us/img/perf_scheme.png b/docs/zh-cn/modules/tubemq/img/perf_scheme.png
similarity index 100%
rename from docs/en-us/img/perf_scheme.png
rename to docs/zh-cn/modules/tubemq/img/perf_scheme.png
diff --git a/docs/zh-cn/modules/tubemq/img/store_file.png b/docs/zh-cn/modules/tubemq/img/store_file.png
new file mode 100644
index 0000000..c251dc3
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/store_file.png differ
diff --git a/docs/en-us/img/store_mem.png b/docs/zh-cn/modules/tubemq/img/store_mem.png
similarity index 100%
rename from docs/en-us/img/store_mem.png
rename to docs/zh-cn/modules/tubemq/img/store_mem.png
diff --git a/docs/en-us/img/sys_structure.png b/docs/zh-cn/modules/tubemq/img/sys_structure.png
similarity index 100%
rename from docs/en-us/img/sys_structure.png
rename to docs/zh-cn/modules/tubemq/img/sys_structure.png
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_address_host.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_address_host.png
new file mode 100644
index 0000000..4b38251
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_address_host.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_configure.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_configure.png
new file mode 100644
index 0000000..b8b000f
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_configure.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_deploy.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_deploy.png
new file mode 100644
index 0000000..31fc2d7
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_deploy.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_finished.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_finished.png
new file mode 100644
index 0000000..f5364d0
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_finished.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_online.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_online.png
new file mode 100644
index 0000000..1b0e3e3
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_online.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_online_2.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_online_2.png
new file mode 100644
index 0000000..9f12cb9
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_online_2.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_restart_1.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_restart_1.png
new file mode 100644
index 0000000..4c19cb0
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_restart_1.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_restart_2.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_restart_2.png
new file mode 100644
index 0000000..7a6aea0
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_restart_2.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_start.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_start.png
new file mode 100644
index 0000000..2ad204b
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_start.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_start_error.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_start_error.png
new file mode 100644
index 0000000..f7a94c5
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_broker_start_error.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_compile.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_compile.png
new file mode 100644
index 0000000..edecd21
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_compile.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_configure_1.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_configure_1.png
new file mode 100644
index 0000000..f20201b
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_configure_1.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_configure_2.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_configure_2.png
new file mode 100644
index 0000000..1d35431
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_configure_2.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_master_console.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_master_console.png
new file mode 100644
index 0000000..d03148d
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_master_console.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_master_start.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_master_start.png
new file mode 100644
index 0000000..a513e6c
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_master_start.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_master_startted.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_master_startted.png
new file mode 100644
index 0000000..764b996
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_master_startted.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_node_log.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_node_log.png
new file mode 100644
index 0000000..ae6a435
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_node_log.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_node_status.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_node_status.png
new file mode 100644
index 0000000..f7e2982
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_node_status.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_node_status_2.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_node_status_2.png
new file mode 100644
index 0000000..5f46607
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_node_status_2.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_package.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_package.png
new file mode 100644
index 0000000..f04af8a
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_package.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_package_list.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_package_list.png
new file mode 100644
index 0000000..fb531ba
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_package_list.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_topic_create.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_topic_create.png
new file mode 100644
index 0000000..ae4af1e
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_topic_create.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_topic_deploy.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_topic_deploy.png
new file mode 100644
index 0000000..d41b54c
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_topic_deploy.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_topic_error.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_topic_error.png
new file mode 100644
index 0000000..1673b8a
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_topic_error.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_topic_finished.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_topic_finished.png
new file mode 100644
index 0000000..f37f726
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_topic_finished.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_topic_select.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_topic_select.png
new file mode 100644
index 0000000..a186889
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/sys_topic_select.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/test_sendmessage.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/test_sendmessage.png
new file mode 100644
index 0000000..c18ffad
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/test_sendmessage.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/sysdeployment/test_sendmessage_2.png b/docs/zh-cn/modules/tubemq/img/sysdeployment/test_sendmessage_2.png
new file mode 100644
index 0000000..05dfeac
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/sysdeployment/test_sendmessage_2.png differ
diff --git a/docs/en-us/img/test_scheme.png b/docs/zh-cn/modules/tubemq/img/test_scheme.png
similarity index 100%
rename from docs/en-us/img/test_scheme.png
rename to docs/zh-cn/modules/tubemq/img/test_scheme.png
diff --git a/docs/en-us/img/test_summary.png b/docs/zh-cn/modules/tubemq/img/test_summary.png
similarity index 100%
rename from docs/en-us/img/test_summary.png
rename to docs/zh-cn/modules/tubemq/img/test_summary.png
diff --git a/docs/en-us/img/tubemq-add-broker-1.png b/docs/zh-cn/modules/tubemq/img/tubemq-add-broker-1.png
similarity index 100%
rename from docs/en-us/img/tubemq-add-broker-1.png
rename to docs/zh-cn/modules/tubemq/img/tubemq-add-broker-1.png
diff --git a/docs/en-us/img/tubemq-add-broker-2.png b/docs/zh-cn/modules/tubemq/img/tubemq-add-broker-2.png
similarity index 100%
rename from docs/en-us/img/tubemq-add-broker-2.png
rename to docs/zh-cn/modules/tubemq/img/tubemq-add-broker-2.png
diff --git a/docs/en-us/img/tubemq-add-broker-3.png b/docs/zh-cn/modules/tubemq/img/tubemq-add-broker-3.png
similarity index 100%
rename from docs/en-us/img/tubemq-add-broker-3.png
rename to docs/zh-cn/modules/tubemq/img/tubemq-add-broker-3.png
diff --git a/docs/en-us/img/tubemq-add-topic-1.png b/docs/zh-cn/modules/tubemq/img/tubemq-add-topic-1.png
similarity index 100%
rename from docs/en-us/img/tubemq-add-topic-1.png
rename to docs/zh-cn/modules/tubemq/img/tubemq-add-topic-1.png
diff --git a/docs/en-us/img/tubemq-add-topic-2.png b/docs/zh-cn/modules/tubemq/img/tubemq-add-topic-2.png
similarity index 100%
rename from docs/en-us/img/tubemq-add-topic-2.png
rename to docs/zh-cn/modules/tubemq/img/tubemq-add-topic-2.png
diff --git a/docs/en-us/img/tubemq-add-topic-3.png b/docs/zh-cn/modules/tubemq/img/tubemq-add-topic-3.png
similarity index 100%
rename from docs/en-us/img/tubemq-add-topic-3.png
rename to docs/zh-cn/modules/tubemq/img/tubemq-add-topic-3.png
diff --git a/docs/en-us/img/tubemq-add-topic-4.png b/docs/zh-cn/modules/tubemq/img/tubemq-add-topic-4.png
similarity index 100%
rename from docs/en-us/img/tubemq-add-topic-4.png
rename to docs/zh-cn/modules/tubemq/img/tubemq-add-topic-4.png
diff --git a/docs/en-us/img/tubemq-add-topic-5.png b/docs/zh-cn/modules/tubemq/img/tubemq-add-topic-5.png
similarity index 100%
rename from docs/en-us/img/tubemq-add-topic-5.png
rename to docs/zh-cn/modules/tubemq/img/tubemq-add-topic-5.png
diff --git a/docs/en-us/img/tubemq-add-topic-6.png b/docs/zh-cn/modules/tubemq/img/tubemq-add-topic-6.png
similarity index 100%
rename from docs/en-us/img/tubemq-add-topic-6.png
rename to docs/zh-cn/modules/tubemq/img/tubemq-add-topic-6.png
diff --git a/docs/en-us/img/tubemq-console-gui.png b/docs/zh-cn/modules/tubemq/img/tubemq-console-gui.png
similarity index 100%
rename from docs/en-us/img/tubemq-console-gui.png
rename to docs/zh-cn/modules/tubemq/img/tubemq-console-gui.png
diff --git a/docs/zh-cn/modules/tubemq/img/tubemq-consume-message.png b/docs/zh-cn/modules/tubemq/img/tubemq-consume-message.png
new file mode 100644
index 0000000..1bb14a7
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/tubemq-consume-message.png differ
diff --git a/docs/zh-cn/modules/tubemq/img/tubemq-send-message.png b/docs/zh-cn/modules/tubemq/img/tubemq-send-message.png
new file mode 100644
index 0000000..c0ab65d
Binary files /dev/null and b/docs/zh-cn/modules/tubemq/img/tubemq-send-message.png differ
diff --git a/docs/zh-cn/producer_example.md b/docs/zh-cn/modules/tubemq/producer_example.md
similarity index 96%
rename from docs/zh-cn/producer_example.md
rename to docs/zh-cn/modules/tubemq/producer_example.md
index e71f37d..639c7c5 100644
--- a/docs/zh-cn/producer_example.md
+++ b/docs/zh-cn/modules/tubemq/producer_example.md
@@ -1,5 +1,5 @@
---
-title: 生产者示例 - Apache TubeMQ
+title: 生产者示例 - Apache InLong TubeMQ模块
---
## Producer 示例
@@ -7,8 +7,8 @@ TubeMQ提供了两种方式来初始化 session factory: TubeSingleSessionFactor
- TubeSingleSessionFactory 在整个生命周期只会创建一个 session
- TubeMultiSessionFactory 每次调用都会创建一个session
-1. TubeSingleSessionFactory
- - Send Message Synchronously
+### TubeSingleSessionFactory
+ #### Send Message Synchronously
```java
public final class SyncProducerExample {
@@ -28,10 +28,10 @@ TubeMQ提供了两种方式来初始化 session factory: TubeSingleSessionFactor
}
messageProducer.shutdown();
}
- }
- ```
+ }
+ ```
- - Send Message Asynchronously
+ #### Send Message Asynchronously
```java
public final class AsyncProducerExample {
@@ -62,10 +62,10 @@ TubeMQ提供了两种方式来初始化 session factory: TubeSingleSessionFactor
messageProducer.shutdown();
}
- }
- ```
+ }
+ ```
- - Send Message With Attributes
+ #### Send Message With Attributes
```java
public final class ProducerWithAttributeExample {
@@ -87,9 +87,11 @@ TubeMQ提供了两种方式来初始化 session factory: TubeSingleSessionFactor
messageProducer.sendMessage(message);
messageProducer.shutdown();
}
- }```
+
+ }
+ ```
-- TubeMultiSessionFactory
+### TubeMultiSessionFactory
```java
public class MultiSessionProducerExample {
diff --git a/docs/zh-cn/quick_start.md b/docs/zh-cn/modules/tubemq/quick_start.md
similarity index 72%
rename from docs/zh-cn/quick_start.md
rename to docs/zh-cn/modules/tubemq/quick_start.md
index bd200a1..5b0acf2 100644
--- a/docs/zh-cn/quick_start.md
+++ b/docs/zh-cn/modules/tubemq/quick_start.md
@@ -1,5 +1,5 @@
---
-title: 快速开始 - Apache TubeMQ
+title: 快速开始 - Apache InLong TubeMQ模块
---
## 编译和构建
@@ -26,7 +26,7 @@ mvn clean install
cd module-name (比如: tubemq-client)
mvn test
```
-构建完成之后，在 `tubemq-server/target` 目录下会有 **tubemq-server-[TUBEMQ-VERSION]-bin.tar.gz** 文件。
+构建完成之后，在 `tubemq-server/target` 目录下会有 **apache-inlong-tubemq-server-[TUBEMQ-VERSION]-bin.tar.gz** 文件。
这是 TubeMq 的部署包，包含了脚本、配置文件、依赖以及 web GUI相关的内容。
### 配置IDE开发环境
在IDE中构建和调试源码，需要先运行以下命令：
@@ -55,11 +55,11 @@ docker run -p 8080:8080 -p 8000:8000 -p 8123:8123 --name tubemq -d apachetubemq/
### 部署TubeMQ集群
#### 准备工作
- ZooKeeper集群
-- [tubemq-server-[TUBEMQ-VERSION]-bin.tar.gz](download/download.md)安装包
+- [apache-inlong-tubemq-server-[TUBEMQ-VERSION]-bin.tar.gz](download/download.md)安装包
选择安装路径后，安装包解压后的目录结构如下：
```
-/INSTALL_PATH/tubemq-server-[TUBEMQ-VERSION]-bin/
+/INSTALL_PATH/apache-inlong-tubemq-server-[TUBEMQ-VERSION]-bin/
├── bin
├── conf
├── lib
@@ -72,8 +72,8 @@ TubeMQ 集群包含有两个组件: **Master** 和 **Broker**. Master 和 Broker
| Role | TCP Port | TLS Port | Web Port | Comment |
| ---- | -------- | -------- | -------- | ------- |
-| Master | 8099 | 8199 | 8080 | 元数据存储在 /stage/metadata |
-| Broker | 8123 | 8124 | 8081 | 消息存储在 /stage/msgdata |
+| Master | 8099 | 8199 | 8080 | 元数据存储在 /stage/meta_data |
+| Broker | 8123 | 8124 | 8081 | 消息存储在 /stage/msg_data |
| Zookeeper | 2181 | | | Offset 存储在 /tubemq |
#### 配置Master
@@ -82,7 +82,7 @@ TubeMQ 集群包含有两个组件: **Master** 和 **Broker**. Master 和 Broker
```ini
[master]
hostName=YOUR_SERVER_IP // 替换为当前主机IP
-port=8000
+port=8099
webPort=8080
```
- 访问授权Token
@@ -105,7 +105,7 @@ repHelperHost=FIRST_MASTER_NODE_IP:9001 // helperHost用于创建master集群
编辑resources/velocity.properties
```properties
-file.resource.loader.path=/INSTALL_PATH/tubemq-server-[TUBEMQ-VERSION]-bin/resources/templates
+file.resource.loader.path=/INSTALL_PATH/apache-inlong-tubemq-server-[TUBEMQ-VERSION]-bin/resources/templates
```
- （可选）生产环境，多master HA级别
@@ -129,11 +129,11 @@ webPort=8081
```
- Master地址
```ini
-masterAddressList=MASTER_NODE_IP:8000 //多个master以逗号分隔
+masterAddressList=YOUR_MASTER_IP1:8099,YOUR_MASTER_IP2:8099 //多个master以逗号分隔
```
- 数据目录
```ini
-primaryPath=/stage/msgdata
+primaryPath=/stage/msg_data
```
- ZooKeeper集群地址
```ini
@@ -206,39 +206,27 @@ Broker启动前，首先要在Master上配置Broker元数据，增加Broker相
- 生产消息
-将 `YOUR_MASTER_IP` 替换为实际的IP，然后运行producer:
+将 `YOUR_MASTER_IP:port` 替换为实际的IP和端口，然后运行producer:
+
```bash
-install_path=/INSTALL_PATH/tubemq-server-[TUBEMQ-VERSION]-bin
-java -Dlog4j.configuration=file:${install_path}/conf/tools.log4j.properties \
--Djava.net.preferIPv4Stack=true -cp ${install_path}/lib/*:${install_path}/conf/* \
-org.apache.tubemq.example.MessageProducerExample \
-YOUR_MASTER_IP:8000 demo 100000
+cd /INSTALL_PATH/apache-inlong-tubemq-server-[TUBEMQ-VERSION]-bin
+./bin/tubemq-producer-test.sh --master-servers YOUR_MASTER_IP1:port,YOUR_MASTER_IP2:port --topicName demo
```
+
如果能观察下如下日志，则表示数据发送成功：
-```bash
-[2020-06-04 11:19:04,405] INFO Send demo 1000 message, keyCount is 252 (org.apache.tubemq.example.MessageProducerExample)
-[2020-06-04 11:19:04,652] INFO Send demo 2000 message, keyCount is 502 (org.apache.tubemq.example.MessageProducerExample)
-[2020-06-04 11:19:05,096] INFO Send demo 3000 message, keyCount is 752 (org.apache.tubemq.example.MessageProducerExample)
-[2020-06-04 11:19:05,181] INFO Send demo 4000 message, keyCount is 1002 (org.apache.tubemq.example.MessageProducerExample)
-```
+
+
- 消费消息
-将 `YOUR_MASTER_IP` 替换为实际的IP，然后运行Consumer:
+将 `YOUR_MASTER_IP:port` 替换为实际的IP和端口，然后运行Consumer:
```bash
-install_path=/INSTALL_PATH/tubemq-server-[TUBEMQ-VERSION]-bin
-java -Xmx512m -Dlog4j.configuration=file:${install_path}/conf/tools.log4j.properties \
--Djava.net.preferIPv4Stack=true -cp ${install_path}/lib/*:${install_path}/conf/* \
-org.apache.tubemq.example.MessageConsumerExample \
-YOUR_MASTER_IP:8000 demo demoGroup 3 1 1
+cd /INSTALL_PATH/apache-inlong-tubemq-server-[TUBEMQ-VERSION]-bin
+./bin/tubemq-consumer-test.sh --master-servers YOUR_MASTER_IP1:port,YOUR_MASTER_IP2:port --topicName demo --groupName test_consume
```
+
如果能观察下如下日志，则表示数据被消费者消费到：
+
-```bash
-[2020-06-04 11:20:29,107] INFO Receive messages:270000 (org.apache.tubemq.example.MsgRecvStats)
-[2020-06-04 11:20:31,206] INFO Receive messages:272500 (org.apache.tubemq.example.MsgRecvStats)
-[2020-06-04 11:20:31,590] INFO Receive messages:275000 (org.apache.tubemq.example.MsgRecvStats)
-[2020-06-04 11:20:31,910] INFO Receive messages:277500 (org.apache.tubemq.example.MsgRecvStats)
-```
---
diff --git a/docs/zh-cn/modules/tubemq/tubemq-manager/quick_start.md b/docs/zh-cn/modules/tubemq/tubemq-manager/quick_start.md
new file mode 100644
index 0000000..9a8f3e5
--- /dev/null
+++ b/docs/zh-cn/modules/tubemq/tubemq-manager/quick_start.md
@@ -0,0 +1,134 @@
+## 编译
+
+ mvn clean package
+
+## 部署
+
+环境要求：
+
+mysql
+java(1.8+)
+在dist目录当中，能够找到文件为tubemq-manager-bin.zip
+
+ unzip tubemq-manager-bin.zip
+
+在conf/application.properties中添加mysql信息：
+
+ spring.jpa.hibernate.ddl-auto=update
+ # configuration for manager
+ spring.datasource.url=jdbc:mysql://x.x.x.x:3306/tubemanager
+ spring.datasource.username=xx
+ spring.datasource.password=xxx
+
+添加数据库tubemanager，并启动：
+
+ bin/start-manager.sh
+
+## 使用
+
+### 新建集群
+
+在使用tubeAdmin操作集群之前，首先需要注册集群信息，使用如下接口添加一个集群：
+
+ /v1/cluster?method=add
+
+ POST
+
+参数：
+
+ {
+ "masterIp": "9.23.28.86", (tube master ip)
+ "clusterName": "test",
+ "masterPort": "8000", (tube master port)
+ "masterWebPort": "8080", (tube master web port)
+ "createUser": "test",
+ "token": "abc" (tube token)
+ }
+
+### 操作接口
+
+#### cluster
+查询clusterId以及clusterName全量数据 （get)
+
+示例
+ GET
+ /v1/cluster
+
+返回值
+
+ {
+ "errMsg": "",
+ "errCode": 0,
+ "result": true,
+ "data": "[{\"clusterId\":1,\"clusterName\":\"1124\", \"masterIp\":\"127.0.0.1\"}]"
+ }
+
+#### topic
+
+#####添加topicTask
+
+ type (必填) 请求类型，字段填写：op_query
+ clusterId (必填) 请求集群id
+ addTopicTasks (必填) topicTasks，创建task任务json，
+ user (必填) 之后接入权限验证需要验证用户，这里预留出来
+
+addTopicTasks目前只包括一个字段为topicName
+之后接入region设计会新加入region字段表示不同区域的broker
+目前一个addTopicTask会在cluster中的所有broker创建topic
+
+
+AddTopicTasks 为以下对象的List，可携带多个创建topic请求
+
+ topicName (必填) topic名称
+
+示例
+
+POST
+ /v1/task?method=addTopicTask
+
+ {
+ "clusterId": "1",
+ "addTopicTasks": [{"topicName": "1"}],
+ "user": "test"
+ }
+
+返回json格式样例
+
+ {
+ "errMsg": "There are topic tasks [a12322] already in adding status",
+ "errCode": 200,
+ "result": false,
+ "data": ""
+ }
+
+result为false为写入task失败
+
+
+
+#####查询某一个topic是否创建成功（业务可以写入）
+
+ clusterId (必填) 请求集群id
+ topicName (必填) 查询topic名称
+ user (必填) 之后接入权限验证需要验证用户，这里预留出来
+
+
+示例
+
+POST
+
+ /v1/topic?method=queryCanWrite
+
+ {
+ "clusterId": "2",
+ "topicName": "pzrTestss1123123",
+ "user": "test"
+ }
+
+
+返回json格式样例
+
+ { "result":true, "errCode":0, "errMsg":"OK", }
+ { "result":false, "errCode": 100, "errMsg":"topic thirty5is not writable"}
+ { "result":false, "errCode": 101, "errMsg":"no such topic in master"}
+
+result为false为不可写
\ No newline at end of file
diff --git a/docs/en-us/tubemq_perf_test_vs_Kafka_cn.md b/docs/zh-cn/modules/tubemq/tubemq_perf_test_vs_Kafka_cn.md
similarity index 100%
rename from docs/en-us/tubemq_perf_test_vs_Kafka_cn.md
rename to docs/zh-cn/modules/tubemq/tubemq_perf_test_vs_Kafka_cn.md
diff --git a/site_config/docs.js b/site_config/docs.js
index 969c715..6a4ea2d 100644
--- a/site_config/docs.js
+++ b/site_config/docs.js
@@ -6,15 +6,7 @@ export default {
children: [
{
title: 'Quick Start',
- link: '/en-us/docs/quick_start.html',
- },
- {
- title: 'Producer Example',
- link: '/en-us/docs/producer_example.html',
- },
- {
- title: 'Consumer Example',
- link: '/en-us/docs/consumer_example.html',
+ link: '/en-us/docs/getting_started.html',
},
],
},
@@ -79,15 +71,7 @@ export default {
children: [
{
title: '快速开始',
- link: '/zh-cn/docs/quick_start.html',
- },
- {
- title: '生产者示例',
- link: '/zh-cn/docs/producer_example.html',
- },
- {
- title: '消费者示例',
- link: '/zh-cn/docs/consumer_example.html',
+ link: '/zh-cn/docs/getting_started.html',
},
],
},
@@ -127,12 +111,12 @@ export default {
title: 'API介绍',
children: [
{
- title: 'HTTP API介绍',
- link: '/zh-cn/docs/http_access_api.html',
+ title: 'TubeMQ HTTP API介绍',
+ link: '/zh-cn/docs/modules/tubemq/http_access_api.html',
},
{
- title: 'JAVA SDK API介绍',
- link: '/zh-cn/docs/clients_java.html',
+ title: 'TubeMQ JAVA SDK API介绍',
+ link: '/zh-cn/docs/modules/tubemq/clients_java.html',
},
]
},