Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	zh_CN/安装部署/DSS单机部署文档.md

Author: wushengyeyouya

en_US/Installation_and_Deployment/DSS_Single-Server_Deployment_Documentation.md

@@ -57,16 +57,16 @@ sudo useradd hadoop
 
 ```bash
 vi /etc/sudoers
-````
+```
 
-````properties
+```properties
      hadoop ALL=(ALL) NOPASSWD: NOPASSWD: ALL
-````
+```
 
 4. Make sure that the server where DSS and Linkis are deployed can execute commands such as hdfs , hive -e and spark-sql -e normally. In the one-click install script, the components are checked.
 
 5. **If your Pyspark wants to have the drawing function, you also need to install the drawing module on all installation nodes**. The command is as follows:
-    
+   
 
 ```bash
 python -m pip install matplotlib
@@ -84,7 +84,7 @@ Compile by yourself or go to the component release page to download the installa
 
 3. Download the DSS & LINKIS one-click installation deployment package, and unzip it. The following is the hierarchical directory structure of the one-click installation deployment package:
 
-````text
+```text
 ├── dss_linkis # One-click deployment home directory
   ├── bin # for one-click installation, and one-click to start DSS + Linkis
   ├── conf # Parameter configuration directory for one-click deployment
@@ -99,7 +99,7 @@ Compile by yourself or go to the component release page to download the installa
 
 ```bash
 vi conf/config.sh
-````
+```
 
 The parameter description is as follows:
 

zh_CN/安装部署/DSS单机部署文档.md

@@ -14,6 +14,7 @@ Linkix需要的命令工具（在正式安装前，脚本会自动检测这些
 -   yum
 -   java
 -   unzip
+-   zip
 -   expect
 
 需要安装的软件：
@@ -67,7 +68,6 @@ Tips:
 4.  确保部署 DSS 和 Linkis 的服务器可正常执行 `hdfs dfs -ls` 、`hive -e` 和 `spark-sql -e` 等命令。在一键安装脚本中，会对组件进行检查。
 
 5.  **如果您的 Pyspark 想拥有画图功能，则还需在所有安装节点，安装画图模块**。命令如下：
-    
 
 ```shell script
 python -m pip install matplotlib
@@ -117,7 +117,7 @@ DSS & LINKIS 一键安装部署包的层级目录结构如下：
 # 非必须不建议修改
 LINKIS_VERSION=1.1.1
 
-### DSS Web，本机安装无需修改
+### DSS Web，本机安装一般无需修改，但需确认此端口是否占用，若被占用，修改一个可用端口即可。
 #DSS_NGINX_IP=127.0.0.1
 #DSS_WEB_PORT=8088
 
@@ -155,7 +155,7 @@ SPARK_CONF_DIR=/appcom/config/spark-config
 #LINKIS_PUBLIC_MODULE=lib/linkis-commons/public-module
 
 
-## YARN REST URL
+## YARN REST URL，ensure this PORT have no conflict with DSS_WEB_PORT
 YARN_RESTFUL_URL=http://127.0.0.1:8088
 
 ## Engine版本配置，不配置则采用默认配置
@@ -298,6 +298,8 @@ HIVE_PASSWORD=xxx
 
 ### 4. 启动服务
 
+如果您本机已有 DSS 和 Linkis 的服务正在运行中，请先停掉所有相关服务。
+
 #### (1) 启动服务：
 
      在安装目录执行以下命令，启动所有服务：