You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by gi...@apache.org on 2021/08/09 09:45:43 UTC
[incubator-inlong-website] branch asf-site updated: Automated
deployment: Mon Aug 9 09:45:39 UTC 2021
1472301aa0926760b19b5d654ecdf8379833ab4e
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-inlong-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 943962c Automated deployment: Mon Aug 9 09:45:39 UTC 2021 1472301aa0926760b19b5d654ecdf8379833ab4e
943962c is described below
commit 943962c5999a99821c6d7ee843b9f199ddfe0480
Author: dockerzhang <do...@users.noreply.github.com>
AuthorDate: Mon Aug 9 09:45:39 2021 +0000
Automated deployment: Mon Aug 9 09:45:39 UTC 2021 1472301aa0926760b19b5d654ecdf8379833ab4e
---
docs/en-us/modules/agent/quick_start.md | 4 +-
docs/en-us/modules/dataproxy/quick_start.md | 4 +-
docs/en-us/modules/manager/architecture.md | 13 ++-
docs/en-us/modules/manager/quick_start.md | 133 +++++++-------------------
docs/en-us/quick_start.md | 3 +-
docs/zh-cn/modules/agent/quick_start.md | 4 +-
docs/zh-cn/modules/dataproxy/quick_start.md | 2 +-
docs/zh-cn/modules/manager/architecture.md | 4 +-
docs/zh-cn/modules/manager/quick_start.md | 132 +++++++------------------
docs/zh-cn/quick_start.md | 3 +-
en-us/docs/modules/agent/quick_start.html | 4 +-
en-us/docs/modules/agent/quick_start.json | 2 +-
en-us/docs/modules/agent/quick_start.md | 4 +-
en-us/docs/modules/dataproxy/quick_start.html | 4 +-
en-us/docs/modules/dataproxy/quick_start.json | 2 +-
en-us/docs/modules/dataproxy/quick_start.md | 4 +-
en-us/docs/modules/manager/architecture.html | 6 +-
en-us/docs/modules/manager/architecture.json | 2 +-
en-us/docs/modules/manager/architecture.md | 13 ++-
en-us/docs/modules/manager/quick_start.html | 122 +++++++----------------
en-us/docs/modules/manager/quick_start.json | 2 +-
en-us/docs/modules/manager/quick_start.md | 133 +++++++-------------------
en-us/docs/quick_start.html | 3 +-
en-us/docs/quick_start.json | 2 +-
en-us/docs/quick_start.md | 3 +-
zh-cn/docs/modules/agent/quick_start.html | 4 +-
zh-cn/docs/modules/agent/quick_start.json | 2 +-
zh-cn/docs/modules/agent/quick_start.md | 4 +-
zh-cn/docs/modules/dataproxy/quick_start.html | 2 +-
zh-cn/docs/modules/dataproxy/quick_start.json | 2 +-
zh-cn/docs/modules/dataproxy/quick_start.md | 2 +-
zh-cn/docs/modules/manager/architecture.html | 6 +-
zh-cn/docs/modules/manager/architecture.json | 2 +-
zh-cn/docs/modules/manager/architecture.md | 4 +-
zh-cn/docs/modules/manager/quick_start.html | 119 +++++++----------------
zh-cn/docs/modules/manager/quick_start.json | 2 +-
zh-cn/docs/modules/manager/quick_start.md | 132 +++++++------------------
zh-cn/docs/quick_start.html | 3 +-
zh-cn/docs/quick_start.json | 2 +-
zh-cn/docs/quick_start.md | 3 +-
40 files changed, 261 insertions(+), 636 deletions(-)
diff --git a/docs/en-us/modules/agent/quick_start.md b/docs/en-us/modules/agent/quick_start.md
index d61c883..fa9d80d 100644
--- a/docs/en-us/modules/agent/quick_start.md
+++ b/docs/en-us/modules/agent/quick_start.md
@@ -12,8 +12,8 @@ Online operation needs to pull the configuration from inlong-manager, the config
```ini
agent.fetcher.classname=org.apache.inlong.agent.plugin.fetcher.ManagerFetcher (the class name for fetch tasks, default ManagerFetcher）
agent.local.ip=Write local ip
-agent.manager.vip.http.host=manager open api host
-agent.manager.vip.http.port=manager open api port
+agent.manager.vip.http.host=manager web host
+agent.manager.vip.http.port=manager web port
```
### 1.2 Proxy configuration
diff --git a/docs/en-us/modules/dataproxy/quick_start.md b/docs/en-us/modules/dataproxy/quick_start.md
index 0fdd177..e1274a6 100644
--- a/docs/en-us/modules/dataproxy/quick_start.md
+++ b/docs/en-us/modules/dataproxy/quick_start.md
@@ -14,10 +14,10 @@ notice that conf/flume.conf FLUME_HOME is proxy the directory for proxy inner da
sh prepare_env.sh
```
-### config manager openapi
+### config manager web url
配置文件`conf/common.properties`:
```
-# manager open api
+# manager web
manager_hosts=ip:port
```
diff --git a/docs/en-us/modules/manager/architecture.md b/docs/en-us/modules/manager/architecture.md
index fc683ac..85937b1 100644
--- a/docs/en-us/modules/manager/architecture.md
+++ b/docs/en-us/modules/manager/architecture.md
@@ -16,14 +16,13 @@ title: Architecture Introduction-Apache InLong Manager
##Module division of labor
-|Module |Responsibilities |
+| 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|
+| manager-common | Module common code, entry exception definition, tool class, enumeration, etc.|
+| manager-dao |Database Operation |
+| manager-service |Business Logic Layer |
+| manager-web | Front-end interactive response interface |
+| manager-workflow-engine | Workflow Engine |
## use process
diff --git a/docs/en-us/modules/manager/quick_start.md b/docs/en-us/modules/manager/quick_start.md
index 5871978..ee9bdf2 100644
--- a/docs/en-us/modules/manager/quick_start.md
+++ b/docs/en-us/modules/manager/quick_start.md
@@ -25,129 +25,66 @@ Quick start-Apache inlong-manager
to [Compile and deploy TubeMQ Manager](https://inlong.apache.org/zh-cn/docs/modules/tubemq/tubemq-manager/quick_start.html)
, install and start TubeManager.
-# 2. Deploy and start manager-api
+# 2. Deploy and start manager-web
-**manager-api is a background service that interacts with the front-end page.**
+**manager-web is a background service that interacts with the front-end page.**
## 2.1 Prepare installation files
-All installation files at `inlong-manager-api` directory.
+
+All installation files at `inlong-manager-web` directory.
## 2.2 Modify configuration
-Go to the decompressed `manager-api` directory and modify the `conf/application.yml` file:
+Go to the decompressed `inlong-manager-web` directory and modify the `conf/application.properties` file:
-```yaml
-# manager-api service port number
-server:
- port: 8083
+```properties
+# manager-web service port number
+server.port=8083
# The configuration file used is dev
-spring:
- profiles:
- active: dev
+spring.profiles.active=dev
```
-The dev configuration is specified above, then modify the `conf/application-dev.yml` file:
+The dev configuration is specified above, then modify the `conf/application-dev.properties` file:
-1) Modify the database URL, user name and password:
+1) Modify the database URL, username and password:
- ```yaml
- spring:
- datasource:
- jdbc-url: jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
- username: xxxxxx
- password: xxxxxx
+ ```properties
+ spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8
+ spring.datasource.username=xxxxxx
+ spring.datasource.password=xxxxxx
```
-2) Modify the connection information of the Tube and ZooKeeper clusters, among which `cluster.zk.root` suggests to use
+2) Modify the connection information of the Tube and ZooKeeper clusters, among which `cluster.zk.root` suggests using
the default value:
- ```yaml
- cluster:
- tube:
- manager: http://127.0.0.1:8081 # Manager address of Tube cluster, used to create Topic
- master: 127.0.0.1:8000,127.0.0.1:8010 # Broker used to manage Tube
- clusterId: 1 # Tube cluster ID
- zk:
- url: 127.0.0.1:2181
- root: inlong_hive
- sort.appName: inlong_app # The app name for Sort, default is 'inlong_app'
+ ```properties
+ # Manager address of Tube cluster, used to create Topic
+ cluster.tube.manager=http://127.0.0.1:8081
+ # Broker used to manage Tube
+ cluster.tube.master=127.0.0.1:8000,127.0.0.1:8010
+ # Tube cluster ID
+ cluster.tube.clusterId=1
+
+ # ZK cluster, used to push the configuration of Sort
+ cluster.zk.url=127.0.0.1:2181
+ cluster.zk.root=inlong_hive
+
+ # Sort application name, that is, set the cluster-id parameter of Sort, the default value is "inlong_app"
+ sort.appName=inlong_app
```
## 2.3 Start the service
Enter the decompressed directory, execute `sh bin/startup.sh` to start the service, and check the
-log `tailf log/manager-api.log`. If a log similar to the following appears, the service has started successfully:
-
-```shell
-Started InLongApiApplication in 6.795 seconds (JVM running for 7.565)
-```
-
-# 3. Deploy and start manager-openapi
-
-**manager-openapi is a service that provides interactive interfaces for other components (such as Agent and DataProxy)
-.**
-
-## 3.1 Prepare installation files
-All installation files at `inlong-manager-openapi` directory.
-
-## 3.2 Modify configuration
-
-Go to the decompressed `manager-openapi` directory and modify the `conf/application.yml` file:
-
-```yaml
-# manager-openapi service port number
-server:
- port: 8082
-
-# The configuration file used is dev
-spring:
- profiles:
- active: dev
-```
-
-The dev configuration is specified above, then modify the `conf/application-dev.yml` file:
-
-1) Modify the database URL, user name and password:
-
- ```yaml
- spring:
- datasource:
- jdbc-url: jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
- username: xxxxxx
- password: xxxxxx
- ```
-
-2) Modify the connection information of the Tube and ZooKeeper clusters, among which `cluster.zk.root` suggests to use
- the default value:
-
- ```yaml
- cluster:
- tube:
- manager: http://127.0.0.1:8081 # Manager address of Tube cluster, used to create Topic
- master: 127.0.0.1:8000,127.0.0.1:8010 # Broker used to manage Tube
- clusterId: 1 # Tube cluster ID
- zk:
- url: 127.0.0.1:2181
- root: inlong_hive
- sort.appName: inlong_app # The app name for Sort, default is 'inlong_app'
- ```
-
-## 3.3 Start the service
-
-Enter the decompressed directory, execute `sh bin/startup.sh` to start the service, and check the
-log `tailf log/manager-openapi.log`. If a log similar to the following appears, the service has started successfully:
+log `tailf log/manager-web.log`. If a log similar to the following appears, the service has started successfully:
```shell
-Started InLongOpenApiApplication in 5.341 seconds (JVM running for 6.002)
+Started InLongWebApplication in 6.795 seconds (JVM running for 7.565)
```
-# 4. Service access verification
-
-1) Verify the manager-api service:
-
- Visit address: <http://[manager_api_ip]:[manager_api_port]/api/inlong/manager/doc.html#/home>
+# 3. Service access verification
-2) Verify the manager-openapi service:
+Verify the manager-web service:
- Visit address: <http://[manager_openapi_ip]:[manager_openapi_port]/openapi/inlong/manager/doc.html#/home>
\ No newline at end of file
+Visit address: <http://[manager_web_ip]:[manager_web_port]/api/inlong/manager/doc.html#/home>
diff --git a/docs/en-us/quick_start.md b/docs/en-us/quick_start.md
index 720bbad..b6eab74 100644
--- a/docs/en-us/quick_start.md
+++ b/docs/en-us/quick_start.md
@@ -29,8 +29,7 @@ after compile successfully, you could find distribution file at `inlong-distribu
inlong-agent
inlong-dataproxy
inlong-dataproxy-sdk
-inlong-manager-api
-inlong-manager-openapi
+inlong-manager-web
inlong-sort
inlong-tubemq-manager
inlong-tubemq-server
diff --git a/docs/zh-cn/modules/agent/quick_start.md b/docs/zh-cn/modules/agent/quick_start.md
index 6f24d43..abeed06 100644
--- a/docs/zh-cn/modules/agent/quick_start.md
+++ b/docs/zh-cn/modules/agent/quick_start.md
@@ -11,8 +11,8 @@ agent 支持本地运行以及线上运行，其中线上运行从inlong manager
```ini
agent.fetcher.classname=org.apache.inlong.agent.plugin.fetcher.ManagerFetcher (设置任务获取的类名，默认为ManagerFetcher）
agent.local.ip=写入本机ip
-agent.manager.vip.http.host=manager open api host
-agent.manager.vip.http.port=manager open api port
+agent.manager.vip.http.host=manager web host
+agent.manager.vip.http.port=manager web port
```
### 1.2 DataProxy 相关设置
diff --git a/docs/zh-cn/modules/dataproxy/quick_start.md b/docs/zh-cn/modules/dataproxy/quick_start.md
index 52afb3a..ccde508 100644
--- a/docs/zh-cn/modules/dataproxy/quick_start.md
+++ b/docs/zh-cn/modules/dataproxy/quick_start.md
@@ -17,7 +17,7 @@ sh prepare_env.sh
### 配置manager地址
configuration file `conf/common.properties`:
```
-# manager open api
+# manager web url
manager_hosts=ip:port
```
diff --git a/docs/zh-cn/modules/manager/architecture.md b/docs/zh-cn/modules/manager/architecture.md
index b61cc76..97002cd 100644
--- a/docs/zh-cn/modules/manager/architecture.md
+++ b/docs/zh-cn/modules/manager/architecture.md
@@ -21,11 +21,9 @@ title: 架构介绍 - Apache InLong Manager
| :-----| :---- |
| manager-common | 模块公共代码，入异常定义，工具类，枚举等 |
| manager-dao | 数据库操作 |
-| manager-opapi | 后台开放接口|
| manager-service | 业务逻辑层 |
| manager-web | 前端交互对应接口 |
-| manager-workflow-engin | 工作流引擎|
-
+| manager-workflow-engine | 工作流引擎|
## 系统使用流程
diff --git a/docs/zh-cn/modules/manager/quick_start.md b/docs/zh-cn/modules/manager/quick_start.md
index 67bba33..e8bccf4 100644
--- a/docs/zh-cn/modules/manager/quick_start.md
+++ b/docs/zh-cn/modules/manager/quick_start.md
@@ -3,8 +3,8 @@
---
# 1. 环境准备
-- 安装并启动 MySQL 5.7+，把 inlong-manager 模块中的 `doc/sql/apache_inlong_manager.sql` 文件拷贝到 MySQL 数据库所在的服务器（比如拷贝到 `/data/`
- 目录下），通过下述命令加载此文件，完成表结构及基础数据的初始化：
+- 安装并启动 MySQL 5.7+，把 inlong-manager 模块中的 `doc/sql/apache_inlong_manager.sql` 文件拷贝到 MySQL 数据库所在的服务器
+（比如拷贝到 `/data/` 目录下），通过下述命令加载此文件，完成表结构及基础数据的初始化：
```shell
# 通过用户名和密码，登录 MySQL 服务器：
@@ -22,124 +22,64 @@
- 参照 [编译部署TubeMQ Manager](https://inlong.apache.org/zh-cn/docs/modules/tubemq/tubemq-manager/quick_start.html)，安装并启动
TubeManager。
-# 2. 部署、启动 manager-api
+# 2. 部署、启动 manager-web
-**manager-api 是与前端页面交互的后台服务。**
+**manager-web 是与前端页面交互的后台服务。**
## 2.1 准备安装文件
-安装文件在`inlong-manager-api`目录.
+
+安装文件在 `inlong-manager-web` 目录下。
## 2.2 修改配置
-前往解压后的 `manager-api` 目录，修改 `conf/application.yml` 文件：
+前往 `inlong-manager-web` 目录，修改 `conf/application.properties` 文件：
-```yaml
-# manager-api 服务的端口号
-server:
- port: 8083
+```properties
+# manager-web 服务的端口号
+server.port=8083
-# 使用的配置文件为 dev
-spring:
- profiles:
- active: dev
+# 默认使用的配置文件为 dev
+spring.profiles.active=dev
```
-上面指定了 dev 配置，接下来修改 `conf/application-dev.yml` 文件：
+上面指定了 dev 配置，接下来修改 `conf/application-dev.properties` 文件：
1) 修改数据库 URL、用户名和密码：
- ```yaml
- spring:
- datasource:
- jdbc-url: jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
- username: xxxxxx
- password: xxxxxx
+ ```properties
+ spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8
+ spring.datasource.username=xxxxxx
+ spring.datasource.password=xxxxxx
```
2) 修改 Tube 和 ZooKeeper 集群的连接信息，其中 `cluster.zk.root` 建议使用默认值：
- ```yaml
- cluster:
- tube:
- manager: http://127.0.0.1:8081 # Tube 集群的 Manager 地址，用来创建 Topic
- master: 127.0.0.1:8000,127.0.0.1:8010 # 用来管理 Tube 的 Broker
- clusterId: 1 # Tube 集群的 ID
- zk:
- url: 127.0.0.1:2181
- root: inlong_hive
- sort.appName: inlong_app # Sort 应用名称，即设置 Sort 的 cluster-id 参数，默认值为"inlong_app"
+ ```properties
+ # Tube 集群的 Manager 地址，用来创建 Topic
+ cluster.tube.manager=http://127.0.0.1:8081
+ # 用来管理 Tube 的 Broker
+ cluster.tube.master=127.0.0.1:8000,127.0.0.1:8010
+ # Tube 集群的 ID
+ cluster.tube.clusterId=1
+
+ # ZK 集群，用来推送 Sort 的配置
+ cluster.zk.url=127.0.0.1:2181
+ cluster.zk.root=inlong_hive
+
+ # Sort 应用名称，即设置 Sort 的 cluster-id 参数，默认值为"inlong_app"
+ sort.appName=inlong_app
```
## 2.3 启动服务
-进入解压后的目录，执行 `sh bin/startup.sh` 启动服务，查看日志 `tailf log/manager-api.log`，若出现类似下面的日志，说明服务启动成功：
+进入解压后的目录，执行 `sh bin/startup.sh` 启动服务，查看日志 `tailf log/manager-web.log`，若出现类似下面的日志，说明服务启动成功：
```shell
-Started InLongApiApplication in 6.795 seconds (JVM running for 7.565)
+Started InLongWebApplication in 6.795 seconds (JVM running for 7.565)
```
-# 3. 部署、启动 manager-openapi
-
-**manager-openapi 是为其他组件（如 Agent、DataProxy）提供交互接口的服务。**
-
-## 3.1 准备安装文件
-安装文件在`inlong-manager-openapi`目录.
-
-## 3.2 修改配置
-
-前往解压后的 `manager-openapi` 目录，修改 `conf/application.yml` 文件：
-
-```yaml
-# manager-openapi 服务的端口号
-server:
- port: 8082
-
-# 使用的配置文件为 dev
-spring:
- profiles:
- active: dev
-```
-
-上面指定了 dev 配置，接下来修改 `conf/application-dev.yml` 文件：
-
-1) 修改数据库 URL、用户名和密码：
-
- ```yaml
- spring:
- datasource:
- jdbc-url: jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
- username: xxxxxx
- password: xxxxxx
- ```
-
-2) 修改 Tube 和 ZooKeeper 集群的连接信息，其中 `cluster.zk.root` 建议使用默认值：
-
- ```yaml
- cluster:
- tube:
- manager: http://127.0.0.1:8081 # Tube 集群的 Manager 地址，用来创建 Topic
- master: 127.0.0.1:8000,127.0.0.1:8010 # 用来管理 Tube 的 Broker
- clusterId: 1 # Tube 集群的 ID
- zk:
- url: 127.0.0.1:2181
- root: inlong_hive
- sort.appName: inlong_app # Sort 应用名称，即设置 Sort 的 cluster-id 参数，默认值为"inlong_app"
- ```
-
-## 3.3 启动服务
-
-进入解压后的目录，执行 `sh bin/startup.sh` 启动服务，查看日志 `tailf log/manager-openapi.log`，若出现类似下面的日志，说明服务启动成功：
-
-```shell
-Started InLongOpenApiApplication in 5.341 seconds (JVM running for 6.002)
-```
-
-# 4. 服务访问验证
-
-1) 验证 manager-api 服务：
-
- 访问地址：<http://[manager_api_ip]:[manager_api_port]/api/inlong/manager/doc.html#/home>
+# 3. 服务访问验证
-2) 验证 manager-openapi 服务：
+在浏览器中访问如下地址，验证 manager-web 服务：
- 访问地址：<http://[manager_openapi_ip]:[manager_openapi_port]/openapi/inlong/manager/doc.html#/home>
+地址：<http://[manager_web_ip]:[manager_web_port]/api/inlong/manager/doc.html#/home>
diff --git a/docs/zh-cn/quick_start.md b/docs/zh-cn/quick_start.md
index 4d21a95..df5ba02 100644
--- a/docs/zh-cn/quick_start.md
+++ b/docs/zh-cn/quick_start.md
@@ -28,8 +28,7 @@ $ docker run -v `pwd`:/inlong -w /inlong maven:3.6-openjdk-8 mvn clean install
inlong-agent
inlong-dataproxy
inlong-dataproxy-sdk
-inlong-manager-api
-inlong-manager-openapi
+inlong-manager-web
inlong-sort
inlong-tubemq-manager
inlong-tubemq-server
diff --git a/en-us/docs/modules/agent/quick_start.html b/en-us/docs/modules/agent/quick_start.html
index 39a39a1..ccc93dc 100644
--- a/en-us/docs/modules/agent/quick_start.html
+++ b/en-us/docs/modules/agent/quick_start.html
@@ -20,8 +20,8 @@
<p>Online operation needs to pull the configuration from inlong-manager, the configuration conf/agent.properties is as follows:</p>
<pre><code class="language-ini"><span class="hljs-attr">agent.fetcher.classname</span>=org.apache.inlong.agent.plugin.fetcher.ManagerFetcher (the class name for fetch tasks, default ManagerFetcher）
<span class="hljs-attr">agent.local.ip</span>=Write local ip
-<span class="hljs-attr">agent.manager.vip.http.host</span>=manager open api host
-<span class="hljs-attr">agent.manager.vip.http.port</span>=manager open api port
+<span class="hljs-attr">agent.manager.vip.http.host</span>=manager web host
+<span class="hljs-attr">agent.manager.vip.http.port</span>=manager web port
</code></pre>
<h3>1.2 Proxy configuration</h3>
<p>Create a new folder named .inlong 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</p>
diff --git a/en-us/docs/modules/agent/quick_start.json b/en-us/docs/modules/agent/quick_start.json
index de33126..5c31554 100644
--- a/en-us/docs/modules/agent/quick_start.json
+++ b/en-us/docs/modules/agent/quick_start.json
@@ -1,6 +1,6 @@
{
"filename": "quick_start.md",
- "__html": "<h2>1、Configuration</h2>\n<pre><code>cd inlong-agent\n</code></pre>\n<p>The agent supports two modes of operation: local operation and online operation</p>\n<h3>1.1 Agent configuration</h3>\n<p>Online operation needs to pull the configuration from inlong-manager, the configuration conf/agent.properties is as follows:</p>\n<pre><code class=\"language-ini\"><span class=\"hljs-attr\">agent.fetcher.classname</span>=org.apache.inlong.agent.plugin.fetcher.ManagerFetcher (the class [...]
+ "__html": "<h2>1、Configuration</h2>\n<pre><code>cd inlong-agent\n</code></pre>\n<p>The agent supports two modes of operation: local operation and online operation</p>\n<h3>1.1 Agent configuration</h3>\n<p>Online operation needs to pull the configuration from inlong-manager, the configuration conf/agent.properties is as follows:</p>\n<pre><code class=\"language-ini\"><span class=\"hljs-attr\">agent.fetcher.classname</span>=org.apache.inlong.agent.plugin.fetcher.ManagerFetcher (the class [...]
"link": "/en-us/docs/modules/agent/quick_start.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/modules/agent/quick_start.md b/en-us/docs/modules/agent/quick_start.md
index d61c883..fa9d80d 100644
--- a/en-us/docs/modules/agent/quick_start.md
+++ b/en-us/docs/modules/agent/quick_start.md
@@ -12,8 +12,8 @@ Online operation needs to pull the configuration from inlong-manager, the config
```ini
agent.fetcher.classname=org.apache.inlong.agent.plugin.fetcher.ManagerFetcher (the class name for fetch tasks, default ManagerFetcher）
agent.local.ip=Write local ip
-agent.manager.vip.http.host=manager open api host
-agent.manager.vip.http.port=manager open api port
+agent.manager.vip.http.host=manager web host
+agent.manager.vip.http.port=manager web port
```
### 1.2 Proxy configuration
diff --git a/en-us/docs/modules/dataproxy/quick_start.html b/en-us/docs/modules/dataproxy/quick_start.html
index 1537689..c4bb880 100644
--- a/en-us/docs/modules/dataproxy/quick_start.html
+++ b/en-us/docs/modules/dataproxy/quick_start.html
@@ -22,9 +22,9 @@
<h3>Environmental preparation</h3>
<pre><code>sh prepare_env.sh
</code></pre>
-<h3>config manager openapi</h3>
+<h3>config manager web url</h3>
<p>配置文件<code>conf/common.properties</code>:</p>
-<pre><code># manager open api
+<pre><code># manager web
manager_hosts=ip:port
</code></pre>
<h2>run</h2>
diff --git a/en-us/docs/modules/dataproxy/quick_start.json b/en-us/docs/modules/dataproxy/quick_start.json
index 7ae6259..79cea5e 100644
--- a/en-us/docs/modules/dataproxy/quick_start.json
+++ b/en-us/docs/modules/dataproxy/quick_start.json
@@ -1,6 +1,6 @@
{
"filename": "quick_start.md",
- "__html": "<h2>Deploy DataProxy</h2>\n<p>All deploying files at <code>inlong-dataproxy</code> directory.</p>\n<h3>config TubeMQ master</h3>\n<p><code>tubemq_master_list</code> is the rpc address of TubeMQ Master.</p>\n<pre><code>$ sed -i 's/TUBE_LIST/tubemq_master_list/g' conf/flume.conf\n</code></pre>\n<p>notice that conf/flume.conf FLUME_HOME is proxy the directory for proxy inner data</p>\n<h3>Environmental preparation</h3>\n<pre><code>sh prepare_env.sh\n</code></pre>\n<h3>config ma [...]
+ "__html": "<h2>Deploy DataProxy</h2>\n<p>All deploying files at <code>inlong-dataproxy</code> directory.</p>\n<h3>config TubeMQ master</h3>\n<p><code>tubemq_master_list</code> is the rpc address of TubeMQ Master.</p>\n<pre><code>$ sed -i 's/TUBE_LIST/tubemq_master_list/g' conf/flume.conf\n</code></pre>\n<p>notice that conf/flume.conf FLUME_HOME is proxy the directory for proxy inner data</p>\n<h3>Environmental preparation</h3>\n<pre><code>sh prepare_env.sh\n</code></pre>\n<h3>config ma [...]
"link": "/en-us/docs/modules/dataproxy/quick_start.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/modules/dataproxy/quick_start.md b/en-us/docs/modules/dataproxy/quick_start.md
index 0fdd177..e1274a6 100644
--- a/en-us/docs/modules/dataproxy/quick_start.md
+++ b/en-us/docs/modules/dataproxy/quick_start.md
@@ -14,10 +14,10 @@ notice that conf/flume.conf FLUME_HOME is proxy the directory for proxy inner da
sh prepare_env.sh
```
-### config manager openapi
+### config manager web url
配置文件`conf/common.properties`:
```
-# manager open api
+# manager web
manager_hosts=ip:port
```
diff --git a/en-us/docs/modules/manager/architecture.html b/en-us/docs/modules/manager/architecture.html
index 15dec55..a746c15 100644
--- a/en-us/docs/modules/manager/architecture.html
+++ b/en-us/docs/modules/manager/architecture.html
@@ -44,10 +44,6 @@
<td style="text-align:left">Database Operation</td>
</tr>
<tr>
-<td style="text-align:left">manager-openapi</td>
-<td style="text-align:left">Background open interface</td>
-</tr>
-<tr>
<td style="text-align:left">manager-service</td>
<td style="text-align:left">Business Logic Layer</td>
</tr>
@@ -56,7 +52,7 @@
<td style="text-align:left">Front-end interactive response interface</td>
</tr>
<tr>
-<td style="text-align:left">manager-workflow-engin</td>
+<td style="text-align:left">manager-workflow-engine</td>
<td style="text-align:left">Workflow Engine</td>
</tr>
</tbody>
diff --git a/en-us/docs/modules/manager/architecture.json b/en-us/docs/modules/manager/architecture.json
index d0c519c..aae4079 100644
--- a/en-us/docs/modules/manager/architecture.json
+++ b/en-us/docs/modules/manager/architecture.json
@@ -1,6 +1,6 @@
{
"filename": "architecture.md",
- "__html": "<h2>Introduction to Apache InLong Manager</h2>\n<ul>\n<li>\n<p>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.</p>\n</li>\n<li>\n<p>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, [...]
+ "__html": "<h2>Introduction to Apache InLong Manager</h2>\n<ul>\n<li>\n<p>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.</p>\n</li>\n<li>\n<p>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, [...]
"link": "/en-us/docs/modules/manager/architecture.html",
"meta": {
"title": "Architecture Introduction-Apache InLong Manager"
diff --git a/en-us/docs/modules/manager/architecture.md b/en-us/docs/modules/manager/architecture.md
index fc683ac..85937b1 100644
--- a/en-us/docs/modules/manager/architecture.md
+++ b/en-us/docs/modules/manager/architecture.md
@@ -16,14 +16,13 @@ title: Architecture Introduction-Apache InLong Manager
##Module division of labor
-|Module |Responsibilities |
+| 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|
+| manager-common | Module common code, entry exception definition, tool class, enumeration, etc.|
+| manager-dao |Database Operation |
+| manager-service |Business Logic Layer |
+| manager-web | Front-end interactive response interface |
+| manager-workflow-engine | Workflow Engine |
## use process
diff --git a/en-us/docs/modules/manager/quick_start.html b/en-us/docs/modules/manager/quick_start.html
index ff1f4e3..870bda7 100644
--- a/en-us/docs/modules/manager/quick_start.html
+++ b/en-us/docs/modules/manager/quick_start.html
@@ -38,110 +38,54 @@ to <a href="https://inlong.apache.org/zh-cn/docs/modules/tubemq/tubemq-manager/q
, install and start TubeManager.</p>
</li>
</ul>
-<h1>2. Deploy and start manager-api</h1>
-<p><strong>manager-api is a background service that interacts with the front-end page.</strong></p>
+<h1>2. Deploy and start manager-web</h1>
+<p><strong>manager-web is a background service that interacts with the front-end page.</strong></p>
<h2>2.1 Prepare installation files</h2>
-<p>All installation files at <code>inlong-manager-api</code> directory.</p>
+<p>All installation files at <code>inlong-manager-web</code> directory.</p>
<h2>2.2 Modify configuration</h2>
-<p>Go to the decompressed <code>manager-api</code> directory and modify the <code>conf/application.yml</code> file:</p>
-<pre><code class="language-yaml"><span class="hljs-comment"># manager-api service port number</span>
-<span class="hljs-attr">server:</span>
- <span class="hljs-attr">port:</span> <span class="hljs-number">8083</span>
-
-<span class="hljs-comment"># The configuration file used is dev</span>
-<span class="hljs-attr">spring:</span>
- <span class="hljs-attr">profiles:</span>
- <span class="hljs-attr">active:</span> <span class="hljs-string">dev</span>
+<p>Go to the decompressed <code>inlong-manager-web</code> directory and modify the <code>conf/application.properties</code> file:</p>
+<pre><code class="language-properties"><span class="hljs-comment"># manager-web service port number</span>
+<span class="hljs-meta">server.port</span>=<span class="hljs-string">8083</span>
+<span class="hljs-comment">
+# The configuration file used is dev</span>
+<span class="hljs-meta">spring.profiles.active</span>=<span class="hljs-string">dev</span>
</code></pre>
-<p>The dev configuration is specified above, then modify the <code>conf/application-dev.yml</code> file:</p>
+<p>The dev configuration is specified above, then modify the <code>conf/application-dev.properties</code> file:</p>
<ol>
<li>
-<p>Modify the database URL, user name and password:</p>
-<pre><code class="language-yaml"><span class="hljs-attr">spring:</span>
- <span class="hljs-attr">datasource:</span>
- <span class="hljs-attr">jdbc-url:</span> <span class="hljs-string">jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true</span>
- <span class="hljs-attr">username:</span> <span class="hljs-string">xxxxxx</span>
- <span class="hljs-attr">password:</span> <span class="hljs-string">xxxxxx</span>
+<p>Modify the database URL, username and password:</p>
+<pre><code class="language-properties"><span class="hljs-meta">spring.datasource.jdbc-url</span>=<span class="hljs-string">jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8</span>
+<span class="hljs-meta">spring.datasource.username</span>=<span class="hljs-string">xxxxxx</span>
+<span class="hljs-meta">spring.datasource.password</span>=<span class="hljs-string">xxxxxx</span>
</code></pre>
</li>
<li>
-<p>Modify the connection information of the Tube and ZooKeeper clusters, among which <code>cluster.zk.root</code> suggests to use
+<p>Modify the connection information of the Tube and ZooKeeper clusters, among which <code>cluster.zk.root</code> suggests using
the default value:</p>
-<pre><code class="language-yaml"><span class="hljs-attr">cluster:</span>
- <span class="hljs-attr">tube:</span>
- <span class="hljs-attr">manager:</span> <span class="hljs-string">http://127.0.0.1:8081</span> <span class="hljs-comment"># Manager address of Tube cluster, used to create Topic</span>
- <span class="hljs-attr">master:</span> <span class="hljs-number">127.0</span><span class="hljs-number">.0</span><span class="hljs-number">.1</span><span class="hljs-string">:8000,127.0.0.1:8010</span> <span class="hljs-comment"># Broker used to manage Tube</span>
- <span class="hljs-attr">clusterId:</span> <span class="hljs-number">1</span> <span class="hljs-comment"># Tube cluster ID</span>
- <span class="hljs-attr">zk:</span>
- <span class="hljs-attr">url:</span> <span class="hljs-number">127.0</span><span class="hljs-number">.0</span><span class="hljs-number">.1</span><span class="hljs-string">:2181</span>
- <span class="hljs-attr">root:</span> <span class="hljs-string">inlong_hive</span>
-<span class="hljs-attr">sort.appName:</span> <span class="hljs-string">inlong_app</span> <span class="hljs-comment"># The app name for Sort, default is 'inlong_app'</span>
+<pre><code class="language-properties"><span class="hljs-comment"># Manager address of Tube cluster, used to create Topic</span>
+<span class="hljs-meta">cluster.tube.manager</span>=<span class="hljs-string">http://127.0.0.1:8081</span>
+<span class="hljs-comment"># Broker used to manage Tube</span>
+<span class="hljs-meta">cluster.tube.master</span>=<span class="hljs-string">127.0.0.1:8000,127.0.0.1:8010</span>
+<span class="hljs-comment"># Tube cluster ID</span>
+<span class="hljs-meta">cluster.tube.clusterId</span>=<span class="hljs-string">1</span>
+<span class="hljs-comment">
+# ZK cluster, used to push the configuration of Sort</span>
+<span class="hljs-meta">cluster.zk.url</span>=<span class="hljs-string">127.0.0.1:2181</span>
+<span class="hljs-meta">cluster.zk.root</span>=<span class="hljs-string">inlong_hive</span>
+<span class="hljs-comment">
+# Sort application name, that is, set the cluster-id parameter of Sort, the default value is "inlong_app"</span>
+<span class="hljs-meta">sort.appName</span>=<span class="hljs-string">inlong_app</span>
</code></pre>
</li>
</ol>
<h2>2.3 Start the service</h2>
<p>Enter the decompressed directory, execute <code>sh bin/startup.sh</code> to start the service, and check the
-log <code>tailf log/manager-api.log</code>. If a log similar to the following appears, the service has started successfully:</p>
-<pre><code class="language-shell">Started InLongApiApplication in 6.795 seconds (JVM running for 7.565)
-</code></pre>
-<h1>3. Deploy and start manager-openapi</h1>
-<p><strong>manager-openapi is a service that provides interactive interfaces for other components (such as Agent and DataProxy)
-.</strong></p>
-<h2>3.1 Prepare installation files</h2>
-<p>All installation files at <code>inlong-manager-openapi</code> directory.</p>
-<h2>3.2 Modify configuration</h2>
-<p>Go to the decompressed <code>manager-openapi</code> directory and modify the <code>conf/application.yml</code> file:</p>
-<pre><code class="language-yaml"><span class="hljs-comment"># manager-openapi service port number</span>
-<span class="hljs-attr">server:</span>
- <span class="hljs-attr">port:</span> <span class="hljs-number">8082</span>
-
-<span class="hljs-comment"># The configuration file used is dev</span>
-<span class="hljs-attr">spring:</span>
- <span class="hljs-attr">profiles:</span>
- <span class="hljs-attr">active:</span> <span class="hljs-string">dev</span>
-</code></pre>
-<p>The dev configuration is specified above, then modify the <code>conf/application-dev.yml</code> file:</p>
-<ol>
-<li>
-<p>Modify the database URL, user name and password:</p>
-<pre><code class="language-yaml"><span class="hljs-attr">spring:</span>
- <span class="hljs-attr">datasource:</span>
- <span class="hljs-attr">jdbc-url:</span> <span class="hljs-string">jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true</span>
- <span class="hljs-attr">username:</span> <span class="hljs-string">xxxxxx</span>
- <span class="hljs-attr">password:</span> <span class="hljs-string">xxxxxx</span>
-</code></pre>
-</li>
-<li>
-<p>Modify the connection information of the Tube and ZooKeeper clusters, among which <code>cluster.zk.root</code> suggests to use
-the default value:</p>
-<pre><code class="language-yaml"><span class="hljs-attr">cluster:</span>
- <span class="hljs-attr">tube:</span>
- <span class="hljs-attr">manager:</span> <span class="hljs-string">http://127.0.0.1:8081</span> <span class="hljs-comment"># Manager address of Tube cluster, used to create Topic</span>
- <span class="hljs-attr">master:</span> <span class="hljs-number">127.0</span><span class="hljs-number">.0</span><span class="hljs-number">.1</span><span class="hljs-string">:8000,127.0.0.1:8010</span> <span class="hljs-comment"># Broker used to manage Tube</span>
- <span class="hljs-attr">clusterId:</span> <span class="hljs-number">1</span> <span class="hljs-comment"># Tube cluster ID</span>
- <span class="hljs-attr">zk:</span>
- <span class="hljs-attr">url:</span> <span class="hljs-number">127.0</span><span class="hljs-number">.0</span><span class="hljs-number">.1</span><span class="hljs-string">:2181</span>
- <span class="hljs-attr">root:</span> <span class="hljs-string">inlong_hive</span>
-<span class="hljs-attr">sort.appName:</span> <span class="hljs-string">inlong_app</span> <span class="hljs-comment"># The app name for Sort, default is 'inlong_app'</span>
-</code></pre>
-</li>
-</ol>
-<h2>3.3 Start the service</h2>
-<p>Enter the decompressed directory, execute <code>sh bin/startup.sh</code> to start the service, and check the
-log <code>tailf log/manager-openapi.log</code>. If a log similar to the following appears, the service has started successfully:</p>
-<pre><code class="language-shell">Started InLongOpenApiApplication in 5.341 seconds (JVM running for 6.002)
+log <code>tailf log/manager-web.log</code>. If a log similar to the following appears, the service has started successfully:</p>
+<pre><code class="language-shell">Started InLongWebApplication in 6.795 seconds (JVM running for 7.565)
</code></pre>
-<h1>4. Service access verification</h1>
-<ol>
-<li>
-<p>Verify the manager-api service:</p>
-<p>Visit address: <a href="http://%5Bmanager_api_ip%5D:%5Bmanager_api_port%5D/api/inlong/manager/doc.html#/home">http://[manager_api_ip]:[manager_api_port]/api/inlong/manager/doc.html#/home</a></p>
-</li>
-<li>
-<p>Verify the manager-openapi service:</p>
-<p>Visit address: <a href="http://%5Bmanager_openapi_ip%5D:%5Bmanager_openapi_port%5D/openapi/inlong/manager/doc.html#/home">http://[manager_openapi_ip]:[manager_openapi_port]/openapi/inlong/manager/doc.html#/home</a></p>
-</li>
-</ol>
+<h1>3. Service access verification</h1>
+<p>Verify the manager-web service:</p>
+<p>Visit address: <a href="http://%5Bmanager_web_ip%5D:%5Bmanager_web_port%5D/api/inlong/manager/doc.html#/home">http://[manager_web_ip]:[manager_web_port]/api/inlong/manager/doc.html#/home</a></p>
</div></section><footer class="footer-container"><div class="footer-body"><img src="/img/incubator-logo.svg"/><div class="cols-container"><div class="col col-24"><p>Apache InLong (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with [...]
<script src="https://f.alicdn.com/react/15.4.1/react-with-addons.min.js"></script>
<script src="https://f.alicdn.com/react/15.4.1/react-dom.min.js"></script>
diff --git a/en-us/docs/modules/manager/quick_start.json b/en-us/docs/modules/manager/quick_start.json
index 65a5f64..f4dc7d3 100644
--- a/en-us/docs/modules/manager/quick_start.json
+++ b/en-us/docs/modules/manager/quick_start.json
@@ -1,6 +1,6 @@
{
"filename": "quick_start.md",
- "__html": "<h1>1. Environmental preparation</h1>\n<ul>\n<li>\n<p>Install and start MySQL 5.7+, copy the <code>doc/sql/apache_inlong_manager.sql</code> file in the inlong-manager module to the\nserver where the MySQL database is located (for example, copy to <code>/data/</code> directory), load this file through the\nfollowing command to complete the initialization of the table structure and basic data:</p>\n<pre><code class=\"language-shell\"><span class=\"hljs-meta\">#</span><span cla [...]
+ "__html": "<h1>1. Environmental preparation</h1>\n<ul>\n<li>\n<p>Install and start MySQL 5.7+, copy the <code>doc/sql/apache_inlong_manager.sql</code> file in the inlong-manager module to the\nserver where the MySQL database is located (for example, copy to <code>/data/</code> directory), load this file through the\nfollowing command to complete the initialization of the table structure and basic data:</p>\n<pre><code class=\"language-shell\"><span class=\"hljs-meta\">#</span><span cla [...]
"link": "/en-us/docs/modules/manager/quick_start.html",
"meta": {
"Quick start-Apache inlong-manager": ""
diff --git a/en-us/docs/modules/manager/quick_start.md b/en-us/docs/modules/manager/quick_start.md
index 5871978..ee9bdf2 100644
--- a/en-us/docs/modules/manager/quick_start.md
+++ b/en-us/docs/modules/manager/quick_start.md
@@ -25,129 +25,66 @@ Quick start-Apache inlong-manager
to [Compile and deploy TubeMQ Manager](https://inlong.apache.org/zh-cn/docs/modules/tubemq/tubemq-manager/quick_start.html)
, install and start TubeManager.
-# 2. Deploy and start manager-api
+# 2. Deploy and start manager-web
-**manager-api is a background service that interacts with the front-end page.**
+**manager-web is a background service that interacts with the front-end page.**
## 2.1 Prepare installation files
-All installation files at `inlong-manager-api` directory.
+
+All installation files at `inlong-manager-web` directory.
## 2.2 Modify configuration
-Go to the decompressed `manager-api` directory and modify the `conf/application.yml` file:
+Go to the decompressed `inlong-manager-web` directory and modify the `conf/application.properties` file:
-```yaml
-# manager-api service port number
-server:
- port: 8083
+```properties
+# manager-web service port number
+server.port=8083
# The configuration file used is dev
-spring:
- profiles:
- active: dev
+spring.profiles.active=dev
```
-The dev configuration is specified above, then modify the `conf/application-dev.yml` file:
+The dev configuration is specified above, then modify the `conf/application-dev.properties` file:
-1) Modify the database URL, user name and password:
+1) Modify the database URL, username and password:
- ```yaml
- spring:
- datasource:
- jdbc-url: jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
- username: xxxxxx
- password: xxxxxx
+ ```properties
+ spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8
+ spring.datasource.username=xxxxxx
+ spring.datasource.password=xxxxxx
```
-2) Modify the connection information of the Tube and ZooKeeper clusters, among which `cluster.zk.root` suggests to use
+2) Modify the connection information of the Tube and ZooKeeper clusters, among which `cluster.zk.root` suggests using
the default value:
- ```yaml
- cluster:
- tube:
- manager: http://127.0.0.1:8081 # Manager address of Tube cluster, used to create Topic
- master: 127.0.0.1:8000,127.0.0.1:8010 # Broker used to manage Tube
- clusterId: 1 # Tube cluster ID
- zk:
- url: 127.0.0.1:2181
- root: inlong_hive
- sort.appName: inlong_app # The app name for Sort, default is 'inlong_app'
+ ```properties
+ # Manager address of Tube cluster, used to create Topic
+ cluster.tube.manager=http://127.0.0.1:8081
+ # Broker used to manage Tube
+ cluster.tube.master=127.0.0.1:8000,127.0.0.1:8010
+ # Tube cluster ID
+ cluster.tube.clusterId=1
+
+ # ZK cluster, used to push the configuration of Sort
+ cluster.zk.url=127.0.0.1:2181
+ cluster.zk.root=inlong_hive
+
+ # Sort application name, that is, set the cluster-id parameter of Sort, the default value is "inlong_app"
+ sort.appName=inlong_app
```
## 2.3 Start the service
Enter the decompressed directory, execute `sh bin/startup.sh` to start the service, and check the
-log `tailf log/manager-api.log`. If a log similar to the following appears, the service has started successfully:
-
-```shell
-Started InLongApiApplication in 6.795 seconds (JVM running for 7.565)
-```
-
-# 3. Deploy and start manager-openapi
-
-**manager-openapi is a service that provides interactive interfaces for other components (such as Agent and DataProxy)
-.**
-
-## 3.1 Prepare installation files
-All installation files at `inlong-manager-openapi` directory.
-
-## 3.2 Modify configuration
-
-Go to the decompressed `manager-openapi` directory and modify the `conf/application.yml` file:
-
-```yaml
-# manager-openapi service port number
-server:
- port: 8082
-
-# The configuration file used is dev
-spring:
- profiles:
- active: dev
-```
-
-The dev configuration is specified above, then modify the `conf/application-dev.yml` file:
-
-1) Modify the database URL, user name and password:
-
- ```yaml
- spring:
- datasource:
- jdbc-url: jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
- username: xxxxxx
- password: xxxxxx
- ```
-
-2) Modify the connection information of the Tube and ZooKeeper clusters, among which `cluster.zk.root` suggests to use
- the default value:
-
- ```yaml
- cluster:
- tube:
- manager: http://127.0.0.1:8081 # Manager address of Tube cluster, used to create Topic
- master: 127.0.0.1:8000,127.0.0.1:8010 # Broker used to manage Tube
- clusterId: 1 # Tube cluster ID
- zk:
- url: 127.0.0.1:2181
- root: inlong_hive
- sort.appName: inlong_app # The app name for Sort, default is 'inlong_app'
- ```
-
-## 3.3 Start the service
-
-Enter the decompressed directory, execute `sh bin/startup.sh` to start the service, and check the
-log `tailf log/manager-openapi.log`. If a log similar to the following appears, the service has started successfully:
+log `tailf log/manager-web.log`. If a log similar to the following appears, the service has started successfully:
```shell
-Started InLongOpenApiApplication in 5.341 seconds (JVM running for 6.002)
+Started InLongWebApplication in 6.795 seconds (JVM running for 7.565)
```
-# 4. Service access verification
-
-1) Verify the manager-api service:
-
- Visit address: <http://[manager_api_ip]:[manager_api_port]/api/inlong/manager/doc.html#/home>
+# 3. Service access verification
-2) Verify the manager-openapi service:
+Verify the manager-web service:
- Visit address: <http://[manager_openapi_ip]:[manager_openapi_port]/openapi/inlong/manager/doc.html#/home>
\ No newline at end of file
+Visit address: <http://[manager_web_ip]:[manager_web_port]/api/inlong/manager/doc.html#/home>
diff --git a/en-us/docs/quick_start.html b/en-us/docs/quick_start.html
index d025a0a..0dad98e 100644
--- a/en-us/docs/quick_start.html
+++ b/en-us/docs/quick_start.html
@@ -32,8 +32,7 @@ $ docker run -v `pwd`:/inlong -w /inlong maven:3.6-openjdk-8 mvn clean install
<pre><code>inlong-agent
inlong-dataproxy
inlong-dataproxy-sdk
-inlong-manager-api
-inlong-manager-openapi
+inlong-manager-web
inlong-sort
inlong-tubemq-manager
inlong-tubemq-server
diff --git a/en-us/docs/quick_start.json b/en-us/docs/quick_start.json
index 39a6a2c..ff12fab 100644
--- a/en-us/docs/quick_start.json
+++ b/en-us/docs/quick_start.json
@@ -1,6 +1,6 @@
{
"filename": "quick_start.md",
- "__html": "<p>This section contains a quick start guide to help you get started with Apache InLong.</p>\n<h2>Overall architecture</h2>\n<img src=\"../../img/inlong_architecture.png\" align=\"center\" alt=\"Apache InLong\"/>\n<p><a href=\"https://inlong.apache.org\">Apache InLong</a>(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 t [...]
+ "__html": "<p>This section contains a quick start guide to help you get started with Apache InLong.</p>\n<h2>Overall architecture</h2>\n<img src=\"../../img/inlong_architecture.png\" align=\"center\" alt=\"Apache InLong\"/>\n<p><a href=\"https://inlong.apache.org\">Apache InLong</a>(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 t [...]
"link": "/en-us/docs/quick_start.html",
"meta": {
"title": "Getting Started - Apache InLong"
diff --git a/en-us/docs/quick_start.md b/en-us/docs/quick_start.md
index 720bbad..b6eab74 100644
--- a/en-us/docs/quick_start.md
+++ b/en-us/docs/quick_start.md
@@ -29,8 +29,7 @@ after compile successfully, you could find distribution file at `inlong-distribu
inlong-agent
inlong-dataproxy
inlong-dataproxy-sdk
-inlong-manager-api
-inlong-manager-openapi
+inlong-manager-web
inlong-sort
inlong-tubemq-manager
inlong-tubemq-server
diff --git a/zh-cn/docs/modules/agent/quick_start.html b/zh-cn/docs/modules/agent/quick_start.html
index f32b6a3..de566b5 100644
--- a/zh-cn/docs/modules/agent/quick_start.html
+++ b/zh-cn/docs/modules/agent/quick_start.html
@@ -20,8 +20,8 @@
<p>线上运行需要从inlong-manager拉取配置，配置conf/agent.properties如下：</p>
<pre><code class="language-ini"><span class="hljs-attr">agent.fetcher.classname</span>=org.apache.inlong.agent.plugin.fetcher.ManagerFetcher (设置任务获取的类名，默认为ManagerFetcher）
<span class="hljs-attr">agent.local.ip</span>=写入本机ip
-<span class="hljs-attr">agent.manager.vip.http.host</span>=manager open api host
-<span class="hljs-attr">agent.manager.vip.http.port</span>=manager open api port
+<span class="hljs-attr">agent.manager.vip.http.host</span>=manager web host
+<span class="hljs-attr">agent.manager.vip.http.port</span>=manager web port
</code></pre>
<h3>1.2 DataProxy 相关设置</h3>
<p>在agent目录下新建.inlong文件夹，内部新建bid+.local文件，例如设置的发送bid为a, 则新建a.local文件</p>
diff --git a/zh-cn/docs/modules/agent/quick_start.json b/zh-cn/docs/modules/agent/quick_start.json
index 26efada..2a6d519 100644
--- a/zh-cn/docs/modules/agent/quick_start.json
+++ b/zh-cn/docs/modules/agent/quick_start.json
@@ -1,6 +1,6 @@
{
"filename": "quick_start.md",
- "__html": "<h2>1、配置</h2>\n<pre><code>cd inlong-agent\n</code></pre>\n<p>agent 支持本地运行以及线上运行，其中线上运行从inlong manager拉取任务，本地运行可使用http请求提交任务</p>\n<h3>1.1 Agent 线上运行相关设置</h3>\n<p>线上运行需要从inlong-manager拉取配置，配置conf/agent.properties如下：</p>\n<pre><code class=\"language-ini\"><span class=\"hljs-attr\">agent.fetcher.classname</span>=org.apache.inlong.agent.plugin.fetcher.ManagerFetcher (设置任务获取的类名，默认为ManagerFetcher）\n<span class=\"hljs-attr\">agent.local.ip</span>=写入本机ip\n<span class=\"hljs-attr\">ag [...]
+ "__html": "<h2>1、配置</h2>\n<pre><code>cd inlong-agent\n</code></pre>\n<p>agent 支持本地运行以及线上运行，其中线上运行从inlong manager拉取任务，本地运行可使用http请求提交任务</p>\n<h3>1.1 Agent 线上运行相关设置</h3>\n<p>线上运行需要从inlong-manager拉取配置，配置conf/agent.properties如下：</p>\n<pre><code class=\"language-ini\"><span class=\"hljs-attr\">agent.fetcher.classname</span>=org.apache.inlong.agent.plugin.fetcher.ManagerFetcher (设置任务获取的类名，默认为ManagerFetcher）\n<span class=\"hljs-attr\">agent.local.ip</span>=写入本机ip\n<span class=\"hljs-attr\">ag [...]
"link": "/zh-cn/docs/modules/agent/quick_start.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/modules/agent/quick_start.md b/zh-cn/docs/modules/agent/quick_start.md
index 6f24d43..abeed06 100644
--- a/zh-cn/docs/modules/agent/quick_start.md
+++ b/zh-cn/docs/modules/agent/quick_start.md
@@ -11,8 +11,8 @@ agent 支持本地运行以及线上运行，其中线上运行从inlong manager
```ini
agent.fetcher.classname=org.apache.inlong.agent.plugin.fetcher.ManagerFetcher (设置任务获取的类名，默认为ManagerFetcher）
agent.local.ip=写入本机ip
-agent.manager.vip.http.host=manager open api host
-agent.manager.vip.http.port=manager open api port
+agent.manager.vip.http.host=manager web host
+agent.manager.vip.http.port=manager web port
```
### 1.2 DataProxy 相关设置
diff --git a/zh-cn/docs/modules/dataproxy/quick_start.html b/zh-cn/docs/modules/dataproxy/quick_start.html
index 0ac9bf4..628062b 100644
--- a/zh-cn/docs/modules/dataproxy/quick_start.html
+++ b/zh-cn/docs/modules/dataproxy/quick_start.html
@@ -24,7 +24,7 @@
</code></pre>
<h3>配置manager地址</h3>
<p>configuration file <code>conf/common.properties</code>:</p>
-<pre><code># manager open api
+<pre><code># manager web url
manager_hosts=ip:port
</code></pre>
<h2>启动</h2>
diff --git a/zh-cn/docs/modules/dataproxy/quick_start.json b/zh-cn/docs/modules/dataproxy/quick_start.json
index 0aa3311..ee9d56c 100644
--- a/zh-cn/docs/modules/dataproxy/quick_start.json
+++ b/zh-cn/docs/modules/dataproxy/quick_start.json
@@ -1,6 +1,6 @@
{
"filename": "quick_start.md",
- "__html": "<h2>部署 DataProxy</h2>\n<p>所有安装文件在<code>inlong-dataproxy</code>目录。</p>\n<h3>配置tube地址和端口号</h3>\n<p><code>tubemq_master_list</code>是TubeMQ master rpc地址，多个逗号分隔。</p>\n<pre><code>$ sed -i 's/TUBE_LIST/tubemq_master_list/g' conf/flume.conf\n</code></pre>\n<p>注意conf/flume.conf中FLUME_HOME为proxy的中间数据文件存放地址</p>\n<h3>环境准备</h3>\n<pre><code>sh prepare_env.sh\n</code></pre>\n<h3>配置manager地址</h3>\n<p>configuration file <code>conf/common.properties</code>:</p>\n<pre><code># manager open api [...]
+ "__html": "<h2>部署 DataProxy</h2>\n<p>所有安装文件在<code>inlong-dataproxy</code>目录。</p>\n<h3>配置tube地址和端口号</h3>\n<p><code>tubemq_master_list</code>是TubeMQ master rpc地址，多个逗号分隔。</p>\n<pre><code>$ sed -i 's/TUBE_LIST/tubemq_master_list/g' conf/flume.conf\n</code></pre>\n<p>注意conf/flume.conf中FLUME_HOME为proxy的中间数据文件存放地址</p>\n<h3>环境准备</h3>\n<pre><code>sh prepare_env.sh\n</code></pre>\n<h3>配置manager地址</h3>\n<p>configuration file <code>conf/common.properties</code>:</p>\n<pre><code># manager web url \ [...]
"link": "/zh-cn/docs/modules/dataproxy/quick_start.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/modules/dataproxy/quick_start.md b/zh-cn/docs/modules/dataproxy/quick_start.md
index 52afb3a..ccde508 100644
--- a/zh-cn/docs/modules/dataproxy/quick_start.md
+++ b/zh-cn/docs/modules/dataproxy/quick_start.md
@@ -17,7 +17,7 @@ sh prepare_env.sh
### 配置manager地址
configuration file `conf/common.properties`:
```
-# manager open api
+# manager web url
manager_hosts=ip:port
```
diff --git a/zh-cn/docs/modules/manager/architecture.html b/zh-cn/docs/modules/manager/architecture.html
index fb4b4a6..0069172 100644
--- a/zh-cn/docs/modules/manager/architecture.html
+++ b/zh-cn/docs/modules/manager/architecture.html
@@ -44,10 +44,6 @@
<td style="text-align:left">数据库操作</td>
</tr>
<tr>
-<td style="text-align:left">manager-opapi</td>
-<td style="text-align:left">后台开放接口</td>
-</tr>
-<tr>
<td style="text-align:left">manager-service</td>
<td style="text-align:left">业务逻辑层</td>
</tr>
@@ -56,7 +52,7 @@
<td style="text-align:left">前端交互对应接口</td>
</tr>
<tr>
-<td style="text-align:left">manager-workflow-engin</td>
+<td style="text-align:left">manager-workflow-engine</td>
<td style="text-align:left">工作流引擎</td>
</tr>
</tbody>
diff --git a/zh-cn/docs/modules/manager/architecture.json b/zh-cn/docs/modules/manager/architecture.json
index c6722df..b86f719 100644
--- a/zh-cn/docs/modules/manager/architecture.json
+++ b/zh-cn/docs/modules/manager/architecture.json
@@ -1,6 +1,6 @@
{
"filename": "architecture.md",
- "__html": "<h2>Apache InLong Manager介绍</h2>\n<ul>\n<li>\n<p>目标定位：Apache inlong 定位为一站式数据接入解决方案，提供完整覆盖大数据接入场景从数据采集、传输、分拣、落地的技术能力。</p>\n</li>\n<li>\n<p>平台价值：用户可以通过平台中自带的管理、配置平台完成任务的配置、管理、指标监控，同时通过平台在流程中各主要环节提供SPI扩展点按需要实现自定义逻辑。保证功能稳定高效的同时降低平台使用门槛。</p>\n</li>\n<li>\n<p>Apache InLong Manager作为整个数据接入平台面向用户的统一管理入口，用户登录后会根据对应角色提供不同的功能权限以及数据权限。页面提供平台各基础集群（如mq、分拣）维护入口，可随时查看维护基本信息、容量规划调整。同时业务用户可完成数据接入任务的创建、修改维护、指标查看、接入对账等功能。其对应的后台服务在用�
��创建并启动任务的同时会与底层各模块进行数据交互，将各模块需要执行的任务通过合理的方式下发。起到协调串联后台业务执行流程的作用。 [...]
+ "__html": "<h2>Apache InLong Manager介绍</h2>\n<ul>\n<li>\n<p>目标定位：Apache inlong 定位为一站式数据接入解决方案，提供完整覆盖大数据接入场景从数据采集、传输、分拣、落地的技术能力。</p>\n</li>\n<li>\n<p>平台价值：用户可以通过平台中自带的管理、配置平台完成任务的配置、管理、指标监控，同时通过平台在流程中各主要环节提供SPI扩展点按需要实现自定义逻辑。保证功能稳定高效的同时降低平台使用门槛。</p>\n</li>\n<li>\n<p>Apache InLong Manager作为整个数据接入平台面向用户的统一管理入口，用户登录后会根据对应角色提供不同的功能权限以及数据权限。页面提供平台各基础集群（如mq、分拣）维护入口，可随时查看维护基本信息、容量规划调整。同时业务用户可完成数据接入任务的创建、修改维护、指标查看、接入对账等功能。其对应的后台服务在用�
��创建并启动任务的同时会与底层各模块进行数据交互，将各模块需要执行的任务通过合理的方式下发。起到协调串联后台业务执行流程的作用。 [...]
"link": "/zh-cn/docs/modules/manager/architecture.html",
"meta": {
"title": "架构介绍 - Apache InLong Manager"
diff --git a/zh-cn/docs/modules/manager/architecture.md b/zh-cn/docs/modules/manager/architecture.md
index b61cc76..97002cd 100644
--- a/zh-cn/docs/modules/manager/architecture.md
+++ b/zh-cn/docs/modules/manager/architecture.md
@@ -21,11 +21,9 @@ title: 架构介绍 - Apache InLong Manager
| :-----| :---- |
| manager-common | 模块公共代码，入异常定义，工具类，枚举等 |
| manager-dao | 数据库操作 |
-| manager-opapi | 后台开放接口|
| manager-service | 业务逻辑层 |
| manager-web | 前端交互对应接口 |
-| manager-workflow-engin | 工作流引擎|
-
+| manager-workflow-engine | 工作流引擎|
## 系统使用流程
diff --git a/zh-cn/docs/modules/manager/quick_start.html b/zh-cn/docs/modules/manager/quick_start.html
index a09ce51..1b8e36c 100644
--- a/zh-cn/docs/modules/manager/quick_start.html
+++ b/zh-cn/docs/modules/manager/quick_start.html
@@ -15,8 +15,8 @@
<div id="root"><div class="documentation-page" data-reactroot=""><header class="header-container header-container-normal"><div class="header-body"><a href="/zh-cn/index.html"><a href="//www.apache.org"><img class="logo apache" style="width:120px" src="/img/asf_logo.svg"/></a><div class="logo-split"></div><img class="logo tube" style="width:120px;top:12px;position:absolute" src="/img/Tube logo.svg"/></a><div class="search search-normal"><span class="icon-search"></span></div><span class= [...]
<ul>
<li>
-<p>安装并启动 MySQL 5.7+，把 inlong-manager 模块中的 <code>doc/sql/apache_inlong_manager.sql</code> 文件拷贝到 MySQL 数据库所在的服务器（比如拷贝到 <code>/data/</code>
-目录下），通过下述命令加载此文件，完成表结构及基础数据的初始化：</p>
+<p>安装并启动 MySQL 5.7+，把 inlong-manager 模块中的 <code>doc/sql/apache_inlong_manager.sql</code> 文件拷贝到 MySQL 数据库所在的服务器
+（比如拷贝到 <code>/data/</code> 目录下），通过下述命令加载此文件，完成表结构及基础数据的初始化：</p>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span class="bash"> 通过用户名和密码，登录 MySQL 服务器：</span>
mysql -u xxx -p xxx
...
@@ -35,105 +35,52 @@ USE apache_inlong_manager;
TubeManager。</p>
</li>
</ul>
-<h1>2. 部署、启动 manager-api</h1>
-<p><strong>manager-api 是与前端页面交互的后台服务。</strong></p>
+<h1>2. 部署、启动 manager-web</h1>
+<p><strong>manager-web 是与前端页面交互的后台服务。</strong></p>
<h2>2.1 准备安装文件</h2>
-<p>安装文件在<code>inlong-manager-api</code>目录.</p>
+<p>安装文件在 <code>inlong-manager-web</code> 目录下。</p>
<h2>2.2 修改配置</h2>
-<p>前往解压后的 <code>manager-api</code> 目录，修改 <code>conf/application.yml</code> 文件：</p>
-<pre><code class="language-yaml"><span class="hljs-comment"># manager-api 服务的端口号</span>
-<span class="hljs-attr">server:</span>
- <span class="hljs-attr">port:</span> <span class="hljs-number">8083</span>
-
-<span class="hljs-comment"># 使用的配置文件为 dev</span>
-<span class="hljs-attr">spring:</span>
- <span class="hljs-attr">profiles:</span>
- <span class="hljs-attr">active:</span> <span class="hljs-string">dev</span>
+<p>前往 <code>inlong-manager-web</code> 目录，修改 <code>conf/application.properties</code> 文件：</p>
+<pre><code class="language-properties"><span class="hljs-comment"># manager-web 服务的端口号</span>
+<span class="hljs-meta">server.port</span>=<span class="hljs-string">8083</span>
+<span class="hljs-comment">
+# 默认使用的配置文件为 dev</span>
+<span class="hljs-meta">spring.profiles.active</span>=<span class="hljs-string">dev</span>
</code></pre>
-<p>上面指定了 dev 配置，接下来修改 <code>conf/application-dev.yml</code> 文件：</p>
+<p>上面指定了 dev 配置，接下来修改 <code>conf/application-dev.properties</code> 文件：</p>
<ol>
<li>
<p>修改数据库 URL、用户名和密码：</p>
-<pre><code class="language-yaml"><span class="hljs-attr">spring:</span>
- <span class="hljs-attr">datasource:</span>
- <span class="hljs-attr">jdbc-url:</span> <span class="hljs-string">jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true</span>
- <span class="hljs-attr">username:</span> <span class="hljs-string">xxxxxx</span>
- <span class="hljs-attr">password:</span> <span class="hljs-string">xxxxxx</span>
+<pre><code class="language-properties"><span class="hljs-meta">spring.datasource.jdbc-url</span>=<span class="hljs-string">jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8</span>
+<span class="hljs-meta">spring.datasource.username</span>=<span class="hljs-string">xxxxxx</span>
+<span class="hljs-meta">spring.datasource.password</span>=<span class="hljs-string">xxxxxx</span>
</code></pre>
</li>
<li>
<p>修改 Tube 和 ZooKeeper 集群的连接信息，其中 <code>cluster.zk.root</code> 建议使用默认值：</p>
-<pre><code class="language-yaml"><span class="hljs-attr">cluster:</span>
- <span class="hljs-attr">tube:</span>
- <span class="hljs-attr">manager:</span> <span class="hljs-string">http://127.0.0.1:8081</span> <span class="hljs-comment"># Tube 集群的 Manager 地址，用来创建 Topic</span>
- <span class="hljs-attr">master:</span> <span class="hljs-number">127.0</span><span class="hljs-number">.0</span><span class="hljs-number">.1</span><span class="hljs-string">:8000,127.0.0.1:8010</span> <span class="hljs-comment"># 用来管理 Tube 的 Broker</span>
- <span class="hljs-attr">clusterId:</span> <span class="hljs-number">1</span> <span class="hljs-comment"># Tube 集群的 ID</span>
- <span class="hljs-attr">zk:</span>
- <span class="hljs-attr">url:</span> <span class="hljs-number">127.0</span><span class="hljs-number">.0</span><span class="hljs-number">.1</span><span class="hljs-string">:2181</span>
- <span class="hljs-attr">root:</span> <span class="hljs-string">inlong_hive</span>
-<span class="hljs-attr">sort.appName:</span> <span class="hljs-string">inlong_app</span> <span class="hljs-comment"># Sort 应用名称，即设置 Sort 的 cluster-id 参数，默认值为"inlong_app"</span>
+<pre><code class="language-properties"><span class="hljs-comment"># Tube 集群的 Manager 地址，用来创建 Topic</span>
+<span class="hljs-meta">cluster.tube.manager</span>=<span class="hljs-string">http://127.0.0.1:8081</span>
+<span class="hljs-comment"># 用来管理 Tube 的 Broker</span>
+<span class="hljs-meta">cluster.tube.master</span>=<span class="hljs-string">127.0.0.1:8000,127.0.0.1:8010</span>
+<span class="hljs-comment"># Tube 集群的 ID</span>
+<span class="hljs-meta">cluster.tube.clusterId</span>=<span class="hljs-string">1</span>
+<span class="hljs-comment">
+# ZK 集群，用来推送 Sort 的配置</span>
+<span class="hljs-meta">cluster.zk.url</span>=<span class="hljs-string">127.0.0.1:2181</span>
+<span class="hljs-meta">cluster.zk.root</span>=<span class="hljs-string">inlong_hive</span>
+<span class="hljs-comment">
+# Sort 应用名称，即设置 Sort 的 cluster-id 参数，默认值为"inlong_app"</span>
+<span class="hljs-meta">sort.appName</span>=<span class="hljs-string">inlong_app</span>
</code></pre>
</li>
</ol>
<h2>2.3 启动服务</h2>
-<p>进入解压后的目录，执行 <code>sh bin/startup.sh</code> 启动服务，查看日志 <code>tailf log/manager-api.log</code>，若出现类似下面的日志，说明服务启动成功：</p>
-<pre><code class="language-shell">Started InLongApiApplication in 6.795 seconds (JVM running for 7.565)
-</code></pre>
-<h1>3. 部署、启动 manager-openapi</h1>
-<p><strong>manager-openapi 是为其他组件（如 Agent、DataProxy）提供交互接口的服务。</strong></p>
-<h2>3.1 准备安装文件</h2>
-<p>安装文件在<code>inlong-manager-openapi</code>目录.</p>
-<h2>3.2 修改配置</h2>
-<p>前往解压后的 <code>manager-openapi</code> 目录，修改 <code>conf/application.yml</code> 文件：</p>
-<pre><code class="language-yaml"><span class="hljs-comment"># manager-openapi 服务的端口号</span>
-<span class="hljs-attr">server:</span>
- <span class="hljs-attr">port:</span> <span class="hljs-number">8082</span>
-
-<span class="hljs-comment"># 使用的配置文件为 dev</span>
-<span class="hljs-attr">spring:</span>
- <span class="hljs-attr">profiles:</span>
- <span class="hljs-attr">active:</span> <span class="hljs-string">dev</span>
-</code></pre>
-<p>上面指定了 dev 配置，接下来修改 <code>conf/application-dev.yml</code> 文件：</p>
-<ol>
-<li>
-<p>修改数据库 URL、用户名和密码：</p>
-<pre><code class="language-yaml"><span class="hljs-attr">spring:</span>
- <span class="hljs-attr">datasource:</span>
- <span class="hljs-attr">jdbc-url:</span> <span class="hljs-string">jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true</span>
- <span class="hljs-attr">username:</span> <span class="hljs-string">xxxxxx</span>
- <span class="hljs-attr">password:</span> <span class="hljs-string">xxxxxx</span>
-</code></pre>
-</li>
-<li>
-<p>修改 Tube 和 ZooKeeper 集群的连接信息，其中 <code>cluster.zk.root</code> 建议使用默认值：</p>
-<pre><code class="language-yaml"><span class="hljs-attr">cluster:</span>
- <span class="hljs-attr">tube:</span>
- <span class="hljs-attr">manager:</span> <span class="hljs-string">http://127.0.0.1:8081</span> <span class="hljs-comment"># Tube 集群的 Manager 地址，用来创建 Topic</span>
- <span class="hljs-attr">master:</span> <span class="hljs-number">127.0</span><span class="hljs-number">.0</span><span class="hljs-number">.1</span><span class="hljs-string">:8000,127.0.0.1:8010</span> <span class="hljs-comment"># 用来管理 Tube 的 Broker</span>
- <span class="hljs-attr">clusterId:</span> <span class="hljs-number">1</span> <span class="hljs-comment"># Tube 集群的 ID</span>
- <span class="hljs-attr">zk:</span>
- <span class="hljs-attr">url:</span> <span class="hljs-number">127.0</span><span class="hljs-number">.0</span><span class="hljs-number">.1</span><span class="hljs-string">:2181</span>
- <span class="hljs-attr">root:</span> <span class="hljs-string">inlong_hive</span>
-<span class="hljs-attr">sort.appName:</span> <span class="hljs-string">inlong_app</span> <span class="hljs-comment"># Sort 应用名称，即设置 Sort 的 cluster-id 参数，默认值为"inlong_app"</span>
+<p>进入解压后的目录，执行 <code>sh bin/startup.sh</code> 启动服务，查看日志 <code>tailf log/manager-web.log</code>，若出现类似下面的日志，说明服务启动成功：</p>
+<pre><code class="language-shell">Started InLongWebApplication in 6.795 seconds (JVM running for 7.565)
</code></pre>
-</li>
-</ol>
-<h2>3.3 启动服务</h2>
-<p>进入解压后的目录，执行 <code>sh bin/startup.sh</code> 启动服务，查看日志 <code>tailf log/manager-openapi.log</code>，若出现类似下面的日志，说明服务启动成功：</p>
-<pre><code class="language-shell">Started InLongOpenApiApplication in 5.341 seconds (JVM running for 6.002)
-</code></pre>
-<h1>4. 服务访问验证</h1>
-<ol>
-<li>
-<p>验证 manager-api 服务：</p>
-<p>访问地址：<a href="http://%5Bmanager_api_ip%5D:%5Bmanager_api_port%5D/api/inlong/manager/doc.html#/home">http://[manager_api_ip]:[manager_api_port]/api/inlong/manager/doc.html#/home</a></p>
-</li>
-<li>
-<p>验证 manager-openapi 服务：</p>
-<p>访问地址：<a href="http://%5Bmanager_openapi_ip%5D:%5Bmanager_openapi_port%5D/openapi/inlong/manager/doc.html#/home">http://[manager_openapi_ip]:[manager_openapi_port]/openapi/inlong/manager/doc.html#/home</a></p>
-</li>
-</ol>
+<h1>3. 服务访问验证</h1>
+<p>在浏览器中访问如下地址，验证 manager-web 服务：</p>
+<p>地址：<a href="http://%5Bmanager_web_ip%5D:%5Bmanager_web_port%5D/api/inlong/manager/doc.html#/home">http://[manager_web_ip]:[manager_web_port]/api/inlong/manager/doc.html#/home</a></p>
</div></section><footer class="footer-container"><div class="footer-body"><img src="/img/incubator-logo.svg"/><div class="cols-container"><div class="col col-24"><p>Apache InLong (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with [...]
<script src="https://f.alicdn.com/react/15.4.1/react-with-addons.min.js"></script>
<script src="https://f.alicdn.com/react/15.4.1/react-dom.min.js"></script>
diff --git a/zh-cn/docs/modules/manager/quick_start.json b/zh-cn/docs/modules/manager/quick_start.json
index 9d3a8cd..2339ed5 100644
--- a/zh-cn/docs/modules/manager/quick_start.json
+++ b/zh-cn/docs/modules/manager/quick_start.json
@@ -1,6 +1,6 @@
{
"filename": "quick_start.md",
- "__html": "<h1>1. 环境准备</h1>\n<ul>\n<li>\n<p>安装并启动 MySQL 5.7+，把 inlong-manager 模块中的 <code>doc/sql/apache_inlong_manager.sql</code> 文件拷贝到 MySQL 数据库所在的服务器（比如拷贝到 <code>/data/</code>\n目录下），通过下述命令加载此文件，完成表结构及基础数据的初始化：</p>\n<pre><code class=\"language-shell\"><span class=\"hljs-meta\">#</span><span class=\"bash\"> 通过用户名和密码，登录 MySQL 服务器：</span>\nmysql -u xxx -p xxx\n...\n<span class=\"hljs-meta\">#</span><span class=\"bash\"> 创建数据库</span>\nCREATE DATABASE IF NOT EXISTS apache_inlong_manager;\n [...]
+ "__html": "<h1>1. 环境准备</h1>\n<ul>\n<li>\n<p>安装并启动 MySQL 5.7+，把 inlong-manager 模块中的 <code>doc/sql/apache_inlong_manager.sql</code> 文件拷贝到 MySQL 数据库所在的服务器\n（比如拷贝到 <code>/data/</code> 目录下），通过下述命令加载此文件，完成表结构及基础数据的初始化：</p>\n<pre><code class=\"language-shell\"><span class=\"hljs-meta\">#</span><span class=\"bash\"> 通过用户名和密码，登录 MySQL 服务器：</span>\nmysql -u xxx -p xxx\n...\n<span class=\"hljs-meta\">#</span><span class=\"bash\"> 创建数据库</span>\nCREATE DATABASE IF NOT EXISTS apache_inlong_manager;\ [...]
"link": "/zh-cn/docs/modules/manager/quick_start.html",
"meta": {
"快速开始 - Apache inlong-manager": ""
diff --git a/zh-cn/docs/modules/manager/quick_start.md b/zh-cn/docs/modules/manager/quick_start.md
index 67bba33..e8bccf4 100644
--- a/zh-cn/docs/modules/manager/quick_start.md
+++ b/zh-cn/docs/modules/manager/quick_start.md
@@ -3,8 +3,8 @@
---
# 1. 环境准备
-- 安装并启动 MySQL 5.7+，把 inlong-manager 模块中的 `doc/sql/apache_inlong_manager.sql` 文件拷贝到 MySQL 数据库所在的服务器（比如拷贝到 `/data/`
- 目录下），通过下述命令加载此文件，完成表结构及基础数据的初始化：
+- 安装并启动 MySQL 5.7+，把 inlong-manager 模块中的 `doc/sql/apache_inlong_manager.sql` 文件拷贝到 MySQL 数据库所在的服务器
+（比如拷贝到 `/data/` 目录下），通过下述命令加载此文件，完成表结构及基础数据的初始化：
```shell
# 通过用户名和密码，登录 MySQL 服务器：
@@ -22,124 +22,64 @@
- 参照 [编译部署TubeMQ Manager](https://inlong.apache.org/zh-cn/docs/modules/tubemq/tubemq-manager/quick_start.html)，安装并启动
TubeManager。
-# 2. 部署、启动 manager-api
+# 2. 部署、启动 manager-web
-**manager-api 是与前端页面交互的后台服务。**
+**manager-web 是与前端页面交互的后台服务。**
## 2.1 准备安装文件
-安装文件在`inlong-manager-api`目录.
+
+安装文件在 `inlong-manager-web` 目录下。
## 2.2 修改配置
-前往解压后的 `manager-api` 目录，修改 `conf/application.yml` 文件：
+前往 `inlong-manager-web` 目录，修改 `conf/application.properties` 文件：
-```yaml
-# manager-api 服务的端口号
-server:
- port: 8083
+```properties
+# manager-web 服务的端口号
+server.port=8083
-# 使用的配置文件为 dev
-spring:
- profiles:
- active: dev
+# 默认使用的配置文件为 dev
+spring.profiles.active=dev
```
-上面指定了 dev 配置，接下来修改 `conf/application-dev.yml` 文件：
+上面指定了 dev 配置，接下来修改 `conf/application-dev.properties` 文件：
1) 修改数据库 URL、用户名和密码：
- ```yaml
- spring:
- datasource:
- jdbc-url: jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
- username: xxxxxx
- password: xxxxxx
+ ```properties
+ spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8
+ spring.datasource.username=xxxxxx
+ spring.datasource.password=xxxxxx
```
2) 修改 Tube 和 ZooKeeper 集群的连接信息，其中 `cluster.zk.root` 建议使用默认值：
- ```yaml
- cluster:
- tube:
- manager: http://127.0.0.1:8081 # Tube 集群的 Manager 地址，用来创建 Topic
- master: 127.0.0.1:8000,127.0.0.1:8010 # 用来管理 Tube 的 Broker
- clusterId: 1 # Tube 集群的 ID
- zk:
- url: 127.0.0.1:2181
- root: inlong_hive
- sort.appName: inlong_app # Sort 应用名称，即设置 Sort 的 cluster-id 参数，默认值为"inlong_app"
+ ```properties
+ # Tube 集群的 Manager 地址，用来创建 Topic
+ cluster.tube.manager=http://127.0.0.1:8081
+ # 用来管理 Tube 的 Broker
+ cluster.tube.master=127.0.0.1:8000,127.0.0.1:8010
+ # Tube 集群的 ID
+ cluster.tube.clusterId=1
+
+ # ZK 集群，用来推送 Sort 的配置
+ cluster.zk.url=127.0.0.1:2181
+ cluster.zk.root=inlong_hive
+
+ # Sort 应用名称，即设置 Sort 的 cluster-id 参数，默认值为"inlong_app"
+ sort.appName=inlong_app
```
## 2.3 启动服务
-进入解压后的目录，执行 `sh bin/startup.sh` 启动服务，查看日志 `tailf log/manager-api.log`，若出现类似下面的日志，说明服务启动成功：
+进入解压后的目录，执行 `sh bin/startup.sh` 启动服务，查看日志 `tailf log/manager-web.log`，若出现类似下面的日志，说明服务启动成功：
```shell
-Started InLongApiApplication in 6.795 seconds (JVM running for 7.565)
+Started InLongWebApplication in 6.795 seconds (JVM running for 7.565)
```
-# 3. 部署、启动 manager-openapi
-
-**manager-openapi 是为其他组件（如 Agent、DataProxy）提供交互接口的服务。**
-
-## 3.1 准备安装文件
-安装文件在`inlong-manager-openapi`目录.
-
-## 3.2 修改配置
-
-前往解压后的 `manager-openapi` 目录，修改 `conf/application.yml` 文件：
-
-```yaml
-# manager-openapi 服务的端口号
-server:
- port: 8082
-
-# 使用的配置文件为 dev
-spring:
- profiles:
- active: dev
-```
-
-上面指定了 dev 配置，接下来修改 `conf/application-dev.yml` 文件：
-
-1) 修改数据库 URL、用户名和密码：
-
- ```yaml
- spring:
- datasource:
- jdbc-url: jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
- username: xxxxxx
- password: xxxxxx
- ```
-
-2) 修改 Tube 和 ZooKeeper 集群的连接信息，其中 `cluster.zk.root` 建议使用默认值：
-
- ```yaml
- cluster:
- tube:
- manager: http://127.0.0.1:8081 # Tube 集群的 Manager 地址，用来创建 Topic
- master: 127.0.0.1:8000,127.0.0.1:8010 # 用来管理 Tube 的 Broker
- clusterId: 1 # Tube 集群的 ID
- zk:
- url: 127.0.0.1:2181
- root: inlong_hive
- sort.appName: inlong_app # Sort 应用名称，即设置 Sort 的 cluster-id 参数，默认值为"inlong_app"
- ```
-
-## 3.3 启动服务
-
-进入解压后的目录，执行 `sh bin/startup.sh` 启动服务，查看日志 `tailf log/manager-openapi.log`，若出现类似下面的日志，说明服务启动成功：
-
-```shell
-Started InLongOpenApiApplication in 5.341 seconds (JVM running for 6.002)
-```
-
-# 4. 服务访问验证
-
-1) 验证 manager-api 服务：
-
- 访问地址：<http://[manager_api_ip]:[manager_api_port]/api/inlong/manager/doc.html#/home>
+# 3. 服务访问验证
-2) 验证 manager-openapi 服务：
+在浏览器中访问如下地址，验证 manager-web 服务：
- 访问地址：<http://[manager_openapi_ip]:[manager_openapi_port]/openapi/inlong/manager/doc.html#/home>
+地址：<http://[manager_web_ip]:[manager_web_port]/api/inlong/manager/doc.html#/home>
diff --git a/zh-cn/docs/quick_start.html b/zh-cn/docs/quick_start.html
index cd22be5..acbd17b 100644
--- a/zh-cn/docs/quick_start.html
+++ b/zh-cn/docs/quick_start.html
@@ -32,8 +32,7 @@ $ docker run -v `pwd`:/inlong -w /inlong maven:3.6-openjdk-8 mvn clean install
<pre><code>inlong-agent
inlong-dataproxy
inlong-dataproxy-sdk
-inlong-manager-api
-inlong-manager-openapi
+inlong-manager-web
inlong-sort
inlong-tubemq-manager
inlong-tubemq-server
diff --git a/zh-cn/docs/quick_start.json b/zh-cn/docs/quick_start.json
index 81fc520..fcfe5e3 100644
--- a/zh-cn/docs/quick_start.json
+++ b/zh-cn/docs/quick_start.json
@@ -1,6 +1,6 @@
{
"filename": "quick_start.md",
- "__html": "<p>本节包含快速入门指南，可帮助您开始使用 Apache InLong。</p>\n<h2>整体架构</h2>\n<img src=\"../../img/inlong_architecture.png\" align=\"center\" alt=\"Apache InLong\"/>\n<p><a href=\"https://inlong.apache.org\">Apache InLong</a>(incubating) 整体架构如上，该组件是一站式数据流媒体平台，提供自动化、安全、分布式、高效的数据发布和订阅能力，帮助您轻松构建基于流的数据应用程序。</p>\n<p>InLong(应龙)最初建于腾讯，服务线上业务8年多，支持大数据场景下的海量数据（每天40万亿条数据规模以上）报表服务。整个平台集成了数据采集、汇聚、缓存、分拣和管理模块等共5个模块，通过这个系统，业务只需要提供数据源、数据服务质量、数据落地集群和数据落地格式，即数据可以源源不断地将数据从源集群推送到目标集群，极大满足了业务大数据场景下的数据上报服务需求�
��</p>\n< [...]
+ "__html": "<p>本节包含快速入门指南，可帮助您开始使用 Apache InLong。</p>\n<h2>整体架构</h2>\n<img src=\"../../img/inlong_architecture.png\" align=\"center\" alt=\"Apache InLong\"/>\n<p><a href=\"https://inlong.apache.org\">Apache InLong</a>(incubating) 整体架构如上，该组件是一站式数据流媒体平台，提供自动化、安全、分布式、高效的数据发布和订阅能力，帮助您轻松构建基于流的数据应用程序。</p>\n<p>InLong(应龙)最初建于腾讯，服务线上业务8年多，支持大数据场景下的海量数据（每天40万亿条数据规模以上）报表服务。整个平台集成了数据采集、汇聚、缓存、分拣和管理模块等共5个模块，通过这个系统，业务只需要提供数据源、数据服务质量、数据落地集群和数据落地格式，即数据可以源源不断地将数据从源集群推送到目标集群，极大满足了业务大数据场景下的数据上报服务需求�
��</p>\n< [...]
"link": "/zh-cn/docs/quick_start.html",
"meta": {
"title": "入门 - Apache InLong"
diff --git a/zh-cn/docs/quick_start.md b/zh-cn/docs/quick_start.md
index 4d21a95..df5ba02 100644
--- a/zh-cn/docs/quick_start.md
+++ b/zh-cn/docs/quick_start.md
@@ -28,8 +28,7 @@ $ docker run -v `pwd`:/inlong -w /inlong maven:3.6-openjdk-8 mvn clean install
inlong-agent
inlong-dataproxy
inlong-dataproxy-sdk
-inlong-manager-api
-inlong-manager-openapi
+inlong-manager-web
inlong-sort
inlong-tubemq-manager
inlong-tubemq-server