This is an automated email from the ASF dual-hosted git repository.
zhaoqingran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new 7d5082f06 remove and translate chinese to english in
collector,script,push,remoting and manager module (#1774)
7d5082f06 is described below
commit 7d5082f060204679cbf3a37e33eb2b9f102ed0b9
Author: Manan Pujara <[email protected]>
AuthorDate: Thu Apr 18 13:32:05 2024 +0530
remove and translate chinese to english in collector,script,push,remoting
and manager module (#1774)
Signed-off-by: Manan Pujara
<[email protected]>
Signed-off-by: Logic <[email protected]>
Co-authored-by: Logic <[email protected]>
---
.../controller/AlertDefineControllerTest.java | 6 ++--
.../controller/AlertDefinesControllerTest.java | 24 ++++++-------
.../alert/controller/AlertsControllerTest.java | 6 ++--
collector/pom.xml | 32 ++++++++---------
manager/pom.xml | 42 +++++++++++-----------
pom.xml | 2 +-
.../hertzbeat/push/controller/PushController.java | 10 +++---
.../push/controller/PushGatewayController.java | 4 +--
remoting/README.md | 10 ++----
script/assembly/collector/assembly-linux-amd64.xml | 20 +++++------
script/assembly/collector/assembly-linux-arm64.xml | 20 +++++------
script/assembly/collector/assembly-macos-amd64.xml | 20 +++++------
script/assembly/collector/assembly-macos-arm64.xml | 20 +++++------
script/assembly/collector/assembly-windows-64.xml | 20 +++++------
script/assembly/collector/assembly.xml | 20 +++++------
warehouse/pom.xml | 2 +-
16 files changed, 127 insertions(+), 131 deletions(-)
diff --git
a/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefineControllerTest.java
b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefineControllerTest.java
index 556763a34..5827e35dc 100644
---
a/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefineControllerTest.java
+++
b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefineControllerTest.java
@@ -63,7 +63,7 @@ class AlertDefineControllerTest {
@BeforeEach
void setUp() {
- // standaloneSetup: 独立安装, 不集成web环境测试
+ // standaloneSetup: Standalone setup, not integrated with a web
environment for testing
this.mockMvc =
MockMvcBuilders.standaloneSetup(alertDefineController).build();
this.alertDefine = AlertDefine.builder()
@@ -99,7 +99,7 @@ class AlertDefineControllerTest {
@Test
void addNewAlertDefine() throws Exception {
- // 模拟客户端往服务端发送请求
+ // Simulate the client sending a request to the server
mockMvc.perform(MockMvcRequestBuilders.post("/api/alert/define")
.contentType(MediaType.APPLICATION_JSON)
.content(JsonUtil.toJson(this.alertDefine)))
@@ -120,7 +120,7 @@ class AlertDefineControllerTest {
@Test
void getAlertDefine() throws Exception {
- // 模拟getAlertDefine返回数据
+ // Simulate returning data from getAlertDefine
Mockito.when(alertDefineService.getAlertDefine(this.alertDefine.getId()))
.thenReturn(this.alertDefine);
diff --git
a/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefinesControllerTest.java
b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefinesControllerTest.java
index 58532f256..fd72ba974 100644
---
a/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefinesControllerTest.java
+++
b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefinesControllerTest.java
@@ -44,7 +44,7 @@ import static
org.springframework.test.web.servlet.result.MockMvcResultMatchers.
/**
* Test case for {@link AlertDefinesController}
- * 测试mock处的数据是否正确，测试返回的数据格式是否正确
+ * Test whether the data mocked at the mock is correct, and test whether the
format of the returned data is correct
*
*
*/
@@ -59,7 +59,7 @@ class AlertDefinesControllerTest {
@Mock
AlertDefineService alertDefineService;
- // 参数如下，为了避免默认值干扰，默认值已经被替换
+ // Parameters to avoid default values interference, default values have
been replaced
List<Long> ids = Stream.of(6565463543L,
6565463544L).collect(Collectors.toList());
Byte priority = Byte.parseByte("1");
String sort = "gmtCreate";
@@ -67,21 +67,21 @@ class AlertDefinesControllerTest {
Integer pageIndex = 1;
Integer pageSize = 7;
- // 参数集合
+ // Parameter collection
Map<String, Object> content = new HashMap<String, Object>();
- // 用于mock的对象
+ // Object for mock
PageRequest pageRequest;
- // 由于specification被使用于动态代理，所以无法mock
- // 缺失的调试参数是ids、priority
- // 缺失部分已经通过手动输出测试
+ // Since the specification is used in dynamic proxy, it cannot be mocked
+ // Missing debugging parameters are ids, priority
+ // The missing part has been manually output for testing
@BeforeEach
void setUp() {
this.mockMvc =
MockMvcBuilders.standaloneSetup(alertDefinesController).build();
- // 配置测试内容
+ // Configure test content
content.put("ids", ids);
content.put("priority", priority);
content.put("sort", sort);
@@ -89,7 +89,7 @@ class AlertDefinesControllerTest {
content.put("pageIndex", pageIndex);
content.put("pageSize", pageSize);
- // mock的pageRequest
+ // Mocked pageRequest
Sort sortExp = Sort.by(new
Sort.Order(Sort.Direction.fromString(content.get("order").toString()),
content.get("sort").toString()));
pageRequest = PageRequest.of(((Integer)
content.get("pageIndex")).intValue(), ((Integer)
content.get("pageSize")).intValue(), sortExp);
}
@@ -97,12 +97,12 @@ class AlertDefinesControllerTest {
// @Test
// todo: fix this test
void getAlertDefines() throws Exception {
- // 测试mock正确性
- // 虽然无法mock对象，但是可以用class文件去存根
+ // Test the correctness of the mock
+ // Although objects cannot be mocked, stubs can be stored using class
files
//
Mockito.when(alertDefineService.getAlertDefines(Mockito.any(Specification.class),
Mockito.argThat(new ArgumentMatcher<PageRequest>() {
// @Override
// public boolean matches(PageRequest pageRequestMidden) {
-// // 看源码有三个方法要对比，分别是getPageNumber()、getPageSize()、getSort()
+// // There are three methods in the source code that need to
be compared, namely getPageNumber(), getPageSize(), getSort()
// if(pageRequestMidden.getPageSize() ==
pageRequest.getPageSize() &&
// pageRequestMidden.getPageNumber() ==
pageRequest.getPageNumber() &&
//
pageRequestMidden.getSort().equals(pageRequest.getSort())) {
diff --git
a/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertsControllerTest.java
b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertsControllerTest.java
index 9fff92556..38d877520 100644
---
a/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertsControllerTest.java
+++
b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertsControllerTest.java
@@ -71,7 +71,7 @@ class AlertsControllerTest {
// todo: fix this test
void getAlerts() throws Exception {
- //定义要用到的测试值
+ // Define the test values
String sortField = "id";
String orderType = "asc";
int pageIndex = 0;
@@ -80,7 +80,7 @@ class AlertsControllerTest {
Page<Alert> alertPage = new
PageImpl<>(Collections.singletonList(Alert.builder().build()));
- //打桩
+ // Stubbing
Mockito.when(
alertService.getAlerts(
Mockito.any(Specification.class)
@@ -153,7 +153,7 @@ class AlertsControllerTest {
@Test
void getAlertsSummary() throws Exception {
- //打桩
+ // Stubbing
Mockito.when(alertService.getAlertsSummary()).thenReturn(new
AlertSummary());
mockMvc.perform(
diff --git a/collector/pom.xml b/collector/pom.xml
index 33ef7c405..2a37d59bd 100644
--- a/collector/pom.xml
+++ b/collector/pom.xml
@@ -259,15 +259,15 @@
<configuration>
<classesDirectory>target/classes/</classesDirectory>
<archive>
- <!--生成的jar包不包含maven描述相关文件-->
+ <!--Generated JAR does not include Maven
descriptor-related files-->
<addMavenDescriptor>false</addMavenDescriptor>
<manifest>
- <!--项目启动类-->
+ <!--Project startup class-->
<mainClass>org.apache.hertzbeat.collector.Collector</mainClass>
<useUniqueVersions>false</useUniqueVersions>
-
<!--第三方JAR加入类构建的路径maven-dependency-plugin-->
+ <!--Third-party JARs are added to the
classpath using maven-dependency-plugin-->
<addClasspath>true</addClasspath>
- <!--外部依赖jar包的位置-->
+ <!--Location of external dependency JARs-->
<classpathPrefix>lib/</classpathPrefix>
</manifest>
<manifestEntries>
@@ -283,9 +283,9 @@
<executions>
<execution>
<id>without-jdk</id>
- <!--绑定的maven操作-->
+ <!--Bound Maven operation-->
<phase>package</phase>
- <!--运行一次-->
+ <!--Run once-->
<goals>
<goal>single</goal>
</goals>
@@ -297,9 +297,9 @@
</execution>
<execution>
<id>make-macos-arm64</id>
- <!--绑定的maven操作-->
+ <!--Bound Maven operation-->
<phase>package</phase>
- <!--运行一次-->
+ <!--Run once-->
<goals>
<goal>single</goal>
</goals>
@@ -311,9 +311,9 @@
</execution>
<execution>
<id>make-macos-amd64</id>
- <!--绑定的maven操作-->
+ <!--Bound Maven operation-->
<phase>package</phase>
- <!--运行一次-->
+ <!--Run once-->
<goals>
<goal>single</goal>
</goals>
@@ -325,9 +325,9 @@
</execution>
<execution>
<id>make-linux-arm64</id>
- <!--绑定的maven操作-->
+ <!--Bound Maven operation-->
<phase>package</phase>
- <!--运行一次-->
+ <!--Run once-->
<goals>
<goal>single</goal>
</goals>
@@ -339,9 +339,9 @@
</execution>
<execution>
<id>make-linux-amd64</id>
- <!--绑定的maven操作-->
+ <!--Bound Maven operation-->
<phase>package</phase>
- <!--运行一次-->
+ <!--Run once-->
<goals>
<goal>single</goal>
</goals>
@@ -353,9 +353,9 @@
</execution>
<execution>
<id>make-windows-64</id>
- <!--绑定的maven操作-->
+ <!--Bound Maven operation-->
<phase>package</phase>
- <!--运行一次-->
+ <!--Run once-->
<goals>
<goal>single</goal>
</goals>
diff --git a/manager/pom.xml b/manager/pom.xml
index 5e6bcdd58..3732f27f8 100644
--- a/manager/pom.xml
+++ b/manager/pom.xml
@@ -97,12 +97,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
- <!--thymeleaf依赖-->
+ <!--thymeleaf-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
- <!-- freemaker依赖 -->
+ <!-- freemarker -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
@@ -217,15 +217,15 @@
<configuration>
<classesDirectory>target/classes/</classesDirectory>
<archive>
- <!--生成的jar包不包含maven描述相关文件-->
+ <!--Exclude maven descriptors from generated JAR-->
<addMavenDescriptor>false</addMavenDescriptor>
<manifest>
- <!--项目启动类-->
+ <!--Main class of the project-->
<mainClass>org.apache.hertzbeat.manager.Manager</mainClass>
<useUniqueVersions>false</useUniqueVersions>
- <!--第三方JAR加入类构建的路径maven-dependency-plugin-->
+ <!--Add third-party JARs to the classpath using
maven-dependency-plugin-->
<addClasspath>true</addClasspath>
- <!--外部依赖jar包的位置-->
+ <!--Location of external dependency JARs-->
<classpathPrefix>lib/</classpathPrefix>
</manifest>
<manifestEntries>
@@ -245,7 +245,7 @@
</activation>
<build>
<plugins>
- <!--关键插件,maven提供的assembly插件,需要放在最后-->
+ <!--Critical plugin, assembly plugin provided by maven,
should be placed last-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -253,9 +253,9 @@
<executions>
<execution>
<id>make-zip</id>
- <!--绑定的maven操作-->
+ <!--Bound maven operation-->
<phase>package</phase>
- <!--运行一次-->
+ <!--Run once-->
<goals>
<goal>single</goal>
</goals>
@@ -281,9 +281,9 @@
<executions>
<execution>
<id>make-macos-arm64</id>
- <!--绑定的maven操作-->
+ <!--Bound maven operation-->
<phase>package</phase>
- <!--运行一次-->
+ <!--Run once-->
<goals>
<goal>single</goal>
</goals>
@@ -295,9 +295,9 @@
</execution>
<execution>
<id>make-macos-amd64</id>
- <!--绑定的maven操作-->
+ <!--Bound maven operation-->
<phase>package</phase>
- <!--运行一次-->
+ <!--Run once-->
<goals>
<goal>single</goal>
</goals>
@@ -309,9 +309,9 @@
</execution>
<execution>
<id>make-linux-arm64</id>
- <!--绑定的maven操作-->
+ <!--Bound maven operation-->
<phase>package</phase>
- <!--运行一次-->
+ <!--Run once-->
<goals>
<goal>single</goal>
</goals>
@@ -323,9 +323,9 @@
</execution>
<execution>
<id>make-linux-amd64</id>
- <!--绑定的maven操作-->
+ <!--Bound maven operation-->
<phase>package</phase>
- <!--运行一次-->
+ <!--Run once-->
<goals>
<goal>single</goal>
</goals>
@@ -337,9 +337,9 @@
</execution>
<execution>
<id>make-windows-64</id>
- <!--绑定的maven操作-->
+ <!--Bound maven operation-->
<phase>package</phase>
- <!--运行一次-->
+ <!--Run once-->
<goals>
<goal>single</goal>
</goals>
@@ -351,9 +351,9 @@
</execution>
<execution>
<id>make-docker-compose-script</id>
- <!--绑定的maven操作-->
+ <!--Bound maven operation-->
<phase>package</phase>
- <!--运行一次-->
+ <!--Run once-->
<goals>
<goal>single</goal>
</goals>
diff --git a/pom.xml b/pom.xml
index 071c2e97f..7c762d01b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<maven-pmd-plugin.version>3.21.0</maven-pmd-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <!--hertzbeat 相关模块-->
+ <!--hertzbeat related modules-->
<hertzbeat.version>2.0-SNAPSHOT</hertzbeat.version>
<springdoc.version>2.3.0</springdoc.version>
diff --git
a/push/src/main/java/org/apache/hertzbeat/push/controller/PushController.java
b/push/src/main/java/org/apache/hertzbeat/push/controller/PushController.java
index adc59a47d..3c2ad340c 100644
---
a/push/src/main/java/org/apache/hertzbeat/push/controller/PushController.java
+++
b/push/src/main/java/org/apache/hertzbeat/push/controller/PushController.java
@@ -32,7 +32,7 @@ import static
org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
/**
* push controller
*/
-@Tag(name = "Metrics Push API | 监控数据推送API")
+@Tag(name = "Metrics Push API")
@RestController
@RequestMapping(value = "/api/push", produces = {APPLICATION_JSON_VALUE})
public class PushController {
@@ -41,17 +41,17 @@ public class PushController {
private PushService pushService;
@PostMapping
- @Operation(summary = "Push metric data to hertzbeat", description =
"推送监控数据到hertzbeat")
+ @Operation(summary = "Push metric data to hertzbeat", description = "Push
metric data to hertzbeat")
public ResponseEntity<Message<Void>> pushMetrics(@RequestBody
PushMetricsDto pushMetricsDto) {
pushService.pushMetricsData(pushMetricsDto);
return ResponseEntity.ok(Message.success("Push success"));
}
@GetMapping()
- @Operation(summary = "Get metric data for hertzbeat", description =
"获取监控数据")
+ @Operation(summary = "Get metric data for hertzbeat", description = "Get
metric data for hertzbeat")
public ResponseEntity<Message<PushMetricsDto>> getMetrics(
- @Parameter(description = "监控id", example = "6565463543")
@RequestParam("id") final Long id,
- @Parameter(description = "上一次拉取的时间", example = "6565463543")
@RequestParam("time") final Long time) {
+ @Parameter(description = "Monitor ID", example = "6565463543")
@RequestParam("id") final Long id,
+ @Parameter(description = "Last pull time", example = "6565463543")
@RequestParam("time") final Long time) {
PushMetricsDto pushMetricsDto = pushService.getPushMetricData(id,
time);
return ResponseEntity.ok(Message.success(pushMetricsDto));
}
diff --git
a/push/src/main/java/org/apache/hertzbeat/push/controller/PushGatewayController.java
b/push/src/main/java/org/apache/hertzbeat/push/controller/PushGatewayController.java
index faf05f358..f67313191 100644
---
a/push/src/main/java/org/apache/hertzbeat/push/controller/PushGatewayController.java
+++
b/push/src/main/java/org/apache/hertzbeat/push/controller/PushGatewayController.java
@@ -36,7 +36,7 @@ import java.io.InputStream;
/**
* push gateway controller
*/
-@Tag(name = "Metrics Push Gateway API | 监控数据推送网关API")
+@Tag(name = "Metrics Push Gateway API")
@RestController
@RequestMapping(value = "/api/push/pushgateway")
public class PushGatewayController {
@@ -45,7 +45,7 @@ public class PushGatewayController {
private PushGatewayService pushGatewayService;
@PostMapping()
- @Operation(summary = "Push metric data to hertzbeat pushgateway",
description = "推送监控数据到hertzbeat推送网关")
+ @Operation(summary = "Push metric data to hertzbeat pushgateway",
description = "Push metric data to hertzbeat pushgateway")
public ResponseEntity<Message<Void>> pushMetrics(HttpServletRequest
request) throws IOException {
InputStream inputStream = request.getInputStream();
boolean result = pushGatewayService.pushMetricsData(inputStream);
diff --git a/remoting/README.md b/remoting/README.md
index c2c59fa12..790dc6f1f 100644
--- a/remoting/README.md
+++ b/remoting/README.md
@@ -1,12 +1,8 @@
### Remoting
+This is a server-client interaction implemented using the Netty framework,
primarily intended for use in distributed scenarios, especially for
facilitating communication between Manager and Collector components.
-使用 netty 框架实现的 server client 交互，分布式场景使用，主要用于 Manager 和 Collector 交互。
-The server client interaction implemented using the netty framework is mainly
used for the interaction between Manager and Collector in a distributed
scenario.
+**Implementation is referenced from the [remoting
module](https://github.com/apache/rocketmq/tree/develop/remoting) of
[RocketMQ](https://github.com/apache/rocketmq)**
-
-**实现参考 [RocketMQ](https://github.com/apache/rocketmq) 的 [remoting
模块](https://github.com/apache/rocketmq/tree/develop/remoting)**
-**Implementation reference [remoting
module](https://github.com/apache/rocketmq/tree/develop/remoting) of
[RocketMQ](https://github.com/apache/rocketmq)**
-
-**Thanks to RocketMQ, Netty for the open source code.**
+**Special thanks to RocketMQ and Netty for providing the open-source code.**
diff --git a/script/assembly/collector/assembly-linux-amd64.xml
b/script/assembly/collector/assembly-linux-amd64.xml
index 999810156..9abfd71fe 100644
--- a/script/assembly/collector/assembly-linux-amd64.xml
+++ b/script/assembly/collector/assembly-linux-amd64.xml
@@ -21,33 +21,33 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
http://maven.apache.org/xsd/assembly-2.0.0.xsd
http://maven.apache.org/ASSEMBLY/2.0.0 ">
- <!--必填,会追加到打包文件名称的末尾-->
+ <!--Required, will be appended to the end of the packaged file name-->
<id>linux_amd64_1.5.0</id>
- <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
+ <!--Packaging type, multiple types can be set, different types will be
packaged when packaging-->
<formats>
<format>tar.gz</format>
</formats>
- <!--第三方依赖设置-->
+ <!--Third-party dependency settings-->
<dependencySets>
<dependencySet>
- <!--使用项目中的artifact,第三方包打包进tar.gz文件的lib目录下-->
+ <!--Use artifacts in the project, third-party packages packaged
into the lib directory of the tar.gz file-->
<useProjectArtifact>true</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
</dependencySet>
</dependencySets>
- <!--文件相关设置-->
+ <!--File-related settings-->
<fileSets>
- <!--bin文件下的所有脚本文件输出到打包后的bin目录下-->
+ <!--All script files under the bin directory are output to the bin
directory after packaging-->
<fileSet>
<directory>../script/assembly/collector/bin</directory>
- <!-- 是否进行属性替换 即使用 ${project.artifactId} -->
+ <!-- Whether to perform property replacement, that is, use
${project.artifactId} -->
<filtered>true</filtered>
<outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
- <!-- src/main/resources目录下配置文件打包到config目录下 -->
+ <!-- Configuration files under the src/main/resources directory are
packaged to the config directory-->
<fileSet>
<directory>src/main/resources</directory>
<includes>
@@ -56,12 +56,12 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<include>banner.txt</include>
<include>META-INF/**</include>
</includes>
- <!-- 是否进行属性替换 即使用 ${project.artifactId} -->
+ <!-- Whether to perform property replacement, that is, use
${project.artifactId} -->
<filtered>true</filtered>
<outputDirectory>${file.separator}config</outputDirectory>
</fileSet>
- <!-- 将target目录下的启动jar打包到目录下-->
+ <!-- Pack the startup jar in the target directory to the directory-->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
diff --git a/script/assembly/collector/assembly-linux-arm64.xml
b/script/assembly/collector/assembly-linux-arm64.xml
index 37b8120bd..09916ae5e 100644
--- a/script/assembly/collector/assembly-linux-arm64.xml
+++ b/script/assembly/collector/assembly-linux-arm64.xml
@@ -21,33 +21,33 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
http://maven.apache.org/xsd/assembly-2.0.0.xsd
http://maven.apache.org/ASSEMBLY/2.0.0 ">
- <!--必填,会追加到打包文件名称的末尾-->
+ <!--Required, will be appended to the end of the packaged file name-->
<id>linux_arm64_1.5.0</id>
- <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
+ <!--Packaging type, multiple types can be set, different types will be
packaged when packaging-->
<formats>
<format>tar.gz</format>
</formats>
- <!--第三方依赖设置-->
+ <!--Third-party dependency settings-->
<dependencySets>
<dependencySet>
- <!--使用项目中的artifact,第三方包打包进tar.gz文件的lib目录下-->
+ <!--Use artifacts in the project, third-party packages packaged
into the lib directory of the tar.gz file-->
<useProjectArtifact>true</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
</dependencySet>
</dependencySets>
- <!--文件相关设置-->
+ <!--File-related settings-->
<fileSets>
- <!--bin文件下的所有脚本文件输出到打包后的bin目录下-->
+ <!--All script files under the bin directory are output to the bin
directory after packaging-->
<fileSet>
<directory>../script/assembly/collector/bin</directory>
- <!-- 是否进行属性替换 即使用 ${project.artifactId} -->
+ <!-- Whether to perform property replacement, that is, use
${project.artifactId} -->
<filtered>true</filtered>
<outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
- <!-- src/main/resources目录下配置文件打包到config目录下 -->
+ <!-- Configuration files under the src/main/resources directory are
packaged to the config directory-->
<fileSet>
<directory>src/main/resources</directory>
<includes>
@@ -56,12 +56,12 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<include>banner.txt</include>
<include>META-INF/**</include>
</includes>
- <!-- 是否进行属性替换 即使用 ${project.artifactId} -->
+ <!-- Whether to perform property replacement, that is, use
${project.artifactId} -->
<filtered>true</filtered>
<outputDirectory>${file.separator}config</outputDirectory>
</fileSet>
- <!-- 将target目录下的启动jar打包到目录下-->
+ <!-- Pack the startup jar in the target directory to the directory-->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
diff --git a/script/assembly/collector/assembly-macos-amd64.xml
b/script/assembly/collector/assembly-macos-amd64.xml
index 1750d2415..dfcb6a96d 100644
--- a/script/assembly/collector/assembly-macos-amd64.xml
+++ b/script/assembly/collector/assembly-macos-amd64.xml
@@ -21,33 +21,33 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
http://maven.apache.org/xsd/assembly-2.0.0.xsd
http://maven.apache.org/ASSEMBLY/2.0.0 ">
- <!--必填,会追加到打包文件名称的末尾-->
+ <!--Required, will be appended to the end of the packaged file name-->
<id>macos_amd64_1.5.0</id>
- <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
+ <!--Packaging type, multiple types can be set, different types will be
packaged when packaging-->
<formats>
<format>tar.gz</format>
</formats>
- <!--第三方依赖设置-->
+ <!--Third-party dependency settings-->
<dependencySets>
<dependencySet>
- <!--使用项目中的artifact,第三方包打包进tar.gz文件的lib目录下-->
+ <!--Use artifacts in the project, third-party packages packaged
into the lib directory of the tar.gz file-->
<useProjectArtifact>true</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
</dependencySet>
</dependencySets>
- <!--文件相关设置-->
+ <!--File-related settings-->
<fileSets>
- <!--bin文件下的所有脚本文件输出到打包后的bin目录下-->
+ <!--All script files under the bin directory are output to the bin
directory after packaging-->
<fileSet>
<directory>../script/assembly/collector/bin</directory>
- <!-- 是否进行属性替换 即使用 ${project.artifactId} -->
+ <!-- Whether to perform property replacement, that is, use
${project.artifactId} -->
<filtered>true</filtered>
<outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
- <!-- src/main/resources目录下配置文件打包到config目录下 -->
+ <!-- Configuration files under the src/main/resources directory are
packaged to the config directory-->
<fileSet>
<directory>src/main/resources</directory>
<includes>
@@ -56,12 +56,12 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<include>banner.txt</include>
<include>META-INF/**</include>
</includes>
- <!-- 是否进行属性替换 即使用 ${project.artifactId} -->
+ <!-- Whether to perform property replacement, that is, use
${project.artifactId} -->
<filtered>true</filtered>
<outputDirectory>${file.separator}config</outputDirectory>
</fileSet>
- <!-- 将target目录下的启动jar打包到目录下-->
+ <!-- Pack the startup jar in the target directory to the directory-->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
diff --git a/script/assembly/collector/assembly-macos-arm64.xml
b/script/assembly/collector/assembly-macos-arm64.xml
index 551205712..52c5ed558 100644
--- a/script/assembly/collector/assembly-macos-arm64.xml
+++ b/script/assembly/collector/assembly-macos-arm64.xml
@@ -21,33 +21,33 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
http://maven.apache.org/xsd/assembly-2.0.0.xsd
http://maven.apache.org/ASSEMBLY/2.0.0 ">
- <!--必填,会追加到打包文件名称的末尾-->
+ <!--Required, will be appended to the end of the packaged file name-->
<id>macos_arm64_1.5.0</id>
- <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
+ <!--Packaging type, multiple types can be set, different types will be
packaged when packaging-->
<formats>
<format>tar.gz</format>
</formats>
- <!--第三方依赖设置-->
+ <!--Third-party dependency settings-->
<dependencySets>
<dependencySet>
- <!--使用项目中的artifact,第三方包打包进tar.gz文件的lib目录下-->
+ <!--Use artifacts in the project, third-party packages packaged
into the lib directory of the tar.gz file-->
<useProjectArtifact>true</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
</dependencySet>
</dependencySets>
- <!--文件相关设置-->
+ <!--File-related settings-->
<fileSets>
- <!--bin文件下的所有脚本文件输出到打包后的bin目录下-->
+ <!--All script files under the bin directory are output to the bin
directory after packaging-->
<fileSet>
<directory>../script/assembly/collector/bin</directory>
- <!-- 是否进行属性替换 即使用 ${project.artifactId} -->
+ <!-- Whether to perform property replacement, that is, use
${project.artifactId} -->
<filtered>true</filtered>
<outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
- <!-- src/main/resources目录下配置文件打包到config目录下 -->
+ <!-- Configuration files under the src/main/resources directory are
packaged to the config directory-->
<fileSet>
<directory>src/main/resources</directory>
<includes>
@@ -56,12 +56,12 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<include>banner.txt</include>
<include>META-INF/**</include>
</includes>
- <!-- 是否进行属性替换 即使用 ${project.artifactId} -->
+ <!-- Whether to perform property replacement, that is, use
${project.artifactId} -->
<filtered>true</filtered>
<outputDirectory>${file.separator}config</outputDirectory>
</fileSet>
- <!-- 将target目录下的启动jar打包到目录下-->
+ <!-- Pack the startup jar in the target directory to the directory-->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
diff --git a/script/assembly/collector/assembly-windows-64.xml
b/script/assembly/collector/assembly-windows-64.xml
index 34c35a11f..e3d6ac285 100644
--- a/script/assembly/collector/assembly-windows-64.xml
+++ b/script/assembly/collector/assembly-windows-64.xml
@@ -21,33 +21,33 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
http://maven.apache.org/xsd/assembly-2.0.0.xsd
http://maven.apache.org/ASSEMBLY/2.0.0 ">
- <!--必填,会追加到打包文件名称的末尾-->
+ <!--Required, will be appended to the end of the packaged file name-->
<id>windows64_1.5.0</id>
- <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
+ <!--Packaging type, multiple types can be set, different types will be
packaged when packaging-->
<formats>
<format>zip</format>
</formats>
- <!--第三方依赖设置-->
+ <!--Third-party dependency settings-->
<dependencySets>
<dependencySet>
- <!--使用项目中的artifact,第三方包打包进tar.gz文件的lib目录下-->
+ <!--Use artifacts in the project, third-party packages packaged
into the lib directory of the tar.gz file-->
<useProjectArtifact>true</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
</dependencySet>
</dependencySets>
- <!--文件相关设置-->
+ <!--File-related settings-->
<fileSets>
- <!--bin文件下的所有脚本文件输出到打包后的bin目录下-->
+ <!--All script files under the bin directory are output to the bin
directory after packaging-->
<fileSet>
<directory>../script/assembly/collector/bin</directory>
- <!-- 是否进行属性替换 即使用 ${project.artifactId} -->
+ <!-- Whether to perform property replacement, that is, use
${project.artifactId} -->
<filtered>true</filtered>
<outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
- <!-- src/main/resources目录下配置文件打包到config目录下 -->
+ <!-- Configuration files under the src/main/resources directory are
packaged to the config directory-->
<fileSet>
<directory>src/main/resources</directory>
<includes>
@@ -56,12 +56,12 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<include>banner.txt</include>
<include>META-INF/**</include>
</includes>
- <!-- 是否进行属性替换 即使用 ${project.artifactId} -->
+ <!-- Whether to perform property replacement, that is, use
${project.artifactId} -->
<filtered>true</filtered>
<outputDirectory>${file.separator}config</outputDirectory>
</fileSet>
- <!-- 将target目录下的启动jar打包到目录下-->
+ <!-- Pack the startup jar in the target directory to the directory-->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
diff --git a/script/assembly/collector/assembly.xml
b/script/assembly/collector/assembly.xml
index 49da57785..57966f1ff 100644
--- a/script/assembly/collector/assembly.xml
+++ b/script/assembly/collector/assembly.xml
@@ -21,35 +21,35 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
http://maven.apache.org/xsd/assembly-2.0.0.xsd
http://maven.apache.org/ASSEMBLY/2.0.0 ">
- <!--必填,会追加到打包文件名称的末尾-->
+ <!--Required, will be appended to the end of the packaged file name-->
<id>1.5.0</id>
- <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
+ <!--Packaging type, multiple types can be set, different types will be
packaged when packaging-->
<formats>
<format>tar</format>
<format>tar.gz</format>
<format>zip</format>
</formats>
- <!--第三方依赖设置-->
+ <!--Third-party dependency settings-->
<dependencySets>
<dependencySet>
- <!--使用项目中的artifact,第三方包打包进tar.gz文件的lib目录下-->
+ <!--Use artifacts in the project, third-party packages packaged
into the lib directory of the tar.gz file-->
<useProjectArtifact>true</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
</dependencySet>
</dependencySets>
- <!--文件相关设置-->
+ <!--File-related settings-->
<fileSets>
- <!--bin文件下的所有脚本文件输出到打包后的bin目录下-->
+ <!--All script files under the bin directory are output to the bin
directory after packaging-->
<fileSet>
<directory>../script/assembly/collector/bin</directory>
- <!-- 是否进行属性替换 即使用 ${project.artifactId} -->
+ <!-- Whether to perform property replacement, that is, use
${project.artifactId} -->
<filtered>true</filtered>
<outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
- <!-- src/main/resources目录下配置文件打包到config目录下 -->
+ <!-- Configuration files under the src/main/resources directory are
packaged to the config directory-->
<fileSet>
<directory>src/main/resources</directory>
<includes>
@@ -58,12 +58,12 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<include>banner.txt</include>
<include>META-INF/**</include>
</includes>
- <!-- 是否进行属性替换 即使用 ${project.artifactId} -->
+ <!-- Whether to perform property replacement, that is, use
${project.artifactId} -->
<filtered>true</filtered>
<outputDirectory>${file.separator}config</outputDirectory>
</fileSet>
- <!-- 将target目录下的启动jar打包到目录下-->
+ <!-- Pack the startup jar in the target directory to the directory-->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
diff --git a/warehouse/pom.xml b/warehouse/pom.xml
index b0e22e8c2..03835486b 100644
--- a/warehouse/pom.xml
+++ b/warehouse/pom.xml
@@ -85,7 +85,7 @@
<artifactId>iotdb-session</artifactId>
<version>${iotdb-session.version}</version>
</dependency>
- <!-- Influxdb supports version 1.7 so use influxdb-java, full support
for 2.0. The X version requires influxdb-client-java -->
+ <!-- influxdb Here, support for version 1.7, use influxdb-java, Full
support for version 2.x requires influxdb-client-java -->
<dependency>
<groupId>org.influxdb</groupId>
<artifactId>influxdb-java</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
