Merge branch 'develop' into docs/wade-20220515-1

docs-cn/01-intro/01-intro.md

@@ -40,7 +40,7 @@ TDengine 是一款高性能、分布式、支持 SQL 的时序数据库，其核
 
 - **零管理**：安装、集群几秒搞定，无任何依赖，不用分库分表，系统运行状态监测能与 Grafana 或其他运维工具无缝集成。
 
-- **零学习成本**：采用 SQL 查询语言，支持 Python, Java, C/C++, Go, Rust, Node.js 等多种编程语言,与 MySQL 相似，零学习成本。
+- **零学习成本**：采用 SQL 查询语言，支持 Python, Java, C/C++, Go, Rust, Node.js, PHP 等多种编程语言,与 MySQL 相似，零学习成本。
 
 - **无缝集成**：不用一行代码，即可与 Telegraf, Grafana, EMQX, Prometheus, StatsD, collectd, Matlab, R 等第三方工具无缝集成。
 

docs-cn/04-develop/01-connect/_connect_cs.mdx

 ```csharp title="原生连接"
 {{#include docs-examples/csharp/ConnectExample.cs}}
 ```
+
 :::info
 C# 连接器目前只支持原生连接。
 
-:::
\ No newline at end of file
+:::

docs-cn/04-develop/01-connect/_connect_go.mdx

 #### 使用数据库访问统一接口
+
 ```go title="原生连接"
 {{#include docs-examples/go/connect/cgoexample/main.go}}
 ```
+
 ```go title="REST 连接"
 {{#include docs-examples/go/connect/restexample/main.go}}
 ```
+
 #### 使用高级封装
+
 也可以使用 driver-go 的 af 包建立连接。这个模块封装了 TDengine 的高级功能, 如：参数绑定、订阅等。
 
 ```go title="使用 af 包建立原生连接"
 {{#include docs-examples/go/connect/afconn/main.go}}
 ```
-
-

docs-cn/04-develop/01-connect/_connect_java.mdx

 ```java title="原生连接"
 {{#include docs-examples/java/src/main/java/com/taos/example/JNIConnectExample.java}}
 ```
+
 ```java title="REST 连接"
 {{#include docs-examples/java/src/main/java/com/taos/example/RESTConnectExample.java:main}}
 ```
-使用REST 连接时，如果查询数据量比较大，还可开启批量拉取功能。
+
+使用 REST 连接时，如果查询数据量比较大，还可开启批量拉取功能。
+
 ```java title="开启批量拉取功能" {4}
 {{#include docs-examples/java/src/main/java/com/taos/example/WSConnectExample.java:main}}
 ```
-更多连接参数配置，参考[Java 连接器](/reference/connector/java)
\ No newline at end of file
+
+更多连接参数配置，参考[Java 连接器](/reference/connector/java)

docs-cn/04-develop/01-connect/_connect_node.mdx

 ```js title="原生连接"
 {{#include docs-examples/node/nativeexample/connect.js}}
 ```
