This is an automated email from the ASF dual-hosted git repository.
gaoxingcun 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 d5d149eb3 [doc] translates chinese comment to english. (#1914)
d5d149eb3 is described below
commit d5d149eb350f3d7f92a75f73d7a5b8012e58f5ae
Author: Jin <[email protected]>
AuthorDate: Sat May 4 20:10:55 2024 +0800
[doc] translates chinese comment to english. (#1914)
---
script/assembly/server/assembly-docker-compose.xml | 4 +--
script/assembly/server/assembly-linux-amd64.xml | 23 +++++++++--------
script/assembly/server/assembly-linux-arm64.xml | 23 +++++++++--------
script/assembly/server/assembly-macos-amd64.xml | 23 +++++++++--------
script/assembly/server/assembly-macos-arm64.xml | 22 ++++++++--------
script/assembly/server/assembly-windows-64.xml | 23 +++++++++--------
script/assembly/server/assembly.xml | 22 ++++++++--------
script/assembly/server/bin/entrypoint.sh | 24 ++++++++---------
script/assembly/server/bin/restart.sh | 4 +--
script/assembly/server/bin/shutdown.sh | 6 ++---
script/assembly/server/bin/startup.sh | 30 +++++++++++-----------
11 files changed, 104 insertions(+), 100 deletions(-)
diff --git a/script/assembly/server/assembly-docker-compose.xml
b/script/assembly/server/assembly-docker-compose.xml
index 7bb4d189c..8f543eac5 100644
--- a/script/assembly/server/assembly-docker-compose.xml
+++ b/script/assembly/server/assembly-docker-compose.xml
@@ -18,9 +18,9 @@
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>docker-compose</id>
- <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
+ <!--Packaging type, multiple types can be set, different types will be
packaged when packaging-->
<formats>
<format>zip</format>
</formats>
diff --git a/script/assembly/server/assembly-linux-amd64.xml
b/script/assembly/server/assembly-linux-amd64.xml
index c837f56fa..b795a58aa 100644
--- a/script/assembly/server/assembly-linux-amd64.xml
+++ b/script/assembly/server/assembly-linux-amd64.xml
@@ -18,33 +18,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/server/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>
@@ -52,11 +52,12 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<include>logback-spring.xml</include>
<include>sureness.yml</include>
</includes>
+ <!-- Whether to perform property replacement, that is, use
${project.artifactId} -->
<filtered>true</filtered>
<outputDirectory>${file.separator}config</outputDirectory>
</fileSet>
- <!-- src/main/resources/define目录下配置文件打包到define目录下 -->
+ <!-- Configuration files under the src/main/resources/define directory
are packaged to the define directory -->
<fileSet>
<directory>src/main/resources</directory>
<includes>
@@ -66,7 +67,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<outputDirectory>${file.separator}</outputDirectory>
</fileSet>
- <!-- 将target目录下的启动jar打包到目录下-->
+ <!-- Pack the startup jar in the target directory to the directory-->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
@@ -75,7 +76,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
</includes>
</fileSet>
- <!-- 将webapp的静态资源打包到目录下-->
+ <!-- Pack the static resources of the web app into the directory-->
<fileSet>
<directory>../web-app/dist</directory>
<outputDirectory>dist</outputDirectory>
diff --git a/script/assembly/server/assembly-linux-arm64.xml
b/script/assembly/server/assembly-linux-arm64.xml
index ecd941c22..d0686deab 100644
--- a/script/assembly/server/assembly-linux-arm64.xml
+++ b/script/assembly/server/assembly-linux-arm64.xml
@@ -18,33 +18,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/server/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>
@@ -52,11 +52,12 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<include>logback-spring.xml</include>
<include>sureness.yml</include>
</includes>
+ <!-- Whether to perform property replacement, that is, use
${project.artifactId} -->
<filtered>true</filtered>
<outputDirectory>${file.separator}config</outputDirectory>
</fileSet>
- <!-- src/main/resources/define目录下配置文件打包到define目录下 -->
+ <!-- Configuration files under the src/main/resources/define directory
are packaged to the define directory -->
<fileSet>
<directory>src/main/resources</directory>
<includes>
@@ -66,7 +67,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<outputDirectory>${file.separator}</outputDirectory>
</fileSet>
- <!-- 将target目录下的启动jar打包到目录下-->
+ <!-- Pack the startup jar in the target directory to the directory-->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
@@ -75,7 +76,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
</includes>
</fileSet>
- <!-- 将webapp的静态资源打包到目录下-->
+ <!-- Pack the static resources of the web app into the directory-->
<fileSet>
<directory>../web-app/dist</directory>
<outputDirectory>dist</outputDirectory>
diff --git a/script/assembly/server/assembly-macos-amd64.xml
b/script/assembly/server/assembly-macos-amd64.xml
index ae0844c32..388a7da1c 100644
--- a/script/assembly/server/assembly-macos-amd64.xml
+++ b/script/assembly/server/assembly-macos-amd64.xml
@@ -18,33 +18,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/server/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>
@@ -52,11 +52,12 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<include>logback-spring.xml</include>
<include>sureness.yml</include>
</includes>
+ <!-- Whether to perform property replacement, that is, use
${project.artifactId} -->
<filtered>true</filtered>
<outputDirectory>${file.separator}config</outputDirectory>
</fileSet>
- <!-- src/main/resources/define目录下配置文件打包到define目录下 -->
+ <!-- Configuration files under the src/main/resources/define directory
are packaged to the define directory -->
<fileSet>
<directory>src/main/resources</directory>
<includes>
@@ -66,7 +67,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<outputDirectory>${file.separator}</outputDirectory>
</fileSet>
- <!-- 将target目录下的启动jar打包到目录下-->
+ <!-- Pack the startup jar in the target directory to the directory-->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
@@ -75,7 +76,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
</includes>
</fileSet>
- <!-- 将webapp的静态资源打包到目录下-->
+ <!-- Pack the static resources of the web app into the directory-->
<fileSet>
<directory>../web-app/dist</directory>
<outputDirectory>dist</outputDirectory>
diff --git a/script/assembly/server/assembly-macos-arm64.xml
b/script/assembly/server/assembly-macos-arm64.xml
index a6037b2d2..1a46d9d52 100644
--- a/script/assembly/server/assembly-macos-arm64.xml
+++ b/script/assembly/server/assembly-macos-arm64.xml
@@ -18,33 +18,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/server/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,7 +56,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<outputDirectory>${file.separator}config</outputDirectory>
</fileSet>
- <!-- src/main/resources/define目录下配置文件打包到define目录下 -->
+ <!-- Configuration files under the src/main/resources/define directory
are packaged to the define directory -->
<fileSet>
<directory>src/main/resources</directory>
<includes>
@@ -66,7 +66,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<outputDirectory>${file.separator}</outputDirectory>
</fileSet>
- <!-- 将target目录下的启动jar打包到目录下-->
+ <!-- Pack the startup jar in the target directory to the directory-->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
@@ -75,7 +75,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
</includes>
</fileSet>
- <!-- 将webapp的静态资源打包到目录下-->
+ <!-- Pack the static resources of the web app into the directory-->
<fileSet>
<directory>../web-app/dist</directory>
<outputDirectory>dist</outputDirectory>
diff --git a/script/assembly/server/assembly-windows-64.xml
b/script/assembly/server/assembly-windows-64.xml
index 7d8135e72..8b424e491 100644
--- a/script/assembly/server/assembly-windows-64.xml
+++ b/script/assembly/server/assembly-windows-64.xml
@@ -18,33 +18,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/server/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>
@@ -52,11 +52,12 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<include>logback-spring.xml</include>
<include>sureness.yml</include>
</includes>
+ <!-- Whether to perform property replacement, that is, use
${project.artifactId} -->
<filtered>true</filtered>
<outputDirectory>${file.separator}config</outputDirectory>
</fileSet>
- <!-- src/main/resources/define目录下配置文件打包到define目录下 -->
+ <!-- Configuration files under the src/main/resources/define directory
are packaged to the define directory -->
<fileSet>
<directory>src/main/resources</directory>
<includes>
@@ -66,7 +67,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<outputDirectory>${file.separator}</outputDirectory>
</fileSet>
- <!-- 将target目录下的启动jar打包到目录下-->
+ <!-- Pack the startup jar in the target directory to the directory-->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
@@ -75,7 +76,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
</includes>
</fileSet>
- <!-- 将webapp的静态资源打包到目录下-->
+ <!-- Pack the static resources of the web app into the directory-->
<fileSet>
<directory>../web-app/dist</directory>
<outputDirectory>dist</outputDirectory>
diff --git a/script/assembly/server/assembly.xml
b/script/assembly/server/assembly.xml
index 868554d31..4800394e8 100644
--- a/script/assembly/server/assembly.xml
+++ b/script/assembly/server/assembly.xml
@@ -18,35 +18,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/server/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,7 +58,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<outputDirectory>${file.separator}config</outputDirectory>
</fileSet>
- <!-- src/main/resources/define目录下配置文件打包到define目录下 -->
+ <!-- Configuration files under the src/main/resources/define directory
are packaged to the define directory -->
<fileSet>
<directory>src/main/resources</directory>
<includes>
@@ -68,7 +68,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
<outputDirectory>${file.separator}</outputDirectory>
</fileSet>
- <!-- 将target目录下的启动jar打包到目录下-->
+ <!-- Pack the startup jar in the target directory to the directory-->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
@@ -77,7 +77,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
</includes>
</fileSet>
- <!-- 将webapp的静态资源打包到目录下-->
+ <!-- Pack the static resources of the web app into the dist
directory-->
<fileSet>
<directory>../web-app/dist</directory>
<outputDirectory>dist</outputDirectory>
diff --git a/script/assembly/server/bin/entrypoint.sh
b/script/assembly/server/bin/entrypoint.sh
index e53865bc3..4889fa272 100644
--- a/script/assembly/server/bin/entrypoint.sh
+++ b/script/assembly/server/bin/entrypoint.sh
@@ -16,31 +16,31 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# 项目名称
+# project name
SERVER_NAME="${project.build.finalName}"
-# jar名称
+# jar name
JAR_NAME="${project.build.finalName}.jar"
-# 进入bin目录
+# cd bin
cd `dirname $0`
-# bin目录绝对路径
+# bin dir
BIN_DIR=`pwd`
-# 返回到上一级项目根目录路径
+# return root
cd ..
-# 打印项目根目录绝对路径
-# `pwd` 执行系统命令并获得结果
+# root path dir
DEPLOY_DIR=`pwd`
-# 外部配置文件绝对目录,如果是目录需要/结尾，也可以直接指定文件
-# 如果指定的是目录,spring则会读取目录中的所有配置文件
+# config dir
+# absolute directory of external configuration files, if it is a directory, it
should end with '/'，you can also directly specify a file.
+# if a directory is specified, spring will read all configuration files in the
directory
CONF_DIR=$DEPLOY_DIR/config
MAIN_CLASS="org.apache.hertzbeat.manager.Manager"
EXT_LIB_PATH="$DEPLOY_DIR/ext-lib"
CLASSPATH="$DEPLOY_DIR/$JAR_NAME:$EXT_LIB_PATH/*"
-# 项目日志输出绝对路径
+# log dir
LOGS_DIR=$DEPLOY_DIR/logs
-# 如果logs文件夹不存在,则创建文件夹
+# create logs dir when not exist
if [ ! -d $LOGS_DIR ]; then
mkdir $LOGS_DIR
fi
@@ -51,7 +51,7 @@ JAVA_OPTS=" -Doracle.jdbc.timezoneAsRegion=false"
# JVM Configuration
JAVA_MEM_OPTS=" -server -XX:SurvivorRatio=6 -XX:+UseParallelGC
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$LOGS_DIR"
-# 加载外部log文件的配置
+# load logback config
LOG_IMPL_FILE=logback-spring.xml
LOGGING_CONFIG=""
if [ -f "$CONF_DIR/$LOG_IMPL_FILE" ]
diff --git a/script/assembly/server/bin/restart.sh
b/script/assembly/server/bin/restart.sh
index 4cf0bf7bd..30bd4f6e5 100644
--- a/script/assembly/server/bin/restart.sh
+++ b/script/assembly/server/bin/restart.sh
@@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# 重启脚本执行的起始时间
+# restart start time
startTime=$(date +%s)
echo -e "\033[0;31mCurrent Time is：$(date "+%Y-%m-%d %H:%M:%S") Restart
Now!\033[0m"
./shutdown.sh
@@ -24,6 +24,6 @@ echo
sleep 2
echo
./startup.sh
-# 重启脚本执行的结束时间
+# restart end time
endTime=$(date +%s)
echo -e "\033[0;31mCurrent Time is：$(date "+%Y-%m-%d %H:%M:%S") Restart
Success！Spend $((endTime - startTime)) seconds \033[0m";
diff --git a/script/assembly/server/bin/shutdown.sh
b/script/assembly/server/bin/shutdown.sh
index cce4e47b0..ea38cdfaf 100644
--- a/script/assembly/server/bin/shutdown.sh
+++ b/script/assembly/server/bin/shutdown.sh
@@ -15,13 +15,13 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-# 项目名称
+# project name
APPLICATION="${project.artifactId}"
-# 项目启动jar包名称
+# jar file name
APPLICATION_JAR="${project.build.finalName}.jar"
-# 通过项目名称查找到PI，然后kill -9 pid
+# find the service pid, kill -9 pid
PID=$(ps -ef | grep java | grep "${APPLICATION_JAR}" | grep -v grep | awk '{
print $2 }')
if [[ -z "$PID" ]]
then
diff --git a/script/assembly/server/bin/startup.sh
b/script/assembly/server/bin/startup.sh
index 9cb7001ec..e3dd9a853 100644
--- a/script/assembly/server/bin/startup.sh
+++ b/script/assembly/server/bin/startup.sh
@@ -16,26 +16,26 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# 项目名称
+# project name
SERVER_NAME="${project.artifactId}"
-# jar名称
+# jar file name
JAR_NAME="${project.build.finalName}.jar"
-# 进入bin目录
+# cd bin dir
cd `dirname $0`
-# bin目录绝对路径
+# bin dir
BIN_DIR=`pwd`
-# 返回到上一级项目根目录路径
+# return root dir
cd ..
-# 打印项目根目录绝对路径
-# `pwd` 执行系统命令并获得结果
+# root path dir
DEPLOY_DIR=`pwd`
-# 外部配置文件绝对目录,如果是目录需要/结尾，也可以直接指定文件
-# 如果指定的是目录,spring则会读取目录中的所有配置文件
+# config dir
+# absolute directory of external configuration files, if it is a directory, it
should end with '/'，you can also directly specify a file.
+# if a directory is specified, spring will read all configuration files in the
directory
CONF_DIR=$DEPLOY_DIR/config
-# 应用的端口号
+# server port
SERVER_PORT=1157
PIDS=`ps -ef | grep java | grep "$CONF_DIR" | awk '{print $2}'`
@@ -57,13 +57,13 @@ if [ -n "$PIDS" ]; then
fi
if [ -n "$SERVER_PORT" ]; then
- # linux 下查询端口是否占用
+ # linux - find the port whether used
SERVER_PORT_COUNT=`netstat -tln | grep :$SERVER_PORT | wc -l`
if [ $SERVER_PORT_COUNT -gt 0 ]; then
echo "ERROR: netstat the HertzBeat $SERVER_NAME port $SERVER_PORT
already used!"
exit 1
fi
- # mac 下查询端口是否占用
+ # mac - find the port whether used
LSOF_AVA=`command -v lsof | wc -l`
if [ $LSOF_AVA -gt 0 ]; then
SERVER_PORT_COUNT=`lsof -i:$SERVER_PORT | grep java | wc -l`
@@ -76,9 +76,9 @@ fi
MAIN_CLASS="org.apache.hertzbeat.manager.Manager"
EXT_LIB_PATH="$DEPLOY_DIR/ext-lib"
CLASSPATH="$DEPLOY_DIR/$JAR_NAME:$EXT_LIB_PATH/*"
-# 项目日志输出绝对路径
+# log dir
LOGS_DIR=$DEPLOY_DIR/logs
-# 如果logs文件夹不存在,则创建文件夹
+# create logs dir when not exist
if [ ! -d $LOGS_DIR ]; then
mkdir $LOGS_DIR
fi
@@ -90,7 +90,7 @@ JAVA_OPTS=" -Duser.timezone=Asia/Shanghai
-Doracle.jdbc.timezoneAsRegion=false"
JAVA_MEM_OPTS=" -server -XX:SurvivorRatio=6 -XX:+UseParallelGC
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$LOGS_DIR"
-# 加载外部log文件的配置
+# load logback config
LOG_IMPL_FILE=logback-spring.xml
LOGGING_CONFIG=""
if [ -f "$CONF_DIR/$LOG_IMPL_FILE" ]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
