This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 3a71e4c9d Automated deployment:
bd5d4b4eadf206439824a437649690f6710ca0d8
3a71e4c9d is described below
commit 3a71e4c9d0340fbd20580dd4b5be68af258567b9
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon May 16 05:09:31 2022 +0000
Automated deployment: bd5d4b4eadf206439824a437649690f6710ca0d8
---
.../development/development-environment-setup.html | 47 +++++++++-------------
.../development/development-environment-setup.json | 2 +-
.../development/development-environment-setup.html | 38 ++++++++---------
.../development/development-environment-setup.json | 2 +-
4 files changed, 38 insertions(+), 51 deletions(-)
diff --git a/en-us/development/development-environment-setup.html
b/en-us/development/development-environment-setup.html
index 3a8f200ea..29aa08737 100644
--- a/en-us/development/development-environment-setup.html
+++ b/en-us/development/development-environment-setup.html
@@ -15,10 +15,9 @@
<p>Before setting up the DolphinScheduler development environment, please make
sure you have installed the software as below:</p>
<ul>
<li><a href="https://git-scm.com/downloads";>Git</a>: DolphinScheduler version
control system</li>
-<li><a
href="https://www.oracle.com/technetwork/java/javase/downloads/index.html";>JDK</a>:
DolphinScheduler backend language</li>
+<li><a
href="https://www.oracle.com/technetwork/java/javase/downloads/index.html";>JDK</a>:
DolphinScheduler backend language, have to use version after JDK 1.8</li>
<li><a href="http://maven.apache.org/download.cgi";>Maven</a>: Java Package
Management System</li>
-<li><a href="https://nodejs.org/en/download";>Node</a>: DolphinScheduler
frontend
-language</li>
+<li><a href="https://nodejs.org/en/download";>Node</a>: DolphinScheduler
frontend, have to use version after Node 12.20.2</li>
</ul>
<h3>Clone Git Repository</h3>
<p>Download the git repository through your git management tool, here we use
git-core as an example</p>
@@ -27,7 +26,6 @@ cd dolphinscheduler
git clone [email protected]:apache/dolphinscheduler.git
</code></pre>
<h3>compile source code</h3>
-<p>i. If you use MySQL database, pay attention to modify pom.xml in the root
project, and change the scope of the mysql-connector-java dependency to
compile.</p>
<p>ii. Run <code>mvn clean install -Prelease -Dmaven.test.skip=true</code></p>
<h2>Notice</h2>
<p>There are two ways to configure the DolphinScheduler development
environment, standalone mode and normal mode</p>
@@ -50,7 +48,10 @@ Standalone server is able to connect to external databases
like mysql and postgr
<h3>Start backend server</h3>
<p>Find the class
<code>org.apache.dolphinscheduler.server.StandaloneServer</code> in Intellij
IDEA and clikc run main function to startup.</p>
<h3>Start frontend server</h3>
-<p>Install frontend dependencies and run it</p>
+<p>Install frontend dependencies and run it.</p>
+<blockquote>
+<p>Note: You can see more detail about the frontend setting in <a
href="./frontend-development.md">frontend development</a>.</p>
+</blockquote>
<pre><code class="language-shell">cd dolphinscheduler-ui
pnpm install
pnpm run dev
@@ -86,37 +87,29 @@ dataLogDir=/data/zookeeper/datalog
<p>Open project: Use IDE open the project, here we use Intellij IDEA as an
example, after opening it will take a while for Intellij IDEA to complete the
dependent download</p>
</li>
<li>
-<p>Plugin installation(<strong>Only required for 2.0 or later</strong>)</p>
-</li>
-<li>
-<p>Registry plug-in configuration, take Zookeeper as an example
(registry.properties)
-dolphinscheduler-service/src/main/resources/registry.properties</p>
-</li>
-</ul>
-<pre><code class="language-registry.properties"> registry.plugin.name=zookeeper
- registry.servers=127.0.0.1:2181
-</code></pre>
-<ul>
-<li>
<p>File change</p>
<ul>
<li>If you use MySQL as your metadata database, you need to modify
<code>dolphinscheduler/pom.xml</code> and change the <code>scope</code> of the
<code>mysql-connector-java</code> dependency to <code>compile</code>. This step
is not necessary to use PostgreSQL</li>
-<li>Modify database configuration, modify the database configuration in the
<code>dolphinscheduler-dao/src/main/resources/application-mysql.yaml</code></li>
+<li>Modify database configuration, modify the database configuration in the
<code>dolphinscheduler-master/src/main/resources/application.yaml</code></li>
+<li>Modify database configuration, modify the database configuration in the
<code>dolphinscheduler-worker/src/main/resources/application.yaml</code></li>
+<li>Modify database configuration, modify the database configuration in the
<code>dolphinscheduler-api/src/main/resources/application.yaml</code></li>
+</ul>
+</li>
</ul>
<p>We here use MySQL with database, username, password named dolphinscheduler
as an example</p>
-<pre><code class="language-application-mysql.yaml"> spring:
+<pre><code class="language-application.yaml"> spring:
datasource:
driver-class-name: com.mysql.jdbc.Driver
url:
jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
- username: ds_user
+ username: dolphinscheduler
password: dolphinscheduler
</code></pre>
-</li>
+<ul>
<li>
<p>Log level: add a line <code><appender-ref
ref="STDOUT"/></code> to the following configuration to enable the
log to be displayed on the command line</p>
-<p><code>dolphinscheduler-server/src/main/resources/logback-worker.xml</code></p>
-<p><code>dolphinscheduler-server/src/main/resources/logback-master.xml</code></p>
-<p><code>dolphinscheduler-api/src/main/resources/logback-api.xml</code></p>
+<p><code>dolphinscheduler-master/src/main/resources/logback-spring.xml</code>
+<code>dolphinscheduler-worker/src/main/resources/logback-spring.xml</code>
+<code>dolphinscheduler-api/src/main/resources/logback-spring.xml</code></p>
<p>here we add the result after modify as below:</p>
<pre><code class="language-diff"><root level="INFO">
<span class="hljs-addition">+ <appender-ref
ref="STDOUT"/></span>
@@ -132,9 +125,9 @@
dolphinscheduler-service/src/main/resources/registry.properties</p>
<h5>Server start</h5>
<p>There are three services that need to be started, including MasterServer,
WorkerServer, ApiApplicationServer.</p>
<ul>
-<li>MasterServer：Execute function <code>main</code> in the class
<code>org.apache.dolphinscheduler.server.master.MasterServer</code> by Intellij
IDEA, with the configuration <em>VM Options</em>
<code>-Dlogging.config=classpath:logback-master.xml
-Ddruid.mysql.usePingMethod=false -Dspring.profiles.active=mysql</code></li>
-<li>WorkerServer：Execute function <code>main</code> in the class
<code>org.apache.dolphinscheduler.server.worker.WorkerServer</code> by Intellij
IDEA, with the configuration <em>VM Options</em>
<code>-Dlogging.config=classpath:logback-worker.xml
-Ddruid.mysql.usePingMethod=false -Dspring.profiles.active=mysql</code></li>
-<li>ApiApplicationServer：Execute function <code>main</code> in the class
<code>org.apache.dolphinscheduler.api.ApiApplicationServer</code> by Intellij
IDEA, with the configuration <em>VM Options</em>
<code>-Dlogging.config=classpath:logback-api.xml
-Dspring.profiles.active=api,mysql</code>. After it started, you could find
Open API documentation in <a
href="http://localhost:12345/dolphinscheduler/doc.html";>http://localhost:12345/dolphinscheduler/doc.html</a></li>
+<li>MasterServer：Execute function <code>main</code> in the class
<code>org.apache.dolphinscheduler.server.master.MasterServer</code> by Intellij
IDEA, with the configuration <em>VM Options</em>
<code>-Dlogging.config=classpath:logback-spring.xml
-Ddruid.mysql.usePingMethod=false -Dspring.profiles.active=mysql</code></li>
+<li>WorkerServer：Execute function <code>main</code> in the class
<code>org.apache.dolphinscheduler.server.worker.WorkerServer</code> by Intellij
IDEA, with the configuration <em>VM Options</em>
<code>-Dlogging.config=classpath:logback-spring.xml
-Ddruid.mysql.usePingMethod=false -Dspring.profiles.active=mysql</code></li>
+<li>ApiApplicationServer：Execute function <code>main</code> in the class
<code>org.apache.dolphinscheduler.api.ApiApplicationServer</code> by Intellij
IDEA, with the configuration <em>VM Options</em>
<code>-Dlogging.config=classpath:logback-spring.xml
-Dspring.profiles.active=api,mysql</code>. After it started, you could find
Open API documentation in <a
href="http://localhost:12345/dolphinscheduler/doc.html";>http://localhost:12345/dolphinscheduler/doc.html</a></li>
</ul>
<blockquote>
<p>The <code>mysql</code> in the VM Options
<code>-Dspring.profiles.active=mysql</code> means specified configuration
file</p>
diff --git a/en-us/development/development-environment-setup.json
b/en-us/development/development-environment-setup.json
index 81dcff499..d749adddd 100644
--- a/en-us/development/development-environment-setup.json
+++ b/en-us/development/development-environment-setup.json
@@ -1,6 +1,6 @@
{
"filename": "development-environment-setup.md",
- "__html": "<h1>DolphinScheduler development</h1>\n<h2>Software
Requests</h2>\n<p>Before setting up the DolphinScheduler development
environment, please make sure you have installed the software as
below:</p>\n<ul>\n<li><a href=\"https://git-scm.com/downloads\";>Git</a>:
DolphinScheduler version control system</li>\n<li><a
href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\";>JDK</a>:
DolphinScheduler backend language</li>\n<li><a
href=\"http://maven.apache.org/dow [...]
+ "__html": "<h1>DolphinScheduler development</h1>\n<h2>Software
Requests</h2>\n<p>Before setting up the DolphinScheduler development
environment, please make sure you have installed the software as
below:</p>\n<ul>\n<li><a href=\"https://git-scm.com/downloads\";>Git</a>:
DolphinScheduler version control system</li>\n<li><a
href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\";>JDK</a>:
DolphinScheduler backend language, have to use version after JDK
1.8</li>\n<li><a [...]
"link": "/dist/en-us/development/development-environment-setup.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/development/development-environment-setup.html
b/zh-cn/development/development-environment-setup.html
index d646367a7..9fe4f37d0 100644
--- a/zh-cn/development/development-environment-setup.html
+++ b/zh-cn/development/development-environment-setup.html
@@ -15,9 +15,9 @@
<p>在搭建 DolphinScheduler 开发环境之前请确保你已经安装一下软件</p>
<ul>
<li><a href="https://git-scm.com/downloads";>Git</a>: 版本控制系统</li>
-<li><a
href="https://www.oracle.com/technetwork/java/javase/downloads/index.html";>JDK</a>:
后端开发</li>
+<li><a
href="https://www.oracle.com/technetwork/java/javase/downloads/index.html";>JDK</a>:
后端开发，必须使用JDK1.8及以后的版本</li>
<li><a href="http://maven.apache.org/download.cgi";>Maven</a>: Java包管理系统</li>
-<li><a href="https://nodejs.org/en/download";>Node</a>: 前端开发</li>
+<li><a href="https://nodejs.org/en/download";>Node</a>:
前端开发，必须使用Node12.20.2及以后的版本</li>
</ul>
<h3>克隆代码库</h3>
<p>通过你 git 管理工具下载 git 代码，下面以 git-core 为例</p>
@@ -27,7 +27,6 @@ git clone [email protected]:apache/dolphinscheduler.git
</code></pre>
<h3>编译源码</h3>
<ul>
-<li>如果使用MySQL数据库，请注意修改pom.xml， 添加 <code>mysql-connector-java</code> 依赖。</li>
<li>运行 <code>mvn clean install -Prelease -Dmaven.test.skip=true</code></li>
</ul>
<h2>开发者须知</h2>
@@ -51,6 +50,9 @@ Standalone 仅在 DolphinScheduler 1.3.9 及以后的版本支持</p>
<p>在 Intellij IDEA 找到并启动类
<code>org.apache.dolphinscheduler.server.StandaloneServer</code> 即可完成后端启动</p>
<h3>启动前端</h3>
<p>安装前端依赖并运行前端组件</p>
+<blockquote>
+<p>注意：你可以在<a href="./frontend-development.md">frontend
development</a>里查看更多前端的相关配置</p>
+</blockquote>
<pre><code class="language-shell">cd dolphinscheduler-ui
pnpm install
pnpm run dev
@@ -85,35 +87,27 @@ dataLogDir=/data/zookeeper/datalog
<p>打开项目：使用开发工具打开项目，这里以 Intellij IDEA 为例，打开后需要一段时间，让 Intellij IDEA 完成以依赖的下载</p>
</li>
<li>
-<p>插件的配置（<strong>仅 2.0 及以后的版本需要</strong>）：</p>
-<ul>
-<li>注册中心插件配置, 以Zookeeper 为例 (registry.properties)
-dolphinscheduler-service/src/main/resources/registry.properties</li>
-</ul>
-<pre><code class="language-registry.properties"> registry.plugin.name=zookeeper
- registry.servers=127.0.0.1:2181
-</code></pre>
-</li>
-<li>
<p>必要的修改</p>
<ul>
<li>如果使用 MySQL 作为元数据库，需要先修改 <code>dolphinscheduler/pom.xml</code>，将
<code>mysql-connector-java</code> 依赖的 <code>scope</code> 改为
<code>compile</code>，使用 PostgreSQL 则不需要</li>
-<li>修改数据库配置，修改
<code>dolphinscheduler-dao/src/main/resources/application-mysql.yaml</code>
文件中的数据库配置</li>
+<li>修改 Master 数据库配置，修改
<code>dolphinscheduler-master/src/main/resources/application.yaml</code>
文件中的数据库配置</li>
+<li>修改 Worker 数据库配置，修改
<code>dolphinscheduler-worker/src/main/resources/application.yaml</code>
文件中的数据库配置</li>
+<li>修改 Api 数据库配置，修改
<code>dolphinscheduler-api/src/main/resources/application.yaml</code>
文件中的数据库配置</li>
</ul>
<p>本样例以 MySQL 为例，其中数据库名为 dolphinscheduler，账户名密码均为 dolphinscheduler</p>
-<pre><code class="language-application-mysql.yaml"> spring:
+<pre><code class="language-application.yaml"> spring:
datasource:
driver-class-name: com.mysql.jdbc.Driver
url:
jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
- username: ds_user
+ username: dolphinscheduler
password: dolphinscheduler
</code></pre>
</li>
<li>
<p>修改日志级别：为以下配置增加一行内容 <code><appender-ref
ref="STDOUT"/></code> 使日志能在命令行中显示</p>
-<p><code>dolphinscheduler-server/src/main/resources/logback-worker.xml</code></p>
-<p><code>dolphinscheduler-server/src/main/resources/logback-master.xml</code></p>
-<p><code>dolphinscheduler-api/src/main/resources/logback-api.xml</code></p>
+<p><code>dolphinscheduler-master/src/main/resources/logback-spring.xml</code>
+<code>dolphinscheduler-worker/src/main/resources/logback-spring.xml</code>
+<code>dolphinscheduler-api/src/main/resources/logback-spring.xml</code></p>
<p>修改后的结果如下：</p>
<pre><code class="language-diff"><root level="INFO">
<span class="hljs-addition">+ <appender-ref
ref="STDOUT"/></span>
@@ -126,9 +120,9 @@
dolphinscheduler-service/src/main/resources/registry.properties</li>
<h5>启动服务</h5>
<p>我们需要启动三个服务，包括 MasterServer，WorkerServer，ApiApplicationServer</p>
<ul>
-<li>MasterServer：在 Intellij IDEA 中执行
<code>org.apache.dolphinscheduler.server.master.MasterServer</code> 中的
<code>main</code> 方法，并配置 <em>VM Options</em>
<code>-Dlogging.config=classpath:logback-master.xml
-Ddruid.mysql.usePingMethod=false -Dspring.profiles.active=mysql</code></li>
-<li>WorkerServer：在 Intellij IDEA 中执行
<code>org.apache.dolphinscheduler.server.worker.WorkerServer</code> 中的
<code>main</code> 方法，并配置 <em>VM Options</em>
<code>-Dlogging.config=classpath:logback-worker.xml
-Ddruid.mysql.usePingMethod=false -Dspring.profiles.active=mysql</code></li>
-<li>ApiApplicationServer：在 Intellij IDEA 中执行
<code>org.apache.dolphinscheduler.api.ApiApplicationServer</code> 中的
<code>main</code> 方法，并配置 <em>VM Options</em>
<code>-Dlogging.config=classpath:logback-api.xml
-Dspring.profiles.active=api,mysql</code>。启动完成可以浏览 Open API 文档，地址为 <a
href="http://localhost:12345/dolphinscheduler/doc.html";>http://localhost:12345/dolphinscheduler/doc.html</a></li>
+<li>MasterServer：在 Intellij IDEA 中执行
<code>org.apache.dolphinscheduler.server.master.MasterServer</code> 中的
<code>main</code> 方法，并配置 <em>VM Options</em>
<code>-Dlogging.config=classpath:logback-spring.xml
-Ddruid.mysql.usePingMethod=false -Dspring.profiles.active=mysql</code></li>
+<li>WorkerServer：在 Intellij IDEA 中执行
<code>org.apache.dolphinscheduler.server.worker.WorkerServer</code> 中的
<code>main</code> 方法，并配置 <em>VM Options</em>
<code>-Dlogging.config=classpath:logback-spring.xml
-Ddruid.mysql.usePingMethod=false -Dspring.profiles.active=mysql</code></li>
+<li>ApiApplicationServer：在 Intellij IDEA 中执行
<code>org.apache.dolphinscheduler.api.ApiApplicationServer</code> 中的
<code>main</code> 方法，并配置 <em>VM Options</em>
<code>-Dlogging.config=classpath:logback-spring.xml
-Dspring.profiles.active=api,mysql</code>。启动完成可以浏览 Open API 文档，地址为 <a
href="http://localhost:12345/dolphinscheduler/doc.html";>http://localhost:12345/dolphinscheduler/doc.html</a></li>
</ul>
<blockquote>
<p>VM Options <code>-Dspring.profiles.active=mysql</code> 中 <code>mysql</code>
表示指定的配置文件</p>
diff --git a/zh-cn/development/development-environment-setup.json
b/zh-cn/development/development-environment-setup.json
index fe61385db..a5bac4591 100644
--- a/zh-cn/development/development-environment-setup.json
+++ b/zh-cn/development/development-environment-setup.json
@@ -1,6 +1,6 @@
{
"filename": "development-environment-setup.md",
- "__html": "<h1>DolphinScheduler 开发手册</h1>\n<h2>前置条件</h2>\n<p>在搭建
DolphinScheduler 开发环境之前请确保你已经安装一下软件</p>\n<ul>\n<li><a
href=\"https://git-scm.com/downloads\";>Git</a>: 版本控制系统</li>\n<li><a
href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\";>JDK</a>:
后端开发</li>\n<li><a href=\"http://maven.apache.org/download.cgi\";>Maven</a>:
Java包管理系统</li>\n<li><a href=\"https://nodejs.org/en/download\";>Node</a>:
前端开发</li>\n</ul>\n<h3>克隆代码库</h3>\n<p>通过你 git 管理工具下载 git 代码，下面以 git-co [...]
+ "__html": "<h1>DolphinScheduler 开发手册</h1>\n<h2>前置条件</h2>\n<p>在搭建
DolphinScheduler 开发环境之前请确保你已经安装一下软件</p>\n<ul>\n<li><a
href=\"https://git-scm.com/downloads\";>Git</a>: 版本控制系统</li>\n<li><a
href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\";>JDK</a>:
后端开发，必须使用JDK1.8及以后的版本</li>\n<li><a
href=\"http://maven.apache.org/download.cgi\";>Maven</a>: Java包管理系统</li>\n<li><a
href=\"https://nodejs.org/en/download\";>Node</a>:
前端开发，必须使用Node12.20.2及以后的版本</li>\n</ul>\n<h3>克隆代码库</h [...]
"link": "/dist/zh-cn/development/development-environment-setup.html",
"meta": {}
}
\ No newline at end of file