+
 ```js title="REST 连接"
 {{#include docs-examples/node/restexample/connect.js}}
-```
\ No newline at end of file
+```

docs-cn/04-develop/01-connect/_connect_php.mdx

+```php title="原生连接"
+{{#include docs-examples/php/connect.php}}
+```

docs-cn/04-develop/01-connect/_connect_python.mdx

 ```python title="原生连接"
 {{#include docs-examples/python/connect_exmaple.py}}
-```
\ No newline at end of file
+```

docs-cn/04-develop/01-connect/_connect_r.mdx

 ```r title="原生连接"
 {{#include docs-examples/R/connect_native.r:demo}}
-```
\ No newline at end of file
+```

docs-cn/04-develop/01-connect/_connect_rust.mdx

 ```rust title="原生连接/REST 连接"
 {{#include docs-examples/rust/nativeexample/examples/connect.rs}}
 ```
+
 :::note
 对于 Rust 连接器， 连接方式的不同只体现在使用的特性不同。如果启用了 "rest" 特性，那么只有 RESTful 的实现会被编译进来。
 

docs-cn/04-develop/01-connect/index.md

@@ -13,12 +13,13 @@ import ConnPythonNative from "./_connect_python.mdx";
 import ConnCSNative from "./_connect_cs.mdx";
 import ConnC from "./_connect_c.mdx";
 import ConnR from "./_connect_r.mdx";
+import ConnPHP from "./_connect_php.mdx";
 import InstallOnWindows from "../../14-reference/03-connector/_linux_install.mdx";
 import InstallOnLinux from "../../14-reference/03-connector/_windows_install.mdx";
 import VerifyLinux from "../../14-reference/03-connector/_verify_linux.mdx";
 import VerifyWindows from "../../14-reference/03-connector/_verify_windows.mdx";
 
-TDengine 提供了丰富的应用程序开发接口，为了便于用户快速开发自己的应用，TDengine 支持了多种编程语言的连接器，其中官方连接器包括支持 C/C++、Java、Python、Go、Node.js、C# 和 Rust 的连接器。这些连接器支持使用原生接口（taosc）和 REST 接口（部分语言暂不支持）连接 TDengine 集群。社区开发者也贡献了多个非官方连接器，例如 ADO.NET 连接器、Lua 连接器和 PHP 连接器。
+TDengine 提供了丰富的应用程序开发接口，为了便于用户快速开发自己的应用，TDengine 支持了多种编程语言的连接器，其中官方连接器包括支持 C/C++、Java、Python、Go、Node.js、C#、Rust 和 PHP 的连接器。这些连接器支持使用原生接口（taosc）和 REST 接口（部分语言暂不支持）连接 TDengine 集群。社区开发者也贡献了多个非官方连接器，例如 ADO.NET 连接器、Lua 连接器和 PHP 连接器。
 
 ## 连接器建立连接的方式
 
@@ -200,6 +201,46 @@ install.packages("RJDBC")
 如果已经安装了 TDengine 服务端软件或 TDengine 客户端驱动 taosc， 那么已经安装了 C 连接器，无需额外操作。
 <br/>
 
+</TabItem>
+<TabItem label="PHP" value="php">
+
+**下载代码并解压：**
+
+```shell
+curl -L -o php-tdengine.tar.gz https://github.com/Yurunsoft/php-tdengine/archive/refs/tags/v1.0.2.tar.gz \
+&& mkdir php-tdengine \
+&& tar -xzf php-tdengine.tar.gz -C php-tdengine --strip-components=1
+```
+
+> 版本 `v1.0.0` 可替换为任意更新的版本，可在 Release 中查看最新版本。
+
+**非 Swoole 环境：**
+
+```shell
+phpize && ./configure && make -j && make install
+```
+
+**手动指定 tdengine 目录：**
+
+```shell
+phpize && ./configure --with-tdengine-dir=/usr/local/Cellar/tdengine/2.4.0.0 && make -j && make install
+```
+
+> `--with-tdengine-dir=` 后跟上 tdengine 目录。
+> 适用于默认找不到的情况，或者 MacOS 系统用户。
+
+**Swoole 环境：**
+
+```shell
+phpize && ./configure --enable-swoole && make -j && make install
+```
+
+**启用扩展：**
+
+方法一：在 `php.ini` 中加入 `extension=tdengine`
+
+方法二：运行带参数 `php -dextension=tdengine test.php
+
 </TabItem>
 </Tabs>
 
@@ -232,6 +273,9 @@ install.packages("RJDBC")
   <TabItem label="C" value="c">
     <ConnC />
   </TabItem>
+  <TabItem label="PHP" value="php">
+    <ConnPHP />
+  </TabItem>
 </Tabs>
 
 :::tip

docs-cn/04-develop/03-insert-data/01-sql-writing.mdx

@@ -18,6 +18,8 @@ import CsSQL from "./_cs_sql.mdx";
 import CsStmt from "./_cs_stmt.mdx";
 import CSQL from "./_c_sql.mdx";
 import CStmt from "./_c_stmt.mdx";
+import PhpSQL from "./_php_sql.mdx";
+import PhpStmt from "./_php_stmt.mdx";
 
 ## SQL 写入简介
 
@@ -88,6 +90,9 @@ INSERT INTO d1001 VALUES (1538548685000, 10.3, 219, 0.31) (1538548695000, 12.6,
   <TabItem label="C" value="c">
     <CSQL />
   </TabItem>
+  <TabItem label="PHP" value="php">
+    <PhpSQL />
+  </TabItem>
 </Tabs>
 
 :::note
@@ -125,5 +130,8 @@ TDengine 也提供了支持参数绑定的 Prepare API，与 MySQL 类似，这
   <TabItem label="C" value="c">
     <CStmt />
   </TabItem>
+  <TabItem label="PHP" value="php">
+    <PhpStmt />
+  </TabItem>
 </Tabs>
 

docs-cn/04-develop/03-insert-data/_php_sql.mdx

+```php
+{{#include docs-examples/php/insert.php}}
+```

docs-cn/04-develop/03-insert-data/_php_stmt.mdx

+```php
+{{#include docs-examples/php/insert_stmt.php}}
+```

docs-cn/04-develop/04-query-data/_php.mdx

+```go
+{{#include docs-examples/php/query.php}}
+```

docs-cn/04-develop/04-query-data/index.mdx

@@ -13,6 +13,7 @@ import RustQuery from "./_rust.mdx";
 import NodeQuery from "./_js.mdx";
 import CsQuery from "./_cs.mdx";
 import CQuery from "./_c.mdx";
+import PhpQuery from "./_php.mdx";
 import PyAsync from "./_py_async.mdx";
 import NodeAsync from "./_js_async.mdx";
 import CsAsync from "./_cs_async.mdx";
@@ -150,12 +151,15 @@ Query OK, 5 row(s) in set (0.001521s)
   <TabItem label="C" value="c">
     <CQuery />
   </TabItem>
+  <TabItem label="PHP" value="php">
+    <PhpQuery />
+  </TabItem>
 </Tabs>
 
 :::note
 
 1. 无论是使用 REST 连接还是原生连接的连接器，以上示例代码都能正常工作。
-2. 唯一需要注意的是：由于 RESTful 接口无状态， 不能使用 `use db` 语句来切换数据库。
+2. 唯一需要注意的是：由于 REST 接口无状态， 不能使用 `use db` 语句来切换数据库。
 
 :::
 

docs-cn/14-reference/03-connector/go.mdx

@@ -136,7 +136,7 @@ import (
 )
 
 func main() {
-    var taosUri = "root:taosdata/tcp(localhost:6030)/"
+    var taosUri = "root:taosdata@tcp(localhost:6030)/"
     taos, err := sql.Open("taosSql", taosUri)
     if err != nil {
         fmt.Println("failed to connect TDengine, err:", err)

docs-cn/20-third-party/09-emq-broker.md

 ---
-sidebar_label: EMQ Broker
-title: EMQ Broker 写入
+sidebar_label: EMQX Broker
+title: EMQX Broker 写入
 ---
 
-MQTT 是流行的物联网数据传输协议，[EMQ](https://github.com/emqx/emqx)是一开源的 MQTT Broker 软件，无需任何代码，只需要在 EMQ Dashboard 里使用“规则”做简单配置，即可将 MQTT 的数据直接写入 TDengine。EMQ X 支持通过 发送到 Web 服务的方式保存数据到 TDengine，也在企业版上提供原生的 TDengine 驱动实现直接保存。详细使用方法请参考 [EMQ 官方文档](https://www.emqx.io/docs/zh/v4.4/rule/rule-engine.html)。
+MQTT 是流行的物联网数据传输协议，[EMQX](https://github.com/emqx/emqx)是一开源的 MQTT Broker 软件，无需任何代码，只需要在 EMQX Dashboard 里使用“规则”做简单配置，即可将 MQTT 的数据直接写入 TDengine。EMQX 支持通过 发送到 Web 服务的方式保存数据到 TDengine，也在企业版上提供原生的 TDengine 驱动实现直接保存。
+
+## 前置条件
+
+要让 EMQX 能正常添加 TDengine 数据源，需要以下几方面的准备工作。
+- TDengine 集群已经部署并正常运行
+- taosAdapter 已经安装并正常运行。具体细节请参考 [taosAdapter 的使用手册](/reference/taosadapter)
+- 如果使用后文介绍的模拟写入程序，需要安装合适版本的 Node.js，推荐安装 v12。
+
+## 安装并启动 EMQX
+
+用户可以根据当前的操作系统，到 EMQX 官网下载安装包，并执行安装。下载地址如下：<https://www.emqx.io/zh/downloads>。安装后使用 `sudo emqx start` 或 `sudo systemctl start emqx` 启动 EMQX 服务。
+
+## 在 TDengine 中为接收 MQTT 数据创建相应数据库和表结构
+
+### 以 Docker 安装 TDengine 为例
+
+```bash
+    docker exec -it tdengine bash
+    taos
+```
+
+### 创建数据库和表
+
+```sql
+    create database test;
+    use test;
+    create table:
+
+    CREATE TABLE sensor_data (ts timestamp, temperature float, humidity float, volume float, PM10 float, pm25 float, SO2 float, NO2 float, CO float, sensor_id NCHAR(255), area TINYINT, coll_time timestamp);
+```
+
+注：表结构以博客[数据传输、存储、展现，EMQ X + TDengine 搭建 MQTT 物联网数据可视化平台](https://www.taosdata.com/blog/2020/08/04/1722.html)为例。后续操作均以此博客场景为例进行，请你根据实际应用场景进行修改。
+
+## 配置 EMQX 规则
+
+由于 EMQX 不同版本配置界面所有不同，这里仅以 v4.4.3 为例，其他版本请参考相应官网文档。
+
+### 登录 EMQX Dashboard
+
+使用浏览器打开网址 http://IP:18083 并登录 EMQX Dashboard。初次安装用户名为 `admin` 密码为：`public`
+
+![img](./emqx/login-dashboard.png)
+
+### 创建规则（Rule）
+
+选择左侧“规则引擎（Rule Engine）”中的“规则（Rule）”并点击“创建（Create）”按钮：
+
+![img](./emqx/rule-engine.png)
+
+### 编辑 SQL 字段
+
+![img](./emqx/create-rule.png)
+
+### 新增“动作（action handler）”
+
+![img](./emqx/add-action-handler.png)
+
+### 新增“资源（Resource）”
+
+![img](./emqx/create-resource.png)
+
+选择“发送数据到 Web 服务“并点击“新建资源”按钮：
+
+### 编辑“资源（Resource）”
+
+选择“发送数据到 Web 服务“并填写 请求 URL 为 运行 taosAdapter 的服务器地址和端口（默认为 6041）。其他属性请保持默认值。
+
+![img](./emqx/edit-resource.png)
+
+### 编辑“动作（action）”
+
+编辑资源配置，增加 Authorization 认证的键/值配对项，相关文档请参考[ TDengine REST API 文档](https://docs.taosdata.com/reference/rest-api/)。在消息体中输入规则引擎替换模板。
+
+![img](./emqx/edit-action.png)
+
+## 编写模拟测试程序
+
+```javascript
+    // mock.js
+    const mqtt = require('mqtt')
+    const Mock = require('mockjs')
+    const EMQX_SERVER = 'mqtt://localhost:1883'
+    const CLIENT_NUM = 10
+    const STEP = 5000 // 模拟采集时间间隔 ms
+    const AWAIT = 5000 // 每次发送完后休眠时间，防止消息速率过快 ms
+    const CLIENT_POOL = []
+    startMock()
+    function sleep(timer = 100) {
+      return new Promise(resolve => {
+        setTimeout(resolve, timer)
+      })
+    }
+    async function startMock() {
+      const now = Date.now()
+      for (let i = 0; i < CLIENT_NUM; i++) {
+        const client = await createClient(`mock_client_${i}`)
+        CLIENT_POOL.push(client)
+      }
+      // last 24h every 5s
+      const last = 24 * 3600 * 1000
+      for (let ts = now - last; ts <= now; ts += STEP) {
+        for (const client of CLIENT_POOL) {
+          const mockData = generateMockData()
+          const data = {
+            ...mockData,
+            id: client.clientId,
+            area: 0,
+            ts,
+          }
+          client.publish('sensor/data', JSON.stringify(data))
+        }
+        const dateStr = new Date(ts).toLocaleTimeString()
+        console.log(`${dateStr} send success.`)
+        await sleep(AWAIT)
+      }
+      console.log(`Done, use ${(Date.now() - now) / 1000}s`)
+    }
+    /**
+     * Init a virtual mqtt client
+     * @param {string} clientId ClientID
+     */
+    function createClient(clientId) {
+      return new Promise((resolve, reject) => {
+        const client = mqtt.connect(EMQX_SERVER, {
+          clientId,
+        })
+        client.on('connect', () => {
+          console.log(`client ${clientId} connected`)
+          resolve(client)
+        })
+        client.on('reconnect', () => {
+          console.log('reconnect')
+        })
+        client.on('error', (e) => {
+          console.error(e)
+          reject(e)
+        })
+      })
+    }
+    /**
+    * Generate mock data
+    */
+    function generateMockData() {
+     return {
+       "temperature": parseFloat(Mock.Random.float(22, 100).toFixed(2)),
+       "humidity": parseFloat(Mock.Random.float(12, 86).toFixed(2)),
+       "volume": parseFloat(Mock.Random.float(20, 200).toFixed(2)),
+       "PM10": parseFloat(Mock.Random.float(0, 300).toFixed(2)),
+       "pm25": parseFloat(Mock.Random.float(0, 300).toFixed(2)),
+       "SO2": parseFloat(Mock.Random.float(0, 50).toFixed(2)),
+       "NO2": parseFloat(Mock.Random.float(0, 50).toFixed(2)),
+       "CO": parseFloat(Mock.Random.float(0, 50).toFixed(2)),
+       "area": Mock.Random.integer(0, 20),
+       "ts": 1596157444170,
+     }
+    }
+```
+
+注意：代码中 CLIENT_NUM 在开始测试中可以先设置一个较小的值，避免硬件性能不能完全处理较大并发客户端数量。
+
+![img](./emqx/client-num.png)
+
+## 执行测试模拟发送 MQTT 数据
+
+```
+npm install mqtt mockjs --save --registry=https://registry.npm.taobao.org
+node mock.js
+```
+
+![img](./emqx/run-mock.png)
+
+## 验证 EMQX 接收到数据
+
+在 EMQX Dashboard 规则引擎界面进行刷新，可以看到有多少条记录被正确接收到：
+
+![img](./emqx/check-rule-matched.png)
+
+## 验证数据写入到 TDengine
+
+使用 TDengine CLI 程序登录并查询相应数据库和表，验证数据是否被正确写入到 TDengine 中：
+
+![img](./emqx/check-result-in-taos.png)
+
+TDengine 详细使用方法请参考 [TDengine 官方文档](https://docs.taosdata.com/)。
+EMQX 详细使用方法请参考 [EMQ 官方文档](https://www.emqx.io/docs/zh/v4.4/rule/rule-engine.html)。
+

docs-cn/25-application/03-immigrate.md

@@ -14,7 +14,7 @@ title: OpenTSDB 应用迁移到 TDengine 的最佳实践
 - 安装部署非常简单，单一安装包完成安装部署，不依赖其他的第三方软件，整个安装部署过程秒级搞定;
 - 提供的内建函数覆盖 OpenTSDB 支持的全部查询函数，还支持更多的时序数据查询函数、标量函数及聚合函数，支持多种时间窗口聚合、连接查询、表达式运算、多种分组聚合、用户定义排序、以及用户定义函数等高级查询功能。采用类 SQL 的语法规则，更加简单易学，基本上没有学习成本。
 - 支持多达 128 个标签，标签总长度可达到 16 KB；
-- 除 REST 接口之外，还提供 Java、Python、C、Rust、Go 等多种语言的接口，支持 JDBC 等多种企业级标准连接器协议。
+- 除 REST 接口之外，还提供 Java、Python、C、Rust、Go、PHP 等多种语言的接口，支持 JDBC 等多种企业级标准连接器协议。
 
 如果我们将原本运行在 OpenTSDB 上的应用迁移到 TDengine 上，不仅可以有效地降低计算和存储资源的占用、减少部署服务器的规模，还能够极大减少运行维护的成本的输出，让运维管理工作更简单、更轻松，大幅降低总拥有成本。与 OpenTSDB 一样，TDengine 也已经进行了开源，不同的是，除了单机版，后者还实现了集群版开源，被厂商绑定的顾虑一扫而空。
 

docs-en/03-get-started/03-get-started.md

@@ -8,9 +8,9 @@ import TabItem from "@theme/TabItem";
 import PkgInstall from "./\_pkg_install.mdx";
 import AptGetInstall from "./\_apt_get_install.mdx";
 
-## Install
+## Quick Install
 
-The complete package of TDengine includes server(taosd), taosAdapter for connecting with third-party systems and providing RESTful interface, application driver(taosc), command line program(CLI, taos) and some tools. For current version, the server taosd and taosAdapter can only be installed and run on Linux systems, and will support Windows, macOS and other systems in the future. The application driver taosc and TDengine CLI can be installed and run on Windows or Linux. In addition to the RESTful interface, TDengine also provides connectors for a number of programming languages. In versions before 2.4, there is no taosAdapter, and the RESTfule interface is provided by the built-in http service of taosd.
+The full package of TDengine includes server(taosd), taosAdapter for connecting with third-party systems and providing RESTful interface, application driver(taosc), command line program(CLI, taos) and some tools. For current version, the server taosd and taosAdapter can only be installed and run on Linux systems, and will support Windows, macOS and other systems in the future. The application driver taosc and TDengine CLI can be installed and run on Windows or Linux. In addition to the RESTful interface, TDengine also provides connectors for a number of programming languages. In versions before 2.4, there is no taosAdapter, and the RESTfule interface is provided by the built-in http service of taosd.
 
 TDengine supports X64/ARM64/MIPS64/Alpha64 hardware platforms, and will support ARM32, RISC-V and other CPU architectures in the future.
 
@@ -57,9 +57,9 @@ If you like to check the source code, build the package by youself or contribute
 </TabItem>
 </Tabs>
 
-## Start
+## Quick Launch
 
-After installation，please execute `systemctl` to start taosd, the server part of TDengine.
+After installation, you can launch the TDengine service by the 'systemctl' command to start 'taosd'.
 
 ```bash
 systemctl start taosd
@@ -77,7 +77,7 @@ If everything is fine，you can run TDengine command line interface `taos` to ac
 
 - systemctl requires _root_ privileges，if you are not _root_ ，please add sudo before the command.
 - To get feedback and keep polishing the prodcut, TDengine is colleting some basic usage information, but you can turn it off by setting telemetryReporting to 0 in configuration file taos.cfg. 
-- TDengine uses FQDN (hostname in simple case）as the ID for a node. To make system work, you need to configure the FQDN for the server running taosd, and configure the DNS service or hosts file on the TDengine CLI or the machine where the application runs to ensure that the FQDN can be resolved.     
+- TDengine uses FQDN (usually hostname）as the ID for a node. To make system work, you need to configure the FQDN for the server running taosd, and configure the DNS service or hosts file on the the machine where the application or TDengine CLI runs to ensure that the FQDN can be resolved.     
 - `systemctl stop taosd` won't stop the server right away, it will wait until all the data in memory are flushed to disk. It may takes time depending on the cache size.
 
 TDengine supports the installation on system which runs [`systemd`](https://en.wikipedia.org/wiki/Systemd) for process management，use `which systemctl` to check if the system has `systemd` installed:
@@ -90,9 +90,9 @@ If the system does not have `systemd`，you can start TDengine manually by execu
 
 :::note
 
-## TDengine Command Line Interface
+## Command Line Interface
            
-To manage the TDengine running instance，or execute ad-hoc queries, TDengine provides a Command Line Interface(hereinafter referred to as TDengine CLI) taos. To enter into the interactive CLI shell，execute `taos` on a Linux terminal where TDengine is installed.
+To manage the TDengine running instance，or execute ad-hoc queries, TDengine provides a Command Line Interface(hereinafter referred to as TDengine CLI) taos. To enter into the interactive CLI，execute `taos` on a Linux terminal where TDengine is installed.
 
 ```bash
 taos
@@ -121,7 +121,7 @@ Query OK, 2 row(s) in set (0.003128s)
 ```
 Besides executing SQL commands, system administrator can check running status, add/drop user accounts and manage the running instances. TAOS CLI with application driver can be installed and run on either Linux or windows machine. For more details on CLI, please [check here](../reference/taos-shell/).
 
-## run taosBenchmark to experience the high-performance
+## Experience the blazing fast speed
 
 After TDengine server is running，execute `taosBenchmark`(named as taosdemo before) from a Linux terminal：
 
@@ -130,13 +130,13 @@ taosBenchmark
 ```
 This command will create a super table "meters" under database "test". Unde "meters", 10000 tables are created with name from "d0" to "d9999". Each table has 10000 rows and each row has four columns (ts, current, voltage, phase). Time stamp is starting from "2017-07-14 10:40:00 000" to "2017-07-14 10:40:09 999". Each table has tags "location" and "groupId". groupId is set 1 to 10 randomly, and location is set to "beijing" or "shanghai".
 
-This command will insert 100 million rows into database quickly. Depends on the hardware configuration, it only takes around 15 seconds for a regular PC server.            
+This command will insert 100 million rows into database quickly. Depends on the hardware configuration, it only takes a dozen seconds for a regular PC server.            
 
 taosBenchmark provides you command line options and confuguration file to customize the scenarios, like number of tables, number of rows per table, number of columns and more. Please execute `taosBenchmark --help` to list them. For details on running taosBenchmark, please check [reference for taosBenchmark](/reference/taosbenchmark)
 
-## Experience query speed with TDengine CLI
+## Experience query speed
            
-After using taosBenchmark to insert a number of rows data, you can execute queries to experience the performance from CLI.
+After using taosBenchmark to insert a number of rows data, you can execute queries from TDengine CLI to experience the lightning query speed.
 
 query the total number of rows under super table "meters"：
 

docs-en/04-develop/01-connect/_connect_cs.mdx

 ```csharp title="Native Connection"
 {{#include docs-examples/csharp/ConnectExample.cs}}
 ```
+
 :::info
 C# connector supports only native connection for now.
 
-:::
\ No newline at end of file
+:::

docs-en/04-develop/01-connect/_connect_go.mdx

 #### Unified Database Access Interface
+
 ```go title="Native Connection"
 {{#include docs-examples/go/connect/cgoexample/main.go}}
 ```
+
 ```go title="REST Connection"
 {{#include docs-examples/go/connect/restexample/main.go}}
 ```
+
 #### Advanced Features
+
 The af package of driver-go can also be used to establish connection, with this way some advanced features of TDengine, like parameter binding and subscription, can be used.
 
 ```go title="Establish native connection using af package"
 {{#include docs-examples/go/connect/afconn/main.go}}
 ```
-
-

docs-en/04-develop/01-connect/_connect_java.mdx

 ```java title="Native Connection"
 {{#include docs-examples/java/src/main/java/com/taos/example/JNIConnectExample.java}}
 ```
+
 ```java title="REST Connection"
 {{#include docs-examples/java/src/main/java/com/taos/example/RESTConnectExample.java:main}}
 ```
+
 When using REST connection, the feature of bulk pulling can be enabled if the size of resulting data set is huge.
 
 ```java title="Enable Bulk Pulling" {4}
 {{#include docs-examples/java/src/main/java/com/taos/example/WSConnectExample.java:main}}
 ```
-More configuration about connection，please refer to [Java Connector](/reference/connector/java)
\ No newline at end of file
+
+More configuration about connection，please refer to [Java Connector](/reference/connector/java)

docs-en/04-develop/01-connect/_connect_node.mdx

 ```js title="Native Connection"
 {{#include docs-examples/node/nativeexample/connect.js}}
 ```
+
 ```js title="REST Connection"
 {{#include docs-examples/node/restexample/connect.js}}
-```
\ No newline at end of file
+```

docs-en/04-develop/01-connect/_connect_python.mdx

 ```python title="Native Connection"
 {{#include docs-examples/python/connect_exmaple.py}}
-```
\ No newline at end of file
+```

docs-en/04-develop/01-connect/_connect_r.mdx

 ```r title="Native Connection"
 {{#include docs-examples/R/connect_native.r:demo}}
-```
\ No newline at end of file
+```

docs-en/04-develop/01-connect/_connect_rust.mdx

 ```rust title="Native Connection/REST Connection"
 {{#include docs-examples/rust/nativeexample/examples/connect.rs}}
 ```
+
 :::note
 For Rust connector, the connection depends on the feature being used. If "rest" feature is enabled, then only the implementation for "rest" is compiled and packaged.
 

docs-en/04-develop/02-model/index.mdx

@@ -4,13 +4,11 @@ slug: /model
 title: Data Model
 ---
 
-The data model employed by TDengine is similar to relational, users need to create database and tables. For a specific use case, the design of databases, STables (abbreviated for super table), and tables need to be considered. This chapter will explain the concept without syntax details.
-
-There is an [video training course](https://www.taosdata.com/blog/2020/11/11/1945.html) that can be referred to for learning purpose.
+The data model employed by TDengine is similar to relational database, you need to create databases and tables. For a specific application, the design of databases, STables (abbreviated for super table), and tables need to be considered. This chapter will explain the big picture without syntax details.
 
 ## Create Database
 
-The characteristics of data from different data collection points may be different, such as collection frequency, days to keep, number of replicas, data block size, whether it's allowed to update data, etc. For TDengine to operate with best performance, it's strongly suggested to put the data with different characteristics into different databases because different storage policy can be set for each database. When creating a database, there are a lot of parameters that can be configured, such as the days to keep data, the number of replicas, the number of memory blocks, time precision, the minimum and maximum number of rows in each data block, compress or not, the time range of the data in single data file, etc. Below is an example of the SQL statement for creating a database.
+The characteristics of data from different data collection points may be different, such as collection frequency, days to keep, number of replicas, data block size, whether it's allowed to update data, etc. For TDengine to operate with the best performance, it's strongly suggested to put the data with different characteristics into different databases because different storage policy can be set for each database. When creating a database, there are a lot of parameters that can be configured, such as the days to keep data, the number of replicas, the number of memory blocks, time precision, the minimum and maximum number of rows in each data block, compress or not, the time range of the data in single data file, etc. Below is an example of the SQL statement for creating a database.
 
 ```sql
 CREATE DATABASE power KEEP 365 DAYS 10 BLOCKS 6 UPDATE 1;
@@ -34,7 +32,7 @@ USE power;
 
 ## Create STable
 
-In a typical IoT system, there may be a lot of kinds of devices. For example, in the electrical power system there are meters, transformers, bus bars, switches, etc. For easy aggregate of multiple tables, one STable needs to be created for each kind of devices. For example, for the meters in [table 1](/tdinternal/arch#model_table1), below SQL statement can be used to create the super table.
+In a time-series application, there may be multiple kinds of data collection points. For example, in the electrical power system there are meters, transformers, bus bars, switches, etc. For easy and efficient aggregation of multiple tables, one STable needs to be created for each kind of data collection point. For example, for the meters in [table 1](/tdinternal/arch#model_table1), below SQL statement can be used to create the super table.
 
 ```sql
 CREATE STable meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);
@@ -45,11 +43,12 @@ If you are using versions prior to 2.0.15, the `STable` keyword needs to be repl
 
 :::
 
-Similar to creating a normal table, when creating a STable, name and schema need to be provided too. In the STable schema, the first column must be timestamp (like ts in the example), and other columns (like current, voltage and phase in the example) are the data collected. The type of a column can be integer, floating point number, string ,etc. Besides, the schema for tags need t obe provided, like location and groupId in the example. The type of a tag can be integer, floating point number, string, etc. The static properties of a data collection point can be defined as tags, like the location, device type, device group ID, manager ID, etc. Tags in the schema can be added, removed or altered. Please refer to [STable](/taos-sql/STable) for more details.
+Similar to creating a normal table, when creating a STable, name and schema need to be provided too. In the STable schema, the first column must be timestamp (like ts in the example), and other columns (like current, voltage and phase in the example) are the data collected. The type of a column can be integer, floating point number, string ,etc. Besides, the schema for tags need to be provided, like location and groupId in the example. The type of a tag can be integer, floating point number, string, etc. The static properties of a data collection point can be defined as tags, like the location, device type, device group ID, manager ID, etc. Tags in the schema can be added, removed or updated. Please refer to [STable](/taos-sql/stable) for more details.
+
+Each kind of data collecting points needs a corresponding STable to be created, so there may be many STables in an application. For electrical power system, we need to create a STable respectively for meters, transformers, busbars, switches. There may be multiple kinds of data collecting points on a single device, for example there may be one data collecting point for electrical data like current and voltage and another point for environmental data like temperature, humidity and wind direction, multiple STables are required for such kind of device.
 
-Each kind of data collection points needs a corresponding STable to be created, so there may be many STables in an IoT system. For electrical power system, we need to create a STable respectively for meters, transformers, bug bars, switches. There may be multiple kinds of data collection points on a single device, for example there may be one data collection point for electrical data like current and voltage and another point for environmental data like temperature, humidity and wind direction, multiple STables are required for such kind of device.
+At most 4096 (or 1024 prior to version 2.1.7.0) columns are allowed in a STable. If there are more than 4096 of metrics to bo collected for a data collection point, multiple STables are required for such kind of data collection point. There can be multiple databases in system, while one or more STables can exist in a database.
 
-At most 4096 (or 1024 prior to version 2.1.7.0) columns are allowed in a STable. If there are more than 4096 of metrics to bo collected for a single collection point, multiple STables are required for such kind of data collection point. There can be multiple databases in system, while one or more STables can exist in a database.
 
 ## Create Table
 
@@ -59,7 +58,8 @@ A specific table needs to be created for each data collection point. Similar to
 CREATE TABLE d1001 USING meters TAGS ("Beijing.Chaoyang", 2);
 ```
 
-In the above SQL statement, "d1001" is the table name, "meters" is the STable name, followed by the value of tag "Location" and the value of tag "groupId", which are "Beijing.Chaoyang" and "2" respectively in the example. The tag values can be altered after the table is created. Please refer to [Tables](/taos-sql/table) for details.
+In the above SQL statement, "d1001" is the table name, "meters" is the STable name, followed by the value of tag "Location" and the value of tag "groupId", which are "Beijing.Chaoyang" and "2" respectively in the example. The tag values can be updated after the table is created. Please refer to [Tables](/taos-sql/table) for details.
+
 
 :::warning
 It's not recommended to create a table in a database while using a STable from another database as template.
@@ -67,7 +67,7 @@ It's not recommended to create a table in a database while using a STable from a
 :::tip
 It's suggested to use the global unique ID of a data collection point as the table name, for example the device serial number. If there isn't such a unique ID, multiple IDs that are not global unique can be combined to form a global unique ID. It's not recommended to use a global unique ID as tag value.
 
-### Create Table Automatically
+## Create Table Automatically
 
 In some circumstances, it's not sure whether the table already exists when inserting rows. The table can be created automatically using the SQL statement below, and nothing will happen if the table already exist.
 
@@ -81,6 +81,6 @@ For more details please refer to [Create Table Automatically](/taos-sql/insert#a
 
 ## Single Column vs Multiple Column
 
-Multiple columns data model is supported in TDengine. As long as multiple metrics are collected by same data collection point at same time, i.e. the timestamp are identical, these variables can be put in single STable as columns. However, there is another kind of design, i.e. single column data model, a table is created for each metric, which means a STable is required for each kind of metrics. For example, 3 STables are required for current, voltage and phase.
+Multiple columns data model is supported in TDengine. As long as multiple metrics are collected by same data collection point at same time, i.e. the timestamp are identical, these metrics can be put in single stable as columns. However, there is another kind of design, i.e. single column data model, a table is created for each metric, which means a STable is required for each kind of metric. For example, 3 STables are required for current, voltage and phase.
 
-It's recommended to use multiple column data model as possible because it's better in the speed of inserting or querying rows. In some cases, however, the metrics to be collected vary frequently and correspondingly the STable schema needs to be changed frequently too. In such case, it's more convenient to use single column data model.
+It's recommended to use multiple column data model as much as possible because it's better in the performance of inserting or querying rows. In some cases, however, the metrics to be collected vary frequently and correspondingly the STable schema needs to be changed frequently too. In such case, it's more convenient to use single column data model.

docs-en/21-tdinternal/30-iot-big-data.md

 ---
-title: 物联网大数据
-description: "物联网、工业互联网大数据的特点；物联网大数据平台应具备的功能和特点；通用大数据架构为什么不适合处理物联网数据；物联网、车联网、工业互联网大数据平台，为什么推荐使用 TDengine"
+title: IoT Big Data
+description: "Characteristics of IoT Big Data, why general big data platform does not work well for IoT? The required features for an IoT Big Data Platform"
 ---
 
-- [物联网、工业互联网大数据的特点](https://www.taosdata.com/blog/2019/07/09/105.html)
-- [物联网大数据平台应具备的功能和特点](https://www.taosdata.com/blog/2019/07/29/542.html)
-- [通用大数据架构为什么不适合处理物联网数据？](https://www.taosdata.com/blog/2019/07/09/107.html)
-- [物联网、车联网、工业互联网大数据平台，为什么推荐使用 TDengine？](https://www.taosdata.com/blog/2019/07/09/109.html)
+- [Characteristics of IoT Big Data](https://tdengine.com/2019/07/09/86.html)
+- [Why don’t General Big Data Platforms Fit IoT Scenarios?](https://tdengine.com/2019/07/09/92.html)
+- [Why TDengine is the Best Choice for IoT Big Data Processing?](https://tdengine.com/2019/07/09/94.html)
+- [Why Redis, Kafka, Spark aren’t Needed if TDengine is Used in the IoT Platform?](https://tdengine.com/2019/07/09/96.html)
+

docs-examples/php/connect.php

+<?php
+
+use TDengine\Connection;
+use TDengine\Exception\TDengineException;
+
+try {
+    // 实例化
+    $host = 'localhost';
+    $port = 6030;
+    $username = 'root';
+    $password = 'taosdata';
+    $dbname = null;
+    $connection = new Connection($host, $port, $username, $password, $dbname);
+
+    // 连接
+    $connection->connect();
+} catch (TDengineException $e) {
+    // 连接失败捕获异常
+    throw $e;
+}

docs-examples/php/insert.php

+<?php
+
+use TDengine\Connection;
+use TDengine\Exception\TDengineException;
+
+try {
+    // 实例化
+    $host = 'localhost';
+    $port = 6030;
+    $username = 'root';
+    $password = 'taosdata';
+    $dbname = 'power';
+    $connection = new Connection($host, $port, $username, $password, $dbname);
+
+    // 连接
+    $connection->connect();
+
+    // 插入
+    $connection->query('CREATE DATABASE if not exists power');
+    $connection->query('CREATE STABLE if not exists meters (ts TIMESTAMP, current FLOAT, voltage INT, phase FLOAT) TAGS (location BINARY(64), groupId INT)');
+    $resource = $connection->query(<<<'SQL'
+    INSERT INTO power.d1001 USING power.meters TAGS(Beijing.Chaoyang, 2) VALUES ('2018-10-03 14:38:05.000', 10.30000, 219, 0.31000) ('2018-10-03 14:38:15.000', 12.60000, 218, 0.33000) ('2018-10-03 14:38:16.800', 12.30000, 221, 0.31000)
+    power.d1002 USING power.meters TAGS(Beijing.Chaoyang, 3) VALUES ('2018-10-03 14:38:16.650', 10.30000, 218, 0.25000)
+    power.d1003 USING power.meters TAGS(Beijing.Haidian, 2) VALUES ('2018-10-03 14:38:05.500', 11.80000, 221, 0.28000) ('2018-10-03 14:38:16.600', 13.40000, 223, 0.29000)
+    power.d1004 USING power.meters TAGS(Beijing.Haidian, 3) VALUES ('2018-10-03 14:38:05.000', 10.80000, 223, 0.29000) ('2018-10-03 14:38:06.500', 11.50000, 221, 0.35000)
+    SQL);
+
+    // 影响行数
+    var_dump($resource->affectedRows());
+} catch (TDengineException $e) {
+    // 捕获异常
+    throw $e;
+}

docs-examples/php/insert_stmt.php

+<?php
+
+use TDengine\Connection;
+use TDengine\Exception\TDengineException;
+
+try {
+    // 实例化
+    $host = 'localhost';
+    $port = 6030;
+    $username = 'root';
+    $password = 'taosdata';
+    $dbname = 'power';
+    $connection = new Connection($host, $port, $username, $password, $dbname);
+
+    // 连接
+    $connection->connect();
+
+    // 插入
+    $connection->query('CREATE DATABASE if not exists power');
+    $connection->query('CREATE STABLE if not exists meters (ts TIMESTAMP, current FLOAT, voltage INT, phase FLOAT) TAGS (location BINARY(64), groupId INT)');
+    $stmt = $connection->prepare('INSERT INTO ? USING meters TAGS(?, ?) VALUES(?, ?, ?, ?)');
+
+    // 设置表名和标签
+    $stmt->setTableNameTags('d1001', [
+        // 支持格式同参数绑定
+        [TDengine\TSDB_DATA_TYPE_BINARY, 'Beijing.Chaoyang'],
+        [TDengine\TSDB_DATA_TYPE_INT, 2],
+    ]);
+
+    $stmt->bindParams([
+        [TDengine\TSDB_DATA_TYPE_TIMESTAMP, 1648432611249],
+        [TDengine\TSDB_DATA_TYPE_FLOAT, 10.3],
+        [TDengine\TSDB_DATA_TYPE_INT, 219],
+        [TDengine\TSDB_DATA_TYPE_FLOAT, 0.31],
+    ]);
+    $stmt->bindParams([
+        [TDengine\TSDB_DATA_TYPE_TIMESTAMP, 1648432611749],
+        [TDengine\TSDB_DATA_TYPE_FLOAT, 12.6],
+        [TDengine\TSDB_DATA_TYPE_INT, 218],
+        [TDengine\TSDB_DATA_TYPE_FLOAT, 0.33],
+    ]);
+    $resource = $stmt->execute();
+
+    // 影响行数
+    var_dump($resource->affectedRows());
+} catch (TDengineException $e) {
+    // 捕获异常
+    throw $e;
+}

docs-examples/php/query.php

+<?php
+
+use TDengine\Connection;
+use TDengine\Exception\TDengineException;
+
+try {
+    // 实例化
+    $host = 'localhost';
+    $port = 6030;
+    $username = 'root';
+    $password = 'taosdata';
+    $dbname = 'power';
+    $connection = new Connection($host, $port, $username, $password, $dbname);
+
+    // 连接
+    $connection->connect();
+
+    $resource = $connection->query('SELECT ts, current FROM meters LIMIT 2');
+    var_dump($resource->fetch());
+} catch (TDengineException $e) {
+    // 捕获异常
+    throw $e;
+}

documentation20/cn/08.connector/03.php/docs.md

@@ -26,7 +26,7 @@
 **下载代码并解压：**
 
 ```shell
-curl -L -o php-tdengine.tar.gz https://github.com/Yurunsoft/php-tdengine/archive/refs/tags/v1.0.0.tar.gz \
+curl -L -o php-tdengine.tar.gz https://github.com/Yurunsoft/php-tdengine/archive/refs/tags/v1.0.2.tar.gz \
 && mkdir php-tdengine \
 && tar -xzf php-tdengine.tar.gz -C php-tdengine --strip-components=1
 ```
@@ -95,7 +95,7 @@ $db = null;
 // 实例化
 $connection = new Connection($host, $port, $user, $pass, $db);
 // 连接
-$connection->connection();
+$connection->connect();
 // 获取连接参数
 $connection->getHost();
 $connection->getPort();
@@ -140,6 +140,11 @@ $resource->close();
 ```php
 // 查询
 $stmt = $connection->prepare($sql); // 支持查询和插入，参数用?占位
+// 设置表名和标签
+$stmt->setTableNameTags('表名', [
+    // 支持格式同参数绑定
+    [TDengine\TSDB_DATA_TYPE_INT, 36],
+]);
 // 绑定参数方法1
 $stmt->bindParams(
     // [字段类型, 值]

packaging/tools/install.sh

@@ -15,6 +15,7 @@ serverFqdn=""
 # -----------------------Variables definition---------------------
 script_dir=$(dirname $(readlink -f "$0"))
 # Dynamic directory
+
 clientName="taos"
 serverName="taosd"
 configFile="taos.cfg"
@@ -27,6 +28,10 @@ dataDir="/var/lib/taos"
 logDir="/var/log/taos"
 configDir="/etc/taos"
 installDir="/usr/local/taos"
+adapterName="taosadapter"
+benchmarkName="taosBenchmark"
+dumpName="taosdump"
+demoName="taosdemo"
 
 data_dir=${dataDir}
 log_dir=${logDir}
@@ -39,7 +44,6 @@ inc_link_dir="/usr/include"
 
 #install main path
 install_main_dir=${installDir}
-
 # old bin dir
 bin_dir="${installDir}/bin"
 
@@ -122,6 +126,9 @@ else
 fi
 
 # =============================  get input parameters =================================================
+
+# install.sh -v [server | client]  -e [yes | no] -i [systemd | service | ...]
+
 # set parameters by default value
 interactiveFqdn=yes # [yes | no]
 verType=server      # [server | client]
@@ -167,11 +174,11 @@ function install_main_path() {
   ${csudo}mkdir -p ${install_main_dir}
   ${csudo}mkdir -p ${install_main_dir}/cfg
   ${csudo}mkdir -p ${install_main_dir}/bin
-  #    ${csudo}mkdir -p ${install_main_dir}/connector
+  #  ${csudo}mkdir -p ${install_main_dir}/connector
   ${csudo}mkdir -p ${install_main_dir}/driver
   ${csudo}mkdir -p ${install_main_dir}/examples
   ${csudo}mkdir -p ${install_main_dir}/include
-  #    ${csudo}mkdir -p ${install_main_dir}/init.d
+  #  ${csudo}mkdir -p ${install_main_dir}/init.d
   if [ "$verMode" == "cluster" ]; then
     ${csudo}mkdir -p ${nginx_dir}
   fi
@@ -185,13 +192,11 @@ function install_bin() {
   # Remove links
   ${csudo}rm -f ${bin_link_dir}/${clientName} || :
   ${csudo}rm -f ${bin_link_dir}/${serverName} || :
-  ${csudo}rm -f ${bin_link_dir}/taosadapter || :
-  ${csudo}rm -f ${bin_link_dir}/taosdemo || :
-  ${csudo}rm -f ${bin_link_dir}/taosdump || :
+  ${csudo}rm -f ${bin_link_dir}/${adapterName} || :
   ${csudo}rm -f ${bin_link_dir}/${uninstallScript} || :
   ${csudo}rm -f ${bin_link_dir}/tarbitrator || :
   ${csudo}rm -f ${bin_link_dir}/set_core || :
-  ${csudo}rm -f ${bin_link_dir}/run_taosd_and_taosadapter.sh || :
+  ${csudo}rm -f ${bin_link_dir}/run_${serverName}_and_${adapterName}.sh || :
   ${csudo}rm -f ${bin_link_dir}/TDinsight.sh || :
 
   ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
@@ -199,14 +204,14 @@ function install_bin() {
   #Make link
   [ -x ${install_main_dir}/bin/${clientName} ] && ${csudo}ln -s ${install_main_dir}/bin/${clientName} ${bin_link_dir}/${clientName} || :
   [ -x ${install_main_dir}/bin/${serverName} ] && ${csudo}ln -s ${install_main_dir}/bin/${serverName} ${bin_link_dir}/${serverName} || :
-  [ -x ${install_main_dir}/bin/taosadapter ] && ${csudo}ln -s ${install_main_dir}/bin/taosadapter ${bin_link_dir}/taosadapter || :
-  [ -x ${install_main_dir}/bin/taosBenchmark ] && ${csudo}ln -s ${install_main_dir}/bin/taosBenchmark ${bin_link_dir}/taosdemo || :
-  [ -x ${install_main_dir}/bin/taosBenchmark ] && ${csudo}ln -s ${install_main_dir}/bin/taosBenchmark ${bin_link_dir}/taosBenchmark || :
-  [ -x ${install_main_dir}/bin/taosdump ] && ${csudo}ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || :
+  [ -x ${install_main_dir}/bin/${adapterName} ] && ${csudo}ln -s ${install_main_dir}/bin/${adapterName} ${bin_link_dir}/${adapterName} || :
+  [ -x ${install_main_dir}/bin/${benchmarkName} ] && ${csudo}ln -s ${install_main_dir}/bin/${benchmarkName} ${bin_link_dir}/${demoName} || :
+  [ -x ${install_main_dir}/bin/${benchmarkName} ] && ${csudo}ln -s ${install_main_dir}/bin/${benchmarkName} ${bin_link_dir}/${benchmarkName} || :
+  [ -x ${install_main_dir}/bin/${dumpName} ] && ${csudo}ln -s ${install_main_dir}/bin/${dumpName} ${bin_link_dir}/${dumpName} || :
   [ -x ${install_main_dir}/bin/TDinsight.sh ] && ${csudo}ln -s ${install_main_dir}/bin/TDinsight.sh ${bin_link_dir}/TDinsight.sh || :
   [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/${uninstallScript} || :
   [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
-  [ -x ${install_main_dir}/bin/run_taosd_and_taosadapter.sh ] && ${csudo}ln -s ${install_main_dir}/bin/run_taosd_and_taosadapter.sh ${bin_link_dir}/run_taosd_and_taosadapter.sh || :
+  [ -x ${install_main_dir}/bin/run_${serverName}_and_${adapterName}.sh ] && ${csudo}ln -s ${install_main_dir}/bin/run_${serverName}_and_${adapterName}.sh ${bin_link_dir}/run_${serverName}_and_${adapterName}.sh || :
   [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo}ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
 
   if [ "$verMode" == "cluster" ]; then
@@ -220,6 +225,7 @@ function install_lib() {
   # Remove links
   ${csudo}rm -f ${lib_link_dir}/libtaos.* || :
   ${csudo}rm -f ${lib64_link_dir}/libtaos.* || :
+  #${csudo}rm -rf ${v15_java_app_dir}              || :
   ${csudo}cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo}chmod 777 ${install_main_dir}/driver/*
 
   ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
@@ -350,9 +356,6 @@ function set_hostname() {
     echo "set hostname fail!"
     return
   fi
-  #echo -e -n "$(hostnamectl status --static)"
-  #echo -e -n "$(hostnamectl status --transient)"
-  #echo -e -n "$(hostnamectl status --pretty)"
 
   #ubuntu/centos /etc/hostname
   if [[ -e /etc/hostname ]]; then
@@ -465,24 +468,25 @@ function local_fqdn_check() {
   fi
 }
 
-function install_taosadapter_config() {
-  if [ ! -f "${cfg_install_dir}/taosadapter.toml" ]; then
+function install_adapter_config() {
+  if [ ! -f "${cfg_install_dir}/${adapterName}.toml" ]; then
     ${csudo}mkdir -p ${cfg_install_dir}
-    [ -f ${script_dir}/cfg/taosadapter.toml ] && ${csudo}cp ${script_dir}/cfg/taosadapter.toml ${cfg_install_dir}
-    [ -f ${cfg_install_dir}/taosadapter.toml ] && ${csudo}chmod 644 ${cfg_install_dir}/taosadapter.toml
+    [ -f ${script_dir}/cfg/${adapterName}.toml ] && ${csudo}cp ${script_dir}/cfg/${adapterName}.toml ${cfg_install_dir}
+    [ -f ${cfg_install_dir}/${adapterName}.toml ] && ${csudo}chmod 644 ${cfg_install_dir}/${adapterName}.toml
   fi
 
-  [ -f ${script_dir}/cfg/taosadapter.toml ] &&
-    ${csudo}cp -f ${script_dir}/cfg/taosadapter.toml ${cfg_install_dir}/taosadapter.toml.new
+  [ -f ${script_dir}/cfg/${adapterName}.toml ] &&
+    ${csudo}cp -f ${script_dir}/cfg/${adapterName}.toml ${cfg_install_dir}/${adapterName}.toml.new
 
-  [ -f ${cfg_install_dir}/taosadapter.toml ] &&
-    ${csudo}ln -s ${cfg_install_dir}/taosadapter.toml ${install_main_dir}/cfg/taosadapter.toml
+  [ -f ${cfg_install_dir}/${adapterName}.toml ] &&
+    ${csudo}ln -s ${cfg_install_dir}/${adapterName}.toml ${install_main_dir}/cfg/${adapterName}.toml
 
   [ ! -z $1 ] && return 0 || : # only install client
 
 }
 
 function install_config() {
+
   if [ ! -f "${cfg_install_dir}/${configFile}" ]; then
     ${csudo}mkdir -p ${cfg_install_dir}
     [ -f ${script_dir}/cfg/${configFile} ] && ${csudo}cp ${script_dir}/cfg/${configFile} ${cfg_install_dir}
@@ -504,12 +508,6 @@ function install_config() {
 
   local_fqdn_check
 
-  #FQDN_FORMAT="(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
-  #FQDN_FORMAT="(:[1-6][0-9][0-9][0-9][0-9]$)"
-  #PORT_FORMAT="(/[1-6][0-9][0-9][0-9][0-9]?/)"
-  #FQDN_PATTERN=":[0-9]{1,5}$"
-
-  # first full-qualified domain name (FQDN) for TDengine cluster system
   echo
   echo -e -n "${GREEN}Enter FQDN:port (like h1.${emailName}:6030) of an existing ${productName} cluster node to join${NC}"
   echo
@@ -517,37 +515,21 @@ function install_config() {
   read firstEp
   while true; do
     if [ ! -z "$firstEp" ]; then
-      # check the format of the firstEp
-      #if [[ $firstEp == $FQDN_PATTERN ]]; then
-      # Write the first FQDN to configuration file
       ${csudo}sed -i -r "s/#*\s*(firstEp\s*).*/\1$firstEp/" ${cfg_install_dir}/${configFile}
       break
-      #else
-      #    read -p "Please enter the correct FQDN:port: " firstEp
-      #fi
     else
       break
     fi
   done
 
-  # user email
-  #EMAIL_PATTERN='^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$'
-  #EMAIL_PATTERN='^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$'
-  #EMAIL_PATTERN="^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$"
   echo
   echo -e -n "${GREEN}Enter your email address for priority support or enter empty to skip${NC}: "
   read emailAddr
   while true; do
     if [ ! -z "$emailAddr" ]; then
-      # check the format of the emailAddr
-      #if [[ "$emailAddr" =~ $EMAIL_PATTERN ]]; then
-      # Write the email address to temp file
       email_file="${install_main_dir}/email"
       ${csudo}bash -c "echo $emailAddr > ${email_file}"
       break
-      #else
-      #    read -p "Please enter the correct email address: " emailAddr
-      #fi
     else
       break
     fi
@@ -622,16 +604,15 @@ function install_service_on_sysvinit() {
   clean_service_on_sysvinit
   sleep 1
 
-  # Install server service
   if ((${os_type} == 1)); then
-    #        ${csudo}cp -f ${script_dir}/init.d/${serverName}.deb ${install_main_dir}/init.d/${serverName}
+    #    ${csudo}cp -f ${script_dir}/init.d/${serverName}.deb ${install_main_dir}/init.d/${serverName}
     ${csudo}cp ${script_dir}/init.d/${serverName}.deb ${service_config_dir}/${serverName} && ${csudo}chmod a+x ${service_config_dir}/${serverName}
-    #        ${csudo}cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
+    #    ${csudo}cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
     ${csudo}cp ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo}chmod a+x ${service_config_dir}/tarbitratord
   elif ((${os_type} == 2)); then
-    #        ${csudo}cp -f ${script_dir}/init.d/${serverName}.rpm ${install_main_dir}/init.d/${serverName}
+    #    ${csudo}cp -f ${script_dir}/init.d/${serverName}.rpm ${install_main_dir}/init.d/${serverName}
     ${csudo}cp ${script_dir}/init.d/${serverName}.rpm ${service_config_dir}/${serverName} && ${csudo}chmod a+x ${service_config_dir}/${serverName}
-    #        ${csudo}cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
+    #    ${csudo}cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
     ${csudo}cp ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo}chmod a+x ${service_config_dir}/tarbitratord
   fi
 
@@ -694,21 +675,24 @@ function install_service_on_systemd() {
       ${service_config_dir}/ || :
   ${csudo}systemctl daemon-reload
 
-  [ -f ${script_dir}/cfg/nginxd.service ] &&
-    ${csudo}cp ${script_dir}/cfg/nginxd.service \
-      ${service_config_dir}/ || :
+  if [ "$verMode" == "cluster" ]; then
+    [ -f ${script_dir}/cfg/nginxd.service ] &&
+      ${csudo}cp ${script_dir}/cfg/nginxd.service \
+        ${service_config_dir}/ || :
+    ${csudo}systemctl daemon-reload
 
-  if ! ${csudo}systemctl enable nginxd &>/dev/null; then
-    ${csudo}systemctl daemon-reexec
-    ${csudo}systemctl enable nginxd
+    if ! ${csudo}systemctl enable nginxd &>/dev/null; then
+      ${csudo}systemctl daemon-reexec
+      ${csudo}systemctl enable nginxd
+    fi
+    ${csudo}systemctl start nginxd
   fi
-  ${csudo}systemctl start nginxd
 }
 
-function install_taosadapter_service() {
+function install_adapter_service() {
   if ((${service_mod} == 0)); then
-    [ -f ${script_dir}/cfg/taosadapter.service ] &&
-      ${csudo}cp ${script_dir}/cfg/taosadapter.service \
+    [ -f ${script_dir}/cfg/${adapterName}.service ] &&
+      ${csudo}cp ${script_dir}/cfg/${adapterName}.service \
         ${service_config_dir}/ || :
     ${csudo}systemctl daemon-reload
   fi
@@ -760,7 +744,6 @@ function is_version_compatible() {
     min_compatible_version=$(${script_dir}/bin/${serverName} -V | head -1 | cut -d ' ' -f 5)
   fi
 
-  # [TD-5628] prompt to execute taosd --force-keep-file if upgrade from lower version within 2.0.16.0
   exist_version=$(${installDir}/bin/${serverName} -V | head -1 | cut -d ' ' -f 3)
   vercomp $exist_version "2.0.16.0"
   case $? in
@@ -779,7 +762,7 @@ function is_version_compatible() {
   esac
 }
 
-function update_TDengine() {
+function updateProduct() {
   # Check if version compatible
   if ! is_version_compatible; then
     echo -e "${RED}Version incompatible${NC}"
@@ -793,8 +776,6 @@ function update_TDengine() {
   fi
   tar -zxf ${tarName}
   install_jemalloc
-  #install_avro lib
-  #install_avro lib64
 
   echo -e "${GREEN}Start to update ${productName}...${NC}"
   # Stop the service if running
@@ -836,9 +817,9 @@ function update_TDengine() {
   if [ -z $1 ]; then
     install_bin
     install_service
-    install_taosadapter_service
+    install_adapter_service
     install_config
-    install_taosadapter_config
+    install_adapter_config
 
     openresty_work=false
     if [ "$verMode" == "cluster" ]; then
@@ -854,17 +835,15 @@ function update_TDengine() {
       fi
     fi
 
-    #echo
-    #echo -e "\033[44;32;1mTDengine is updated successfully!${NC}"
     echo
-    echo -e "${GREEN_DARK}To configure ${productName} ${NC}: edit ${configDir}/${configFile}"
-    echo -e "${GREEN_DARK}To configure Taos Adapter (if has) ${NC}: edit ${configDir}/taosadapter.toml"
+    echo -e "${GREEN_DARK}To configure ${productName} ${NC}: edit ${cfg_install_dir}/${configFile}"
+    echo -e "${GREEN_DARK}To configure Adapter (if has) ${NC}: edit ${cfg_install_dir}/${adapterName}.toml"
     if ((${service_mod} == 0)); then
       echo -e "${GREEN_DARK}To start ${productName}     ${NC}: ${csudo}systemctl start ${serverName}${NC}"
     elif ((${service_mod} == 1)); then
       echo -e "${GREEN_DARK}To start ${productName}     ${NC}: ${csudo}service ${serverName} start${NC}"
     else
-      echo -e "${GREEN_DARK}To start Taos Adapter (if has)${NC}: taosadapter &${NC}"
+      echo -e "${GREEN_DARK}To start Adapter (if has)${NC}: ${adapterName} &${NC}"
       echo -e "${GREEN_DARK}To start ${productName}     ${NC}: ./${serverName}${NC}"
     fi
 
@@ -888,10 +867,10 @@ function update_TDengine() {
     echo -e "\033[44;32;1m${productName} client is updated successfully!${NC}"
   fi
 
-  rm -rf $(tar -tf ${tarName} |grep -v "^\./$")
+  rm -rf $(tar -tf ${tarName} | grep -v "^\./$")
 }
 
-function install_TDengine() {
+function installProduct() {
   # Start to install
   if [ ! -e ${tarName} ]; then
     echo "File ${tarName} does not exist"
@@ -923,7 +902,8 @@ function install_TDengine() {
     # For installing new
     install_bin
     install_service
-    install_taosadapter_service
+    install_adapter_service
+    install_adapter_config
 
     openresty_work=false
     if [ "$verMode" == "cluster" ]; then
@@ -941,17 +921,15 @@ function install_TDengine() {
     install_config
 
     # Ask if to start the service
-    #echo
-    #echo -e "\033[44;32;1mTDengine is installed successfully!${NC}"
     echo
-    echo -e "${GREEN_DARK}To configure ${productName} ${NC}: edit ${configDir}/${configFile}"
-    echo -e "${GREEN_DARK}To configure taosadapter (if has) ${NC}: edit ${configDir}/taosadapter.toml"
+    echo -e "${GREEN_DARK}To configure ${productName} ${NC}: edit ${cfg_install_dir}/${configFile}"
+    echo -e "${GREEN_DARK}To configure ${adapterName} (if has) ${NC}: edit ${cfg_install_dir}/${adapterName}.toml"
     if ((${service_mod} == 0)); then
       echo -e "${GREEN_DARK}To start ${productName}     ${NC}: ${csudo}systemctl start ${serverName}${NC}"
     elif ((${service_mod} == 1)); then
       echo -e "${GREEN_DARK}To start ${productName}     ${NC}: ${csudo}service ${serverName} start${NC}"
     else
-      echo -e "${GREEN_DARK}To start Taos Adapter (if has)${NC}: taosadapter &${NC}"
+      echo -e "${GREEN_DARK}To start Adapter (if has)${NC}: ${adapterName} &${NC}"
       echo -e "${GREEN_DARK}To start ${productName}     ${NC}: ${serverName}${NC}"
     fi
 
@@ -985,7 +963,7 @@ function install_TDengine() {
   fi
 
   touch ~/.${historyFile}
-  rm -rf $(tar -tf ${tarName} |grep -v "^\./$")
+  rm -rf $(tar -tf ${tarName} | grep -v "^\./$")
 }
 
 ## ==============================Main program starts from here============================
@@ -994,18 +972,18 @@ if [ "$verType" == "server" ]; then
   # Install server and client
   if [ -x ${bin_dir}/${serverName} ]; then
     update_flag=1
-    update_TDengine
+    updateProduct
   else
-    install_TDengine
+    installProduct
   fi
 elif [ "$verType" == "client" ]; then
   interactiveFqdn=no
   # Only install client
   if [ -x ${bin_dir}/${clientName} ]; then
     update_flag=1
-    update_TDengine client
+    updateProduct client
   else
-    install_TDengine client
+    installProduct client
   fi
 else
   echo "please input correct verType"

packaging/tools/makepkg.sh

@@ -60,13 +60,15 @@ if [ "$pagMode" == "lite" ]; then
   strip ${build_dir}/bin/${serverName}
   strip ${build_dir}/bin/${clientName}
   # lite version doesn't include taosadapter,  which will lead to no restful interface
-  bin_files="${build_dir}/bin/${serverName} ${build_dir}/bin/${clientName} ${script_dir}/remove.sh ${script_dir}/startPre.sh ${build_dir}/bin/taosBenchmark"
+  bin_files="${build_dir}/bin/${serverName} ${build_dir}/bin/${clientName} ${script_dir}/remove.sh ${script_dir}/startPre.sh ${build_dir}/bin/${benchmarkName}"
   taostools_bin_files=""
 else
 
-  wget https://github.com/taosdata/grafanaplugin/releases/latest/download/TDinsight.sh -O ${build_dir}/bin/TDinsight.sh \
-      && echo "TDinsight.sh downloaded!" \
-      || echo "failed to download TDinsight.sh"
+
+  wget https://github.com/taosdata/grafanaplugin/releases/latest/download/TDinsight.sh -O ${build_dir}/bin/TDinsight.sh &&
+    echo "TDinsight.sh downloaded!" ||
+    echo "failed to download TDinsight.sh"
+
   # download TDinsight caches
   orig_pwd=$(pwd)
   tdinsight_caches=""
@@ -76,11 +78,12 @@ else
   cd $orig_pwd
   echo "TDinsight caches: $tdinsight_caches"
 
-  taostools_bin_files=" ${build_dir}/bin/taosdump \
-      ${build_dir}/bin/taosBenchmark \
+  taostools_bin_files=" ${build_dir}/bin/${dumpName} \
+      ${build_dir}/bin/${benchmarkName} \
       ${build_dir}/bin/TDinsight.sh \
       $tdinsight_caches"
 
+  #!!! do not change taosadapter here
   bin_files="${build_dir}/bin/${serverName} \
       ${build_dir}/bin/${clientName} \
       ${taostools_bin_files} \
@@ -115,10 +118,11 @@ mkdir -p ${install_dir}
 mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc
 mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/${configFile} ${install_dir}/cfg/${configFile}
 
+# !!! do not change the taosadapter here!!!
 if [ -f "${compile_dir}/test/cfg/taosadapter.toml" ]; then
   cp ${compile_dir}/test/cfg/taosadapter.toml ${install_dir}/cfg || :
 fi
-
+# !!! do not change the taosadapter here!!!
 if [ -f "${compile_dir}/test/cfg/taosadapter.service" ]; then
   cp ${compile_dir}/test/cfg/taosadapter.service ${install_dir}/cfg || :
 fi
@@ -141,50 +145,52 @@ mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/${se
 mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_deb} ${install_dir}/init.d/tarbitratord.deb || :
 mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_rpm} ${install_dir}/init.d/tarbitratord.rpm || :
 
+# !!! do not change taosadaptor here
 if [ $adapterName != "taosadapter" ]; then
+  # !!! do not change taosadaptor here
   mv ${install_dir}/cfg/taosadapter.toml ${install_dir}/cfg/$adapterName.toml
   sed -i "s/path = \"\/var\/log\/taos\"/path = \"\/var\/log\/${productName}\"/g" ${install_dir}/cfg/$adapterName.toml
   sed -i "s/password = \"taosdata\"/password = \"${defaultPasswd}\"/g" ${install_dir}/cfg/$adapterName.toml
-
+  # !!! do not change taosadaptor here
   mv ${install_dir}/cfg/taosadapter.service ${install_dir}/cfg/$adapterName.service
   sed -i "s/TDengine/${productName}/g" ${install_dir}/cfg/$adapterName.service
   sed -i "s/taosAdapter/${adapterName}/g" ${install_dir}/cfg/$adapterName.service
   sed -i "s/taosadapter/${adapterName}/g" ${install_dir}/cfg/$adapterName.service
-
+  # !!! do not change taosadaptor here
   mv ${install_dir}/bin/taosadapter ${install_dir}/bin/${adapterName}
   mv ${install_dir}/bin/run_taosd_and_taosadapter.sh ${install_dir}/bin/run_${serverName}_and_${adapterName}.sh
   mv ${install_dir}/bin/taosd-dump-cfg.gdb ${install_dir}/bin/${serverName}-dump-cfg.gdb
 fi
 
 if [ -n "${taostools_bin_files}" ]; then
-    mkdir -p ${taostools_install_dir} || echo -e "failed to create ${taostools_install_dir}"
-    mkdir -p ${taostools_install_dir}/bin \
-        && cp ${taostools_bin_files} ${taostools_install_dir}/bin \
-        && chmod a+x ${taostools_install_dir}/bin/* || :
-
-    if [ -f ${top_dir}/src/kit/taos-tools/packaging/tools/install-taostools.sh ]; then
-        cp ${top_dir}/src/kit/taos-tools/packaging/tools/install-taostools.sh \
-            ${taostools_install_dir}/ > /dev/null \
-            && chmod a+x ${taostools_install_dir}/install-taostools.sh \
-            || echo -e "failed to copy install-taostools.sh"
-    else
-        echo -e "install-taostools.sh not found"
-    fi
+  mkdir -p ${taostools_install_dir} || echo -e "failed to create ${taostools_install_dir}"
+  mkdir -p ${taostools_install_dir}/bin &&
+    cp ${taostools_bin_files} ${taostools_install_dir}/bin &&
+    chmod a+x ${taostools_install_dir}/bin/* || :
+
+  if [ -f ${top_dir}/src/kit/taos-tools/packaging/tools/install-${toolsName}.sh ]; then
+    cp ${top_dir}/src/kit/taos-tools/packaging/tools/install-${toolsName}.sh \
+      ${taostools_install_dir}/ >/dev/null &&
+      chmod a+x ${taostools_install_dir}/install-${toolsName}.sh ||
+      echo -e "failed to copy install-${toolsName}.sh"
+  else
+    echo -e "install-${toolsName}.sh not found"
+  fi
 
-    if [ -f ${top_dir}/src/kit/taos-tools/packaging/tools/uninstall-taostools.sh ]; then
-        cp ${top_dir}/src/kit/taos-tools/packaging/tools/uninstall-taostools.sh \
-            ${taostools_install_dir}/ > /dev/null \
-            && chmod a+x ${taostools_install_dir}/uninstall-taostools.sh \
-            || echo -e "failed to copy uninstall-taostools.sh"
-    else
-        echo -e "uninstall-taostools.sh not found"
-    fi
+  if [ -f ${top_dir}/src/kit/taos-tools/packaging/tools/uninstall-${toolsName}.sh ]; then
+    cp ${top_dir}/src/kit/taos-tools/packaging/tools/uninstall-${toolsName}.sh \
+      ${taostools_install_dir}/ >/dev/null &&
+      chmod a+x ${taostools_install_dir}/uninstall-${toolsName}.sh ||
+      echo -e "failed to copy uninstall-${toolsName}.sh"
+  else
+    echo -e "uninstall-${toolsName}.sh not found"
+  fi
 
-    if [ -f ${build_dir}/lib/libavro.so.23.0.0 ]; then
-        mkdir -p ${taostools_install_dir}/avro/{lib,lib/pkgconfig} || echo -e "failed to create ${taostools_install_dir}/avro"
-        cp ${build_dir}/lib/libavro.* ${taostools_install_dir}/avro/lib
-        cp ${build_dir}/lib/pkgconfig/avro-c.pc ${taostools_install_dir}/avro/lib/pkgconfig
-    fi
+  if [ -f ${build_dir}/lib/libavro.so.23.0.0 ]; then
+    mkdir -p ${taostools_install_dir}/avro/{lib,lib/pkgconfig} || echo -e "failed to create ${taostools_install_dir}/avro"
+    cp ${build_dir}/lib/libavro.* ${taostools_install_dir}/avro/lib
+    cp ${build_dir}/lib/pkgconfig/avro-c.pc ${taostools_install_dir}/avro/lib/pkgconfig
+  fi
 fi
 
 if [ -f ${build_dir}/bin/jemalloc-config ]; then
@@ -366,13 +372,13 @@ if [ "$exitcode" != "0" ]; then
 fi
 
 if [ -n "${taostools_bin_files}" ]; then
-    wget https://github.com/taosdata/grafanaplugin/releases/latest/download/TDinsight.sh -O ${taostools_install_dir}/bin/TDinsight.sh && echo "TDinsight.sh downloaded!"|| echo "failed to download TDinsight.sh"
-    tar -zcv -f "$(basename ${taostools_pkg_name}).tar.gz" "$(basename ${taostools_install_dir})" --remove-files || :
-    exitcode=$?
-    if [ "$exitcode" != "0" ]; then
-        echo "tar ${taostools_pkg_name}.tar.gz error !!!"
-        exit $exitcode
-    fi
+  wget https://github.com/taosdata/grafanaplugin/releases/latest/download/TDinsight.sh -O ${taostools_install_dir}/bin/TDinsight.sh && echo "TDinsight.sh downloaded!" || echo "failed to download TDinsight.sh"
+  tar -zcv -f "$(basename ${taostools_pkg_name}).tar.gz" "$(basename ${taostools_install_dir})" --remove-files || :
+  exitcode=$?
+  if [ "$exitcode" != "0" ]; then
+    echo "tar ${taostools_pkg_name}.tar.gz error !!!"
+    exit $exitcode
+  fi
 fi
 
 cd ${curr_dir}