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/incubator-dolphinscheduler-website.git
The following commit(s) were added to refs/heads/asf-site by this push: new 2d72937 Automated deployment: Tue Feb 11 10:58:54 UTC 2020 3113132cbe95642885ed2af9a883b42d3477a240 2d72937 is described below commit 2d72937ee2630a0fbfba848421a28c0c0df47873 Author: dailidong <dailid...@users.noreply.github.com> AuthorDate: Tue Feb 11 10:58:54 2020 +0000 Automated deployment: Tue Feb 11 10:58:54 UTC 2020 3113132cbe95642885ed2af9a883b42d3477a240 --- .../user_doc/development-environment-setup.html | 62 +++------------------- .../user_doc/development-environment-setup.json | 2 +- 2 files changed, 9 insertions(+), 55 deletions(-) diff --git a/zh-cn/docs/1.2.0/user_doc/development-environment-setup.html b/zh-cn/docs/1.2.0/user_doc/development-environment-setup.html index 53964de..fa55c63 100644 --- a/zh-cn/docs/1.2.0/user_doc/development-environment-setup.html +++ b/zh-cn/docs/1.2.0/user_doc/development-environment-setup.html @@ -15,14 +15,14 @@ <div id="root"><div class="documentation-page" data-reactroot=""><header class="header-container header-container-normal"><div class="header-body"><a href="/zh-cn/index.html"><img class="logo" src="/img/hlogo_colorful.svg"/></a><div class="search search-normal"><span class="icon-search"></span></div><span class="language-switch language-switch-normal">En</span><div class="header-menu"><img class="header-menu-toggle" src="/img/system/menu_gray.png"/><div><ul class="ant-menu blackClass an [...] <ol> <li>fork <a href="https://github.com/apache/incubator-dolphinscheduler">dolphinscheduler</a></li> -<li>git clone xxx,</li> -<li>安装好MySQL,Zookeeper,Nginx,Hadoop(可选)。</li> +<li>git clone <a href="https://github.com/apache/incubator-dolphinscheduler.git">https://github.com/apache/incubator-dolphinscheduler.git</a></li> +<li>安装好MySQL,Zookeeper,Nginx,Hadoop(可选)</li> <li>git clone项目后,进入目录,执行以下命令。</li> </ol> <pre><code>1. git branch -a #查看分支 -2. git checkout dev-db #切换到dev-db分支 +2. git checkout dev #切换到dev分支 3. git pull #同步分支 -4. mvn -U clean package assembly:assembly -Dmaven.test.skip=true #编译项目。由于项目前端的日志模块,使用了gRPC调用后端,所以需要先编译项目。 +4. mvn -U clean package -Prelease -Dmaven.test.skip=true #由于项目使用了gRPC,所以需要先编译项目生成需要的类。 </code></pre> <h4>搭建后端</h4> <ol> @@ -65,8 +65,8 @@ org.apache.dolphinscheduler.server.worker.WorkerServer类main函数增加如下 </ol> <h4>搭建前端</h4> <p>进入dolphinscheduler-ui的目录,执行ui项目的编译,由于是webpack和vue,所以需要以下命令:</p> -<pre><code>1. npm install. #没有npm的,mac用brew安装一个。brew install npm。 -2. npm run build. #执行完build命令后,会生成dist文件夹,这个文件夹一定要和nginx配置文件的40行所指的目录相同。 +<pre><code>1. npm install #没有npm的,mac用brew安装。brew install npm。 +2. npm run build #执行完build命令后,会生成dist文件夹,这个文件夹一定要和nginx配置文件的40行所指的目录相同。 </code></pre> <p>保存以下内容到dolphinscheduler.conf文件:</p> <pre><code> @@ -154,8 +154,8 @@ org.apache.dolphinscheduler.api.ApiApplicationServer类main函数增加如下代 <pre><code>执行ApiApplicationServer, 然后访问localhost:8888,账号admin/dolphinscheduler123。 </code></pre> <h4>资源中心</h4> -<p>ds对于资源的存储在HDFS/S3中,HDFS的mac安装请参考:<a href="https://www.jianshu.com/p/935b4c5e4c25">https://www.jianshu.com/p/935b4c5e4c25</a> -mac的hdfs请下载:<a href="https://www.apache.org/dyn/closer.cgi/hadoop/common/hadoop-2.8.5/hadoop-2.8.5.tar.gz">https://www.apache.org/dyn/closer.cgi/hadoop/common/hadoop-2.8.5/hadoop-2.8.5.tar.gz</a> +<p>ds对于资源的存储在本地文件系统/HDFS/S3/minio中,HDFS的mac安装请参考:<a href="https://www.jianshu.com/p/935b4c5e4c25">https://www.jianshu.com/p/935b4c5e4c25</a> +hdfs下载:<a href="https://www.apache.org/dyn/closer.cgi/hadoop/common/hadoop-2.8.5/hadoop-2.8.5.tar.gz">https://www.apache.org/dyn/closer.cgi/hadoop/common/hadoop-2.8.5/hadoop-2.8.5.tar.gz</a> 安装好hdfs后,修改common.properties配置:</p> <pre><code>res.upload.startup.type=HDFS </code></pre> @@ -166,52 +166,6 @@ mac的hdfs请下载:<a href="https://www.apache.org/dyn/closer.cgi/hadoop/common <p>*<code>注意</code>:上传的文件大小,超过1M下,需要添加nginx参数</p> <pre><code>client_max_body_size 100m; </code></pre> -<h2>DS中概念解释</h2> -<h4>安全中心</h4> -<ol> -<li>租户管理</li> -</ol> -<ul> -<li>作用:对应Linux的用户,当Linux没有对应用户时,将创建用户用于worker执行任务。</li> -<li>创建:需要注意,创建租户时,【租户编码】为对应的Linux用户。</li> -</ul> -<ol start="2"> -<li>用户管理</li> -</ol> -<ul> -<li>作用:创建不同的用户,赋予不同的模块权限。</li> -<li>创建:新建的用户都为普通用户,需要设置租户,队列,邮件和手机。其中,邮件和手机为告警时使用。</li> -<li>更新:当更新用户的租户时,相应的资源文件也会更新到新的租户下。</li> -</ul> -<ol start="3"> -<li>告警组管理</li> -</ol> -<ul> -<li>作用:创建不同的告警组,添加不同的组员。根据任务运行时的告警配置,当任务执行成功或失败等状态时,进行相应的告警。</li> -</ul> -<ol start="4"> -<li>队列管理</li> -</ol> -<ul> -<li>作用:创建Spark,MapReduce,Flink需要用到队列。</li> -<li>创建:队列的创建,必须名称和值都唯一才可以。</li> -</ul> -<ol start="5"> -<li>Worker分组管理</li> -</ol> -<ul> -<li>作用:任务只被组内所指定的worker执行。当新建任务时,选择的【Worker分组】为【Default】时,任务可在任何一台worker上执行。</li> -</ul> -<ol start="6"> -<li>令牌管理</li> -</ol> -<ul> -<li>作用:访问后端接口,可以使用系统令牌。</li> -<li>使用方式:</li> -</ul> -<pre><code>HttpPost httpPost = new HttpPost("http://127.0.0.1:12345/escheduler/projects/create"); -httpPost.setHeader("token", "123"); -</code></pre> </div></section><footer class="footer-container"><div class="footer-body"><img src="/img/ds_gray.svg"/><div class="cols-container"><div class="col col-12"><h3>Disclaimer</h3><p>Apache DolphinScheduler (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. diff --git a/zh-cn/docs/1.2.0/user_doc/development-environment-setup.json b/zh-cn/docs/1.2.0/user_doc/development-environment-setup.json index d07d147..73b0192 100644 --- a/zh-cn/docs/1.2.0/user_doc/development-environment-setup.json +++ b/zh-cn/docs/1.2.0/user_doc/development-environment-setup.json @@ -1,6 +1,6 @@ { "filename": "development-environment-setup.md", - "__html": "<h4>准备工作</h4>\n<ol>\n<li>fork <a href=\"https://github.com/apache/incubator-dolphinscheduler\">dolphinscheduler</a></li>\n<li>git clone xxx,</li>\n<li>安装好MySQL,Zookeeper,Nginx,Hadoop(可选)。</li>\n<li>git clone项目后,进入目录,执行以下命令。</li>\n</ol>\n<pre><code>1. git branch -a #查看分支\n2. git checkout dev-db #切换到dev-db分支\n3. git pull #同步分支\n4. mvn -U clean package assembly:assembly -Dmaven.test.skip=true #编译项目。由于项目前端的日志模块,使用了gRPC调用后端,所以需要先编译项目。\n</code></pre>\n<h4>搭建后端</h4>\n<ol>\n<li [...] + "__html": "<h4>准备工作</h4>\n<ol>\n<li>fork <a href=\"https://github.com/apache/incubator-dolphinscheduler\">dolphinscheduler</a></li>\n<li>git clone <a href=\"https://github.com/apache/incubator-dolphinscheduler.git\">https://github.com/apache/incubator-dolphinscheduler.git</a></li>\n<li>安装好MySQL,Zookeeper,Nginx,Hadoop(可选)</li>\n<li>git clone项目后,进入目录,执行以下命令。</li>\n</ol>\n<pre><code>1. git branch -a #查看分支\n2. git checkout dev #切换到dev分支\n3. git pull #同步分支\n4. mvn -U clean package -Prele [...] "link": "/zh-cn/docs/1.2.0/user_doc/development-environment-setup.html", "meta": {} } \ No newline at end of file